[PLACEHOLDER] wire/stable version

.github/workflows/coverage.yml

@@ -12,23 +12,28 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
-
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly
+          components: rustc, rust-std, cargo, llvm-tools, llvm-tools-preview
+          run:
       - uses: Swatinem/rust-cache@v2
+      - name: Install grcov
+        run: cargo install grcov
       - name: Run profiling tests
-        run: cargo test --no-fail-fast -p openmls
+        run: |
+          mkdir -p target/debug/coverage
+          cargo test --no-fail-fast -p openmls
         env:
           CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          LLVM_PROFILE_FILE: 'target/debug/coverage/openmls-%p-%m.profraw'
+          RUSTFLAGS: '-Cinstrument-coverage -Ccodegen-units=1 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTDOCFLAGS: '-Cinstrument-coverage -Ccodegen-units=1 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
 
       - name: Run grcov
         id: coverage
-        uses: actions-rs/grcov@v0.1
+        run: grcov . -s . --binary-path ./target/debug/ -t lcov --branch --ignore-not-existing -o ./target/debug/coverage/
 
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v3
         with:
-          files: ${{ steps.coverage.outputs.report }}
+          files: target/debug/coverage/lcov

.github/workflows/tests.yml

@@ -33,7 +33,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: dtolnay/rust-toolchain@stable
         with:
-          targets: i686-pc-windows-msvc, i686-unknown-linux-gnu
+          targets: x86_64-pc-windows-msvc, x86_64-unknown-linux-gnu
       - uses: Swatinem/rust-cache@v2
 
       - name: Toggle rustc mode
@@ -49,16 +49,16 @@ jobs:
         run: cargo test $TEST_MODE -p openmls --verbose
 
       # Test 32 bit builds on windows
-      - name: Tests 32bit windows debug
+      - name: Tests 64bit windows debug
         if: matrix.mode == 'debug' && matrix.os == 'windows-latest'
-        run: cargo test -p openmls --verbose --target i686-pc-windows-msvc
-      - name: Tests 32bit windows release
+        run: cargo test -p openmls --verbose --target x86_64-pc-windows-msvc
+      - name: Tests 64bit windows release
         if: matrix.mode == 'release' && matrix.os == 'windows-latest'
-        run: cargo test --release -p openmls --verbose --target i686-pc-windows-msvc
+        run: cargo test --release -p openmls --verbose --target x86_64-pc-windows-msvc
 
         # Test 32 bit builds on linux
-      - name: Tests 32bit linux
+      - name: Tests 64bit linux
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt update && sudo apt install gcc-multilib
-          cargo test $TEST_MODE -p openmls --verbose --target i686-unknown-linux-gnu
+          cargo test $TEST_MODE -p openmls --verbose --target x86_64-unknown-linux-gnu

Cargo.toml

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

basic_credential/Cargo.toml

@@ -16,15 +16,17 @@ async-trait = { workspace = true }
 serde = "1.0"
 
 # Rust Crypto
-ed25519-dalek = { version = "2.0.0-rc.3", features = ["rand_core"] }
-p256 = "0.13"
-p384 = "0.13"
+ed25519-dalek = { version = "3.0", features = ["rand_core"] }
+elliptic-curve = "0.14"
+p256 = "0.14"
+p384 = "0.14"
+p521 = "0.14"
 secrecy = { version = "0.8", features = ["serde"] }
-rand_core = "0.6"
-getrandom = { version = "0.2", features = ["js"] }
+rand_core = "0.10"
+getrandom = { version = "0.4", features = ["wasm_js"] }
 
 [dev-dependencies]
-rand = "0.8"
+rand = "0.10"
 
 [features]
 clonable = [] # Make the keys clonable

basic_credential/src/lib.rs

@@ -4,6 +4,7 @@
 //!
 //! For now this credential uses only RustCrypto.
 
+use elliptic_curve::Generate as _;
 use secrecy::{ExposeSecret, SecretVec};
 use std::fmt::Debug;
 
