build: tls_codec 0.4.0

.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         mode:
-          - debug
+#          - debug
           - release
     runs-on: ${{ matrix.os }}
     steps:

Cargo.toml

@@ -15,9 +15,9 @@ resolver = "2"
 async-trait = "0.1"
 
 [workspace.dependencies.tls_codec]
-version = "0.3.0"
+version = "0.4.0"
 features = ["derive", "serde", "mls"]
 
 [workspace.dependencies.tls_codec_derive]
-version = "0.3.0"
+version = "0.4.0"
 features = ["derive", "serde", "mls"]

openmls/Cargo.toml

@@ -33,8 +33,8 @@ serde_json = { version = "1.0", optional = true }
 # Crypto backends required for KAT and testing - "test-utils" feature
 openmls_rust_crypto = { version = "0.2.0", path = "../openmls_rust_crypto", optional = true }
 async-lock = { version = "2.7", optional = true }
-rstest = { version = "^0.16", optional = true }
-rstest_reuse = { version = "0.4", optional = true }
+rstest = { version = "0.18.2", optional = true }
+rstest_reuse = { version = "0.6.0", optional = true }
 tokio = { version = "1.24", optional = true, features = ["macros", "rt", "rt-multi-thread"] }
 
 [features]
@@ -61,8 +61,8 @@ lazy_static = "1.4"
 openmls = { path = ".", features = ["test-utils"] }
 openmls_traits = { version = "0.2.0", path = "../traits", features = ["test-utils"] }
 pretty_env_logger = "0.4"
-rstest = "^0.16"
-rstest_reuse = "0.4"
+rstest = "0.18.2"
+rstest_reuse = "0.6.0"
 tempfile = "3"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"

openmls/src/binary_tree/array_representation/treemath.rs

@@ -421,8 +421,6 @@ pub(crate) fn common_direct_path(
     y: LeafNodeIndex,
     size: TreeSize,
 ) -> Vec<ParentNodeIndex> {
-    let x = x;
-    let y = y;
     let mut x_path = direct_path(x, size);
     let mut y_path = direct_path(y, size);
     x_path.reverse();

openmls/src/framing/test_framing.rs

@@ -8,6 +8,7 @@ use openmls_rust_crypto::OpenMlsRustCrypto;
 use signable::Verifiable;
 use tls_codec::{Deserialize, Serialize};
 
+use crate::test_utils::*;
 use crate::{
     binary_tree::{array_representation::TreeSize, LeafNodeIndex},
     ciphersuite::signable::{Signable, SignatureError},

openmls/src/group/core_group/proposals.rs

@@ -485,7 +485,7 @@ impl ProposalQueue {
                     if leaf_index != own_index {
                         members
                             .entry(leaf_index)
-                            .or_insert_with(Member::default)
+                            .or_default()
                             .updates
                             .push(queued_proposal.clone());
                     } else {
@@ -498,7 +498,7 @@ impl ProposalQueue {
                     let removed = remove_proposal.removed();
                     members
                         .entry(removed)
-                        .or_insert_with(Member::default)
+                        .or_default()
                         .updates
                         .push(queued_proposal.clone());
                     let proposal_reference = queued_proposal.proposal_reference();

openmls/src/group/group_context.rs

@@ -6,9 +6,7 @@ use openmls_traits::types::Ciphersuite;
 
 use super::*;
 use crate::{
-    error::LibraryError,
-    framing::{mls_auth_content::AuthenticatedContent, ConfirmedTranscriptHashInput},
-    versions::ProtocolVersion,
+    error::LibraryError, framing::mls_auth_content::AuthenticatedContent, versions::ProtocolVersion,
 };
 
 #[derive(
@@ -93,8 +91,10 @@ impl GroupContext {
         authenticated_content: &AuthenticatedContent,
     ) -> Result<(), LibraryError> {
         let confirmed_transcript_hash = {
-            let input = ConfirmedTranscriptHashInput::try_from(authenticated_content)
-                .map_err(|_| LibraryError::custom("PublicMessage did not contain a commit"))?;
+            let input = crate::framing::public_message::ConfirmedTranscriptHashInput::try_from(
+                authenticated_content,
+            )
+            .map_err(|_| LibraryError::custom("PublicMessage did not contain a commit"))?;
 
             input.calculate_confirmed_transcript_hash(
                 backend.crypto(),

openmls/src/group/public_group/mod.rs

@@ -26,7 +26,6 @@ use crate::{
     ciphersuite::signable::Verifiable,
     error::LibraryError,
     extensions::RequiredCapabilitiesExtension,
-    framing::InterimTranscriptHashInput,
     messages::{
         group_info::{GroupInfo, VerifiableGroupInfo},
         proposals::{Proposal, ProposalType},
@@ -77,7 +76,9 @@ impl PublicGroup {
         initial_confirmation_tag: ConfirmationTag,
     ) -> Result<Self, LibraryError> {
         let interim_transcript_hash = {
-            let input = InterimTranscriptHashInput::from(&initial_confirmation_tag);
+            let input = crate::framing::public_message::InterimTranscriptHashInput::from(
+                &initial_confirmation_tag,
+            );
 
             input.calculate_interim_transcript_hash(
                 crypto,
@@ -146,7 +147,9 @@ impl PublicGroup {
         let group_context = GroupContext::from(group_info.clone());
 
         let interim_transcript_hash = {
-            let input = InterimTranscriptHashInput::from(group_info.confirmation_tag());
+            let input = crate::framing::public_message::InterimTranscriptHashInput::from(
+                group_info.confirmation_tag(),
+            );
 
             input.calculate_interim_transcript_hash(
                 backend.crypto(),

openmls/src/group/public_group/tests.rs

@@ -17,6 +17,7 @@ use crate::{
 };
 
 use super::PublicGroup;
+use crate::test_utils::*;
 
 #[apply(ciphersuites_and_backends)]
 async fn public_group(ciphersuite: Ciphersuite, backend: &impl OpenMlsCryptoProvider) {

openmls/src/group/tests/external_add_proposal.rs

@@ -16,6 +16,7 @@ use crate::{
 use openmls_traits::types::Ciphersuite;
 
 use super::utils::*;
+use crate::test_utils::*;
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/group/tests/external_remove_proposal.rs

@@ -11,6 +11,7 @@ use crate::{
 use openmls_traits::types::Ciphersuite;
 
 use super::utils::*;
+use crate::test_utils::*;
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/group/tests/kat_transcript_hashes.rs

@@ -100,7 +100,10 @@ pub fn run_test_vector(test_vector: TranscriptTestVector) {
 
     // Verify that *`confirmed_transcript_hash_after`* and `interim_transcript_hash_after` are the result of updating `interim_transcript_hash_before` with `authenticated_content`.
     let got_confirmed_transcript_hash_after = {
-        let input = ConfirmedTranscriptHashInput::try_from(&authenticated_content).unwrap();
+        let input = crate::framing::public_message::ConfirmedTranscriptHashInput::try_from(
+            &authenticated_content,
+        )
+        .unwrap();
 
         input
             .calculate_confirmed_transcript_hash(
@@ -117,7 +120,8 @@ pub fn run_test_vector(test_vector: TranscriptTestVector) {
 
     // Verify that `confirmed_transcript_hash_after` and *`interim_transcript_hash_after`* are the result of updating `interim_transcript_hash_before` with `authenticated_content`.
     let got_interim_transcript_hash_after = {
-        let input = InterimTranscriptHashInput::from(&got_confirmation_tag);
+        let input =
+            crate::framing::public_message::InterimTranscriptHashInput::from(&got_confirmation_tag);
 
         input
             .calculate_interim_transcript_hash(

openmls/src/group/tests/test_commit_validation.rs

@@ -10,6 +10,7 @@ use tls_codec::{Deserialize, Serialize};
 use super::utils::{
     generate_credential_with_key, generate_key_package, resign_message, CredentialWithKeyAndSigner,
 };
+use crate::test_utils::*;
 use crate::{
     binary_tree::LeafNodeIndex,
     ciphersuite::signable::Signable,

openmls/src/group/tests/test_encoding.rs

@@ -7,7 +7,7 @@ use tls_codec::{Deserialize, Serialize};
 use super::utils::*;
 use crate::{
     binary_tree::LeafNodeIndex, framing::*, group::*, key_packages::*, messages::*,
-    schedule::psk::store::ResumptionPskStore, test_utils::*, *,
+    schedule::psk::store::ResumptionPskStore, test_utils::*,
 };
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/group/tests/test_external_commit_validation.rs

@@ -9,6 +9,7 @@ use rstest_reuse::apply;
 use tls_codec::{Deserialize, Serialize};
 
 use self::utils::*;
+use crate::test_utils::*;
 use crate::{
     ciphersuite::{hash_ref::ProposalRef, signable::Verifiable},
     framing::{

openmls/src/group/tests/test_framing.rs

@@ -22,7 +22,6 @@ use crate::{
         sender_ratchet::SenderRatchetConfiguration,
     },
     versions::ProtocolVersion,
-    *,
 };
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
@@ -202,12 +201,13 @@ async fn bad_padding(ciphersuite: Ciphersuite, backend: &impl OpenMlsCryptoProvi
             };
 
             let private_message_content_aad_bytes = {
-                let private_message_content_aad = PrivateContentAad {
-                    group_id: group_id.clone(),
-                    epoch,
-                    content_type: plaintext.content().content_type(),
-                    authenticated_data: VLByteSlice(plaintext.authenticated_data()),
-                };
+                let private_message_content_aad =
+                    crate::framing::private_message::PrivateContentAad {
+                        group_id: group_id.clone(),
+                        epoch,
+                        content_type: plaintext.content().content_type(),
+                        authenticated_data: VLByteSlice(plaintext.authenticated_data()),
+                    };
 
                 private_message_content_aad
                     .tls_serialize_detached()

openmls/src/group/tests/test_framing_validation.rs

@@ -18,6 +18,7 @@ use crate::{
 use super::utils::{
     generate_credential_with_key, generate_key_package, CredentialWithKeyAndSigner,
 };
+use crate::test_utils::*;
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/group/tests/test_past_secrets.rs

@@ -3,8 +3,7 @@
 use openmls_rust_crypto::OpenMlsRustCrypto;
 use openmls_traits::{types::Ciphersuite, OpenMlsCryptoProvider};
 
-use rstest::*;
-use rstest_reuse::{self, *};
+use crate::test_utils::*;
 
 use super::utils::{generate_credential_with_key, generate_key_package};
 use crate::{

openmls/src/group/tests/test_proposal_validation.rs

@@ -13,6 +13,7 @@ use tls_codec::{Deserialize, Serialize};
 use super::utils::{
     generate_credential_with_key, generate_key_package, resign_message, CredentialWithKeyAndSigner,
 };
+use crate::test_utils::*;
 use crate::{
     binary_tree::LeafNodeIndex,
     ciphersuite::hash_ref::ProposalRef,

openmls/src/group/tests/test_remove_operation.rs

@@ -5,7 +5,6 @@ use crate::{
     framing::*,
     group::{config::CryptoConfig, *},
     test_utils::*,
-    *,
 };
 use openmls_rust_crypto::OpenMlsRustCrypto;
 

openmls/src/group/tests/test_wire_format_policy.rs

@@ -6,6 +6,7 @@ use openmls_traits::{signatures::Signer, types::Ciphersuite, OpenMlsCryptoProvid
 use rstest::*;
 use rstest_reuse::{self, *};
 
+use crate::test_utils::*;
 use crate::{
     framing::*,
     group::{config::CryptoConfig, errors::*, *},

openmls/src/group/tests/utils.rs

@@ -19,7 +19,7 @@ use tls_codec::Serialize;
 use crate::{
     ciphersuite::signable::Signable, credentials::*, framing::*, group::*, key_packages::*,
     messages::ConfirmationTag, schedule::psk::store::ResumptionPskStore, test_utils::*,
-    versions::ProtocolVersion, *,
+    versions::ProtocolVersion,
 };
 
 /// Configuration of a client meant to be used in a test setup.

openmls/src/messages/tests/test_codec.rs

@@ -1,13 +1,12 @@
-use openmls_rust_crypto::OpenMlsRustCrypto;
-use tls_codec::{Deserialize, Serialize};
-
+use crate::test_utils::*;
 use crate::{
     extensions::Extensions,
     group::GroupId,
     messages::{PreSharedKeyProposal, ProtocolVersion, ReInitProposal},
     schedule::psk::{ExternalPsk, PreSharedKeyId, Psk, ResumptionPsk, ResumptionPskUsage},
-    test_utils::*,
 };
+use openmls_rust_crypto::OpenMlsRustCrypto;
+use tls_codec::{Deserialize, Serialize};
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/messages/tests/test_export_group_info.rs

@@ -1,14 +1,10 @@
-use tls_codec::{Deserialize, Serialize};
-
+use crate::test_utils::*;
 use crate::{
     ciphersuite::signable::Verifiable,
     group::test_core_group::setup_alice_group,
-    messages::{
-        group_info::{GroupInfo, VerifiableGroupInfo},
-        *,
-    },
-    test_utils::*,
+    messages::group_info::{GroupInfo, VerifiableGroupInfo},
 };
+use tls_codec::{Deserialize, Serialize};
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/messages/tests/test_proposals.rs

@@ -1,15 +1,14 @@
-use openmls_rust_crypto::OpenMlsRustCrypto;
-use tls_codec::{Deserialize, Serialize};
-
+use crate::test_utils::*;
 use crate::{
     binary_tree::LeafNodeIndex,
     ciphersuite::hash_ref::ProposalRef,
     messages::{
         proposals::{Proposal, ProposalOrRef, RemoveProposal},
         proposals_in::ProposalOrRefIn,
     },
-    test_utils::*,
 };
+use openmls_rust_crypto::OpenMlsRustCrypto;
+use tls_codec::{Deserialize, Serialize};
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 

openmls/src/messages/tests/test_welcome.rs

@@ -1,10 +1,9 @@
+use crate::test_utils::*;
 use openmls_basic_credential::SignatureKeyPair;
 use openmls_rust_crypto::OpenMlsRustCrypto;
 use openmls_traits::{
     crypto::OpenMlsCrypto, key_store::OpenMlsKeyStore, types::Ciphersuite, OpenMlsCryptoProvider,
 };
-use rstest::*;
-use rstest_reuse::{self, *};
 use tls_codec::{Deserialize, Serialize};
 
 use crate::{

openmls/src/treesync/mod.rs

@@ -719,6 +719,7 @@ impl TreeSync {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::test_utils::*;
 
     #[cfg(debug_assertions)]
     #[test]

openmls/src/treesync/tests_and_kats/tests/test_diff.rs

@@ -3,6 +3,7 @@ use openmls_traits::{types::Ciphersuite, OpenMlsCryptoProvider};
 use rstest::*;
 use rstest_reuse::apply;
 
+use crate::test_utils::*;
 use crate::{
     credentials::test_utils::new_credential,
     key_packages::KeyPackageBundle,

openmls/tests/book_code.rs

@@ -1,7 +1,6 @@
 use openmls::{
     prelude::{config::CryptoConfig, *},
     test_utils::*,
-    *,
 };
 use openmls_basic_credential::SignatureKeyPair;
 use openmls_rust_crypto::OpenMlsRustCrypto;

openmls/tests/key_store.rs

@@ -1,5 +1,5 @@
 //! A couple of simple tests on how to interact with the key store.
-use openmls::{prelude::*, test_utils::*, *};
+use openmls::{prelude::*, test_utils::*};
 use openmls_basic_credential::SignatureKeyPair;
 
 #[apply(ciphersuites_and_backends)]

openmls/tests/test_decryption_key_index.rs

@@ -5,7 +5,6 @@ use openmls::{
         test_framework::{ActionType, CodecUse, MlsGroupTestSetup},
         *,
     },
-    *,
 };
 
 #[apply(ciphersuites)]

openmls/tests/test_external_commit.rs

@@ -1,6 +1,6 @@
 use openmls::{
     credentials::test_utils::new_credential, messages::group_info::VerifiableGroupInfo, prelude::*,
-    test_utils::*, *,
+    test_utils::*,
 };
 use openmls_basic_credential::SignatureKeyPair;