Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openmls/src/binary_tree/array_representation/treemath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl TreeSize {
pub(super) fn dec(&mut self) {
debug_assert!(self.0 >= 2);
if self.0 >= 2 {
self.0 = (self.0 + 1) / 2 - 1;
self.0 = self.0.div_ceil(2) - 1;
} else {
self.0 = 0;
}
Expand Down
5 changes: 2 additions & 3 deletions openmls/src/framing/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,8 @@ impl DecryptedMessage {
let ciphersuite = group.ciphersuite();
// TODO: #819 The old leaves should not be needed any more.
// Revisit when the transition is further along.
let (message_secrets, _old_leaves) = group
.message_secrets_and_leaves_mut(ciphertext.epoch())
.map_err(MessageDecryptionError::from)?;
let (message_secrets, _old_leaves) =
group.message_secrets_and_leaves_mut(ciphertext.epoch())?;
let sender_data = ciphertext.sender_data(message_secrets, backend, ciphersuite)?;
let message_secrets = group
.message_secrets_mut(ciphertext.epoch())
Expand Down
1 change: 1 addition & 0 deletions openmls/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
#![allow(clippy::doc_overindented_list_items)]

// === Testing ===

Expand Down
17 changes: 10 additions & 7 deletions openmls/src/tree/tests_and_kats/kats/kat_message_protection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -756,13 +756,16 @@ pub async fn run_test_vector(

#[apply(backends)]
async fn read_test_vectors_mp(backend: &impl OpenMlsCryptoProvider) {
let _ = pretty_env_logger::try_init();
log::info!("Reading test vectors ...");
Box::pin(async {
let _ = pretty_env_logger::try_init();
log::info!("Reading test vectors ...");

let tests: Vec<MessageProtectionTest> = read("test_vectors/message-protection.json");
let tests: Vec<MessageProtectionTest> = read("test_vectors/message-protection.json");

for test_vector in tests.into_iter() {
run_test_vector(test_vector, backend).await.unwrap();
}
log::info!("Finished test vector verification");
for test_vector in tests.into_iter() {
run_test_vector(test_vector, backend).await.unwrap();
}
log::info!("Finished test vector verification");
})
.await
}
Loading
Loading