Merge remote-tracking branch 'upstream/main' into update-latest

tylerhawkes · tylerhawkes · commit 952a75dba67a · 2026-03-05T15:20:05.000-07:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -78,8 +78,3 @@ jobs:
         run: |
           export CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=$HOME/.cargo-install/wasm-bindgen-cli/bin/wasm-bindgen-test-runner
           cargo test -p openmls -vv --target wasm32-unknown-unknown -F js,js-test
-
-      - name: Tests Wasm32 on linux with libcrux provider
-        run: |
-          export CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=$HOME/.cargo-install/wasm-bindgen-cli/bin/wasm-bindgen-test-runner
-          cargo test -p openmls -vv --target wasm32-unknown-unknown -F js,js-test,libcrux-provider
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.8.1 (2026-02-13)
+
+### Added
+
+- [#1955](https://github.com/openmls/openmls/pull/1955): Expose functions that allow access to (blank) leaves and parent nodes
+
+### Changed
+
+- [#1964](https://github.com/openmls/openmls/pull/1964): update libcrux and rust_crypto provider dependencies, due to https://github.com/cryspen/libcrux/security/advisories/GHSA-435g-fcv3-8j26 and https://github.com/cryspen/hpke-rs/security/advisories/GHSA-g433-pq76-6cmf
+
 ## 0.8.0 (2026-02-04)
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,14 +22,14 @@ resolver = "2"
 [workspace.dependencies]
 tls_codec = { version = "0.4.2", features = ["derive", "serde", "mls"] }
 
-openmls = { version = "0.8.0", path = "openmls" }
+openmls = { version = "0.8.1", path = "openmls" }
 
 openmls_traits = { version = "0.5.0", path = "traits" }
 openmls_test = { version = "0.2.1", path = "openmls_test" }
 openmls_basic_credential = { version = "0.5.0", path = "basic_credential" }
 
-openmls_rust_crypto = { version = "0.5.0", path = "openmls_rust_crypto" }
-openmls_libcrux_crypto = { version = "0.3.0", path = "libcrux_crypto" }
+openmls_rust_crypto = { version = "0.5.1", path = "openmls_rust_crypto" }
+openmls_libcrux_crypto = { version = "0.3.1", path = "libcrux_crypto" }
 
 openmls_memory_storage = { version = "0.5.0", path = "memory_storage" }
 openmls_sqlite_storage = { version = "0.2.0", path = "sqlite_storage" }
diff --git a/libcrux_crypto/CHANGELOG.md b/libcrux_crypto/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.1 (2026-02-13)
+
+### Changed
+
+- [#1962](https://github.com/openmls/openmls/pull/1962): update libcrux and hpke-rs dependencies
+
 ## 0.3.0 (2026-02-04)
 
 ### Changed
diff --git a/libcrux_crypto/Cargo.toml b/libcrux_crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openmls_libcrux_crypto"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["OpenMLS Authors"]
 description = "A crypto backend for OpenMLS based on libcrux implementing openmls_traits."
@@ -10,12 +10,12 @@ repository = "https://github.com/openmls/openmls/tree/main/openmls_libcrux_crypt
 readme = "../README.md"
 
 [dependencies]
-libcrux-aead = { version = "0.0.5" }
-libcrux-ed25519 = { version = "0.0.5", features = ["rand"] }
-libcrux-hkdf = { version = "0.0.5" }
-libcrux-sha2 = { version = "0.0.5" }
-libcrux-hmac = { version = "0.0.5" }
-libcrux-traits = { version = "0.0.5" }
+libcrux-aead = { version = "0.0.6" }
+libcrux-ed25519 = { version = "0.0.6", features = ["rand"] }
+libcrux-hkdf = { version = "0.0.6" }
+libcrux-sha2 = { version = "0.0.6" }
+libcrux-hmac = { version = "0.0.6" }
+libcrux-traits = { version = "0.0.6" }
 
 openmls_traits = { workspace = true }
 openmls_memory_storage = { workspace = true }
@@ -24,9 +24,9 @@ rand = "0.9"
 tls_codec.workspace = true
 rand_chacha = "0.9"
 
-hpke-rs = { version = "0.5.1", features = ["hazmat", "serialization"] }
-hpke-rs-crypto = { version = "0.4.0" }
-hpke-rs-libcrux = { version = "0.5.1" }
+hpke-rs = { version = "0.6.0", features = ["hazmat", "serialization"] }
+hpke-rs-crypto = { version = "0.6.0" }
+hpke-rs-libcrux = { version = "0.6.0" }
 
 [features]
 extensions-draft-08 = [
diff --git a/openmls/Cargo.toml b/openmls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openmls"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["OpenMLS Authors"]
 edition = "2021"
 description = "A Rust implementation of the Messaging Layer Security (MLS) protocol, as defined in RFC 9420."
diff --git a/openmls/src/binary_tree/array_representation/mod.rs b/openmls/src/binary_tree/array_representation/mod.rs
@@ -9,16 +9,15 @@
 //! [`tree`] and [`diff`] modules for detailed documentation.
 
 // Public
-pub use treemath::LeafNodeIndex;
+pub use treemath::{LeafNodeIndex, ParentNodeIndex};
 
 // Crate
 pub(crate) mod diff;
 pub(crate) mod sorted_iter;
 pub(crate) mod tree;
 
 pub(crate) use treemath::{
-    direct_path, is_node_in_tree, left, right, root, ParentNodeIndex, TreeNodeIndex, TreeSize,
-    MIN_TREE_SIZE,
+    direct_path, is_node_in_tree, left, right, root, TreeNodeIndex, TreeSize, MIN_TREE_SIZE,
 };
 
 #[cfg(any(feature = "test-utils", test))]
diff --git a/openmls/src/binary_tree/array_representation/treemath.rs b/openmls/src/binary_tree/array_representation/treemath.rs
@@ -70,7 +70,7 @@ impl ParentNodeIndex {
     }
 
     /// Return the inner value as `u32`.
-    pub(crate) fn u32(&self) -> u32 {
+    pub fn u32(&self) -> u32 {
         self.0
     }
 
diff --git a/openmls/src/binary_tree/mod.rs b/openmls/src/binary_tree/mod.rs
@@ -6,7 +6,7 @@ use array_representation::{
 };
 
 // Public
-pub use array_representation::LeafNodeIndex;
+pub use array_representation::{LeafNodeIndex, ParentNodeIndex};
 
 // Crate
 pub(crate) mod array_representation;
diff --git a/openmls/src/group/mls_group/creation.rs b/openmls/src/group/mls_group/creation.rs
@@ -1,13 +1,13 @@
 use errors::NewGroupError;
-use openmls_traits::storage::StorageProvider as StorageProviderTrait;
+use openmls_traits::{crypto::OpenMlsCrypto, storage::StorageProvider as StorageProviderTrait};
 
 use super::{builder::MlsGroupBuilder, *};
 use crate::{
     credentials::CredentialWithKey,
     extensions::Extensions,
     group::{
         commit_builder::external_commits::ExternalCommitBuilder,
-        errors::{ExternalCommitError, WelcomeError},
+        errors::{ExportSecretError, ExternalCommitError, WelcomeError},
     },
     messages::{
         group_info::{GroupInfo, VerifiableGroupInfo},
@@ -583,6 +583,35 @@ impl StagedWelcome {
     pub fn public_group(&self) -> &PublicGroup {
         &self.public_group
     }
+
+    /// Exports a secret from the epoch of the group that is joined
+    /// using this [`StagedWelcome`].
+    /// Returns [`ExportSecretError::KeyLengthTooLong`] if the requested
+    /// key length is too long.
+    pub fn export_secret<CryptoProvider: OpenMlsCrypto>(
+        &self,
+        crypto: &CryptoProvider,
+        label: &str,
+        context: &[u8],
+        key_length: usize,
+    ) -> Result<Vec<u8>, ExportSecretError> {
+        if key_length > u16::MAX as usize {
+            log::error!("Got a key that is larger than u16::MAX");
+            return Err(ExportSecretError::KeyLengthTooLong);
+        }
+
+        Ok(self
+            .group_epoch_secrets
+            .exporter_secret()
+            .derive_exported_secret(
+                self.group_context().ciphersuite(),
+                crypto,
+                label,
+                context,
+                key_length,
+            )
+            .map_err(LibraryError::unexpected_crypto_error)?)
+    }
 }
 
 fn keys_for_welcome<Provider: OpenMlsProvider>(
diff --git a/openmls/src/group/mls_group/mod.rs b/openmls/src/group/mls_group/mod.rs
@@ -39,7 +39,7 @@ use crate::{
     storage::{OpenMlsProvider, StorageProvider},
     treesync::{
         node::{encryption_keys::EncryptionKeyPair, leaf_node::LeafNode},
-        RatchetTree,
+        RatchetTree, TreeSync,
     },
     versions::ProtocolVersion,
 };
@@ -347,6 +347,11 @@ impl MlsGroup {
         self.proposal_store().proposals()
     }
 
+    /// Returns the current tree state of the group, in the form of a [`TreeSync`].
+    pub fn treesync(&self) -> &TreeSync {
+        self.public_group.treesync()
+    }
+
     /// Returns a reference to the [`StagedCommit`] of the most recently created
     /// commit. If there was no commit created in this epoch, either because
     /// this commit or another commit was merged, it returns `None`.
@@ -415,6 +420,15 @@ impl MlsGroup {
         self.public_group().group_context().extensions()
     }
 
+    /// Returns a [`LeafNodeValidationError`] if an [`ExtensionType`]
+    /// in `extensions` is not supported by a leaf in this group.
+    pub fn check_extension_support(
+        &self,
+        extensions: &[crate::extensions::ExtensionType],
+    ) -> Result<(), crate::treesync::errors::LeafNodeValidationError> {
+        self.public_group.check_extension_support(extensions)
+    }
+
     /// Returns the index of the sender of a staged, external commit.
     pub fn ext_commit_sender_index(
         &self,
diff --git a/openmls/src/group/public_group/mod.rs b/openmls/src/group/public_group/mod.rs
@@ -446,8 +446,8 @@ impl PublicGroup {
         self.group_context.required_capabilities()
     }
 
-    /// Get treesync.
-    fn treesync(&self) -> &TreeSync {
+    /// Returns the current tree state of the group, in the form of a [`TreeSync`].
+    pub fn treesync(&self) -> &TreeSync {
         &self.treesync
     }
 
diff --git a/openmls/src/group/public_group/validation.rs b/openmls/src/group/public_group/validation.rs
@@ -896,7 +896,7 @@ impl PublicGroup {
 
     /// Returns a [`LeafNodeValidationError`] if an [`ExtensionType`]
     /// in `extensions` is not supported by a leaf in this tree.
-    pub(crate) fn check_extension_support(
+    pub fn check_extension_support(
         &self,
         extensions: &[crate::extensions::ExtensionType],
     ) -> Result<(), LeafNodeValidationError> {
diff --git a/openmls/src/prelude.rs b/openmls/src/prelude.rs
@@ -43,7 +43,7 @@ pub use crate::key_packages::{errors::*, *};
 pub use crate::tree::sender_ratchet::SenderRatchetConfiguration;
 
 // Binary tree
-pub use crate::binary_tree::LeafNodeIndex;
+pub use crate::binary_tree::{LeafNodeIndex, ParentNodeIndex};
 
 // TreeSync
 pub use crate::treesync::{
diff --git a/openmls/src/treesync/mod.rs b/openmls/src/treesync/mod.rs
@@ -371,7 +371,7 @@ impl fmt::Display for RatchetTree {
 /// merging a diff.
 #[derive(Debug, Serialize, Deserialize)]
 #[cfg_attr(any(test, feature = "test-utils"), derive(PartialEq, Clone))]
-pub(crate) struct TreeSync {
+pub struct TreeSync {
     tree: MlsBinaryTree<TreeSyncLeafNode, TreeSyncParentNode>,
     tree_hash: Vec<u8>,
 }
@@ -581,6 +581,20 @@ impl TreeSync {
             .filter_map(|(index, tsn)| tsn.node().as_ref().map(|pn| (index, pn)))
     }
 
+    /// Returns an iterator over the [`ParentNodeIndex`]es of blank [`ParentNode`]s in the tree.
+    pub fn blank_parents<'a>(&'a self) -> impl Iterator<Item = ParentNodeIndex> + 'a {
+        self.tree
+            .parents()
+            .filter_map(|(index, tsn)| tsn.node().as_ref().map_or(Some(index), |_| None))
+    }
+
+    /// Returns an iterator over the [`LeafNodeIndex`]es of blank [`LeafNode`]s in the tree.
+    pub fn blank_leaves<'a>(&'a self) -> impl Iterator<Item = LeafNodeIndex> + 'a {
+        self.tree
+            .leaves()
+            .filter_map(|(index, tsn)| tsn.node().as_ref().map_or(Some(index), |_| None))
+    }
+
     /// Returns the index of the last full leaf in the tree.
     fn rightmost_full_leaf(&self) -> LeafNodeIndex {
         let mut index = LeafNodeIndex::new(0);
diff --git a/openmls/tests/data_next_epoch.rs b/openmls/tests/data_next_epoch.rs
@@ -1,4 +1,5 @@
-//! Tests for StagedCommit next epoch access APIs using the single group test framework
+//! Tests for StagedCommit next epoch access APIs and StagedWelcome export secret API
+//! using the single group test framework
 
 use openmls::{
     prelude::*,
@@ -229,3 +230,79 @@ fn staged_commit_self_removed_returns_none() {
     let _ = staged_commit.group_context();
     let _ = staged_commit.epoch();
 }
+
+/// Test that the exported secret from the StagedWelcome matches the
+/// exported secret from the MlsGroup after creation.
+#[openmls_test]
+fn staged_welcome_export_secret_matches_created_group() {
+    // 1. Create parties
+    let alice_party = CorePartyState::<Provider>::new("alice");
+    let bob_party = CorePartyState::<Provider>::new("bob");
+
+    // 2. Generate pre-group states
+    let alice_pre_group = alice_party.generate_pre_group(ciphersuite);
+    let bob_pre_group = bob_party.generate_pre_group(ciphersuite);
+
+    // 3. Create group config with ratchet tree extension
+    let create_config = MlsGroupCreateConfig::builder()
+        .ciphersuite(ciphersuite)
+        .use_ratchet_tree_extension(true)
+        .build();
+    let join_config = create_config.join_config().clone();
+
+    // 4. Initialize group with Alice
+    let group_id = GroupId::from_slice(b"test-group");
+    let mut group_state =
+        GroupState::new_from_party(group_id, alice_pre_group, create_config).unwrap();
+
+    // 5. Alice invites Bob
+    let [alice] = group_state.members_mut(&["alice"]);
+
+    let (_commit_msg, welcome_msg, _group_info) = alice
+        .group
+        .add_members(
+            &alice_party.provider,
+            &alice.party.signer,
+            std::slice::from_ref(bob_pre_group.key_package_bundle.key_package()),
+        )
+        .expect("error adding Bob");
+
+    // 6. Bob stages the Welcome
+    let welcome = welcome_msg.into_welcome().unwrap();
+    let staged_welcome =
+        StagedWelcome::new_from_welcome(&bob_party.provider, &join_config, welcome, None)
+            .expect("error staging welcome");
+
+    // === Capture values from StagedWelcome ===
+    let staged_export = staged_welcome
+        .export_secret(bob_party.provider.crypto(), "test-label", b"ctx", 32)
+        .unwrap();
+
+    // 7. Bob creates an MlsGroup from the StagedWelcome
+    let bob_group = staged_welcome
+        .into_group(&bob_party.provider)
+        .expect("error creating group");
+
+    // === Verify staged values match group values ===
+    assert_eq!(
+        staged_export,
+        bob_group
+            .export_secret(bob_party.provider.crypto(), "test-label", b"ctx", 32)
+            .unwrap()
+    );
+
+    // 8. Alice merges the commit that added Bob to the group
+    alice
+        .group
+        .merge_pending_commit(&alice_party.provider)
+        .expect("error merging pending commit");
+
+    // === Verify the exported secrets match for Alice and Bob ===
+    assert_eq!(
+        staged_export,
+        alice
+            .group
+            .export_secret(alice_party.provider.crypto(), "test-label", b"ctx", 32)
+            .unwrap()
+    );
+}
diff --git a/openmls/tests/treesync_api.rs b/openmls/tests/treesync_api.rs
diff --git a/openmls_rust_crypto/CHANGELOG.md b/openmls_rust_crypto/CHANGELOG.md
diff --git a/openmls_rust_crypto/Cargo.toml b/openmls_rust_crypto/Cargo.toml
diff --git a/traits/src/types.rs b/traits/src/types.rs

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ impl ParentNodeIndex {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	/// Return the inner value as `u32`.
`73`		`- pub(crate) fn u32(&self) -> u32 {`
	`73`	`+ pub fn u32(&self) -> u32 {`
`74`	`74`	`self.0`
`75`	`75`	`}`
`76`	`76`