@@ -108,17 +109,25 @@ impl SignatureKeyPair {
     /// Generates a fresh signature keypair using the [`SignatureScheme`].
     pub fn new(
         signature_scheme: SignatureScheme,
-        csprng: &mut impl rand_core::CryptoRngCore,
+        csprng: &mut impl rand_core::CryptoRng,
     ) -> Result<Self, CryptoError> {
         let (private, public): (SecretVec<u8>, Vec<u8>) = match signature_scheme {
             SignatureScheme::ECDSA_SECP256R1_SHA256 => {
-                let sk = p256::ecdsa::SigningKey::random(csprng);
-                let pk = sk.verifying_key().to_encoded_point(false).to_bytes().into();
+                let sk = p256::ecdsa::SigningKey::generate_from_rng(csprng);
+                let pk = sk.verifying_key().to_sec1_point(false).to_bytes().into();
                 (sk.to_bytes().to_vec().into(), pk)
             }
             SignatureScheme::ECDSA_SECP384R1_SHA384 => {
-                let sk = p384::ecdsa::SigningKey::random(csprng);
-                let pk = sk.verifying_key().to_encoded_point(false).to_bytes().into();
+                let sk = p384::ecdsa::SigningKey::generate_from_rng(csprng);
+                let pk = sk.verifying_key().to_sec1_point(false).to_bytes().into();
+                (sk.to_bytes().to_vec().into(), pk)
+            }
+            SignatureScheme::ECDSA_SECP521R1_SHA512 => {
+                let sk = p521::ecdsa::SigningKey::generate_from_rng(csprng);
+                let pk = p521::ecdsa::VerifyingKey::from(&sk)
+                    .to_sec1_point(false)
+                    .to_bytes()
+                    .into();
                 (sk.to_bytes().to_vec().into(), pk)
             }
             SignatureScheme::ED25519 => {
@@ -159,31 +168,45 @@ impl SignatureKeyPair {
                     &private[..ed25519_dalek::SECRET_KEY_LENGTH],
                 )
                 .map_err(|_| CryptoError::InvalidKey)?;
-                let pk = ed25519_dalek::VerifyingKey::try_from(&public[..])
+                let pk = ed25519_dalek::VerifyingKey::try_from(public.as_slice())
                     .map_err(|_| CryptoError::InvalidKey)?;
 
                 if sk.verifying_key() != pk {
                     return Err(CryptoError::MismatchKeypair);
                 }
             }
             SignatureScheme::ECDSA_SECP256R1_SHA256 => {
-                let sk = p256::ecdsa::SigningKey::try_from(&private[..])
+                let sk = p256::ecdsa::SigningKey::from_slice(&private)
                     .map_err(|_| CryptoError::InvalidKey)?;
-                let pk = p256::ecdsa::VerifyingKey::try_from(&public[..])
+                let pk = p256::ecdsa::VerifyingKey::from_sec1_bytes(&public)
                     .map_err(|_| CryptoError::InvalidKey)?;
+
                 if sk.verifying_key() != &pk {
                     return Err(CryptoError::MismatchKeypair);
                 }
             }
             SignatureScheme::ECDSA_SECP384R1_SHA384 => {
-                let sk = p384::ecdsa::SigningKey::try_from(&private[..])
+                let sk = p384::ecdsa::SigningKey::from_slice(&private)
                     .map_err(|_| CryptoError::InvalidKey)?;
-                let pk = p384::ecdsa::VerifyingKey::try_from(&public[..])
+
+                let pk = p384::ecdsa::VerifyingKey::from_sec1_bytes(&public)
                     .map_err(|_| CryptoError::InvalidKey)?;
+
                 if sk.verifying_key() != &pk {
                     return Err(CryptoError::MismatchKeypair);
                 }
             }
+            SignatureScheme::ECDSA_SECP521R1_SHA512 => {
+                let sk = p521::ecdsa::SigningKey::from_slice(&private)
+                    .map_err(|_| CryptoError::InvalidKey)?;
+                let pk = p521::ecdsa::VerifyingKey::from_sec1_bytes(&public)
+                    .map_err(|_| CryptoError::InvalidKey)?;
+                let sk_pk = p521::ecdsa::VerifyingKey::from(&sk);
+
+                if sk_pk.to_sec1_point(false) != pk.to_sec1_point(false) {
+                    return Err(CryptoError::MismatchKeypair);
+                }
+            }
             _ => {}
         };
 
@@ -238,9 +261,10 @@ pub mod tests {
             SignatureScheme::ED25519,
             SignatureScheme::ECDSA_SECP256R1_SHA256,
             SignatureScheme::ECDSA_SECP384R1_SHA384,
+            SignatureScheme::ECDSA_SECP521R1_SHA512,
         ];
         for scheme in schemes {
-            let kp = SignatureKeyPair::new(scheme, &mut rand::thread_rng()).unwrap();
+            let kp = SignatureKeyPair::new(scheme, &mut rand::rng()).unwrap();
             let sk = kp.private.expose_secret().clone();
             let pk = kp.public.clone();
             SignatureKeyPair::try_from_raw(scheme, sk, pk).unwrap();

openmls/Cargo.toml

@@ -20,19 +20,19 @@ hex = "0.4"
 async-trait = { workspace = true }
 openmls_basic_credential = { version = "0.2.0", path = "../basic_credential", features = ["clonable", "test-utils"] }
 openmls_x509_credential = { version = "0.2.0", path = "../x509_credential" }
-x509-cert = "0.2"
+x509-cert = "0.3"
 subtle = "2.5"
-fluvio-wasm-timer = "0.2"
+web-time = "1.1.0"
 indexmap = "2.0"
-itertools = "0.11"
+itertools = "0.12"
 
 # Only required for tests.
-rand = { version = "0.8", optional = true, features = ["getrandom"] }
+rand = { version = "0.10", optional = true }
 getrandom = { version = "0.2", optional = true, features = ["js"] }
 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 }
+async-lock = { version = "3.3", 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"] }
@@ -60,7 +60,7 @@ hex = { version = "0.4", features = ["serde"] }
 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"
+pretty_env_logger = "0.5"
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 tempfile = "3"

openmls/src/binary_tree/array_representation/diff.rs

@@ -101,7 +101,7 @@ impl<'a, L: Clone + Debug + Default, P: Clone + Debug + Default> From<&'a ABinar
     }
 }
 
-impl<'a, L: Clone + Debug + Default, P: Clone + Debug + Default> AbDiff<'a, L, P> {
+impl<L: Clone + Debug + Default, P: Clone + Debug + Default> AbDiff<'_, L, P> {
     // Functions handling interactions with leaves.
     ///////////////////////////////////////////////
 

openmls/src/binary_tree/array_representation/treemath.rs

@@ -58,8 +58,8 @@ impl LeafNodeIndex {
     }
 
     /// Warning: Only use when the node index represents a leaf node
-    fn from_tree_index(node_index: u32) -> Self {
-        debug_assert!(node_index % 2 == 0);
+    pub fn from_tree_index(node_index: u32) -> Self {
+        debug_assert!(node_index.is_multiple_of(2));
         LeafNodeIndex(node_index / 2)
     }
 }
@@ -140,7 +140,7 @@ pub enum TreeNodeIndex {
 impl TreeNodeIndex {
     /// Create a new `TreeNodeIndex` from a `u32`.
     fn new(index: u32) -> Self {
-        if index % 2 == 0 {
+        if index.is_multiple_of(2) {
             TreeNodeIndex::Leaf(LeafNodeIndex::from_tree_index(index))
         } else {
             TreeNodeIndex::Parent(ParentNodeIndex::from_tree_index(index))
@@ -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;
         }