From 026b0d975e43c46b7e49ba39b7be49749b13be11 Mon Sep 17 00:00:00 2001 From: Tom Leavy Date: Thu, 13 Jun 2024 17:13:26 -0400 Subject: [PATCH 1/2] [crypto-awslc] update aws-lc to 1.7.3 --- mls-rs-crypto-awslc/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mls-rs-crypto-awslc/Cargo.toml b/mls-rs-crypto-awslc/Cargo.toml index 669b4b43..95435b03 100644 --- a/mls-rs-crypto-awslc/Cargo.toml +++ b/mls-rs-crypto-awslc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mls-rs-crypto-awslc" -version = "0.11.2" +version = "0.11.3" edition = "2021" description = "AWS-LC based CryptoProvider for mls-rs" homepage = "https://github.com/awslabs/mls-rs" @@ -9,8 +9,8 @@ keywords = ["mls", "mls-rs", "aws-lc"] license = "Apache-2.0 OR MIT" [dependencies] -aws-lc-rs = "1.7.0" -aws-lc-sys = { version = "0.17.0" } +aws-lc-rs = "=1.7.3" +aws-lc-sys = { version = "0.18.0" } mls-rs-core = { path = "../mls-rs-core", version = "=0.18.0" } mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "0.9.0" } mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "0.10.0" } From b2637f87dca43333e06610902d1a9c3ffb1691e6 Mon Sep 17 00:00:00 2001 From: Tom Leavy Date: Thu, 13 Jun 2024 17:27:13 -0400 Subject: [PATCH 2/2] Remove unused identity_provider field in KeyPackageGenerator --- mls-rs/src/client.rs | 1 - mls-rs/src/group/proposal_cache.rs | 1 - mls-rs/src/group/test_utils.rs | 2 -- mls-rs/src/key_package/generator.rs | 11 +++-------- mls-rs/src/key_package/mod.rs | 2 -- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mls-rs/src/client.rs b/mls-rs/src/client.rs index a7031bba..7bcdd11f 100644 --- a/mls-rs/src/client.rs +++ b/mls-rs/src/client.rs @@ -445,7 +445,6 @@ where cipher_suite_provider: &cipher_suite_provider, signing_key: self.signer()?, signing_identity, - identity_provider: &self.config.identity_provider(), }; let key_pkg_gen = key_package_generator diff --git a/mls-rs/src/group/proposal_cache.rs b/mls-rs/src/group/proposal_cache.rs index c0512047..07325e4f 100644 --- a/mls-rs/src/group/proposal_cache.rs +++ b/mls-rs/src/group/proposal_cache.rs @@ -3580,7 +3580,6 @@ mod tests { cipher_suite_provider: &test_cipher_suite_provider(TEST_CIPHER_SUITE), signing_identity: &signing_identity, signing_key: &secret_key, - identity_provider: &BasicWithCustomProvider::new(BasicIdentityProvider::new()), }; generator diff --git a/mls-rs/src/group/test_utils.rs b/mls-rs/src/group/test_utils.rs index 2800182d..7cfe5217 100644 --- a/mls-rs/src/group/test_utils.rs +++ b/mls-rs/src/group/test_utils.rs @@ -19,7 +19,6 @@ use crate::{ client_builder::test_utils::{TestClientBuilder, TestClientConfig}, crypto::test_utils::test_cipher_suite_provider, extension::ExtensionType, - identity::basic::BasicIdentityProvider, identity::test_utils::get_test_signing_identity, key_package::{KeyPackageGeneration, KeyPackageGenerator}, mls_rules::{CommitOptions, DefaultMlsRules}, @@ -210,7 +209,6 @@ pub(crate) async fn test_member( cipher_suite_provider: &test_cipher_suite_provider(cipher_suite), signing_identity: &signing_identity, signing_key: &signing_key, - identity_provider: &BasicIdentityProvider, }; let key_package = key_package_generator diff --git a/mls-rs/src/key_package/generator.rs b/mls-rs/src/key_package/generator.rs index 4d71094f..ac7c3cfe 100644 --- a/mls-rs/src/key_package/generator.rs +++ b/mls-rs/src/key_package/generator.rs @@ -5,7 +5,7 @@ use alloc::vec; use alloc::vec::Vec; use mls_rs_codec::{MlsDecode, MlsEncode}; -use mls_rs_core::{error::IntoAnyError, identity::IdentityProvider, key_package::KeyPackageData}; +use mls_rs_core::{error::IntoAnyError, key_package::KeyPackageData}; use crate::client::MlsError; use crate::{ @@ -24,16 +24,14 @@ use crate::{ use super::{KeyPackage, KeyPackageRef}; #[derive(Clone, Debug)] -pub struct KeyPackageGenerator<'a, IP, CP> +pub struct KeyPackageGenerator<'a, CP> where - IP: IdentityProvider, CP: CipherSuiteProvider, { pub protocol_version: ProtocolVersion, pub cipher_suite_provider: &'a CP, pub signing_identity: &'a SigningIdentity, pub signing_key: &'a SignatureSecretKey, - pub identity_provider: &'a IP, } #[derive(Clone, Debug)] @@ -75,9 +73,8 @@ impl KeyPackageGeneration { } } -impl<'a, IP, CP> KeyPackageGenerator<'a, IP, CP> +impl<'a, CP> KeyPackageGenerator<'a, CP> where - IP: IdentityProvider, CP: CipherSuiteProvider, { #[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)] @@ -199,7 +196,6 @@ mod tests { cipher_suite_provider: &cipher_suite_provider, signing_identity: &signing_identity, signing_key: &signing_key, - identity_provider: &BasicIdentityProvider, }; let mut capabilities = get_test_capabilities(); @@ -300,7 +296,6 @@ mod tests { cipher_suite_provider: &test_cipher_suite_provider(cipher_suite), signing_identity: &signing_identity, signing_key: &signing_key, - identity_provider: &BasicIdentityProvider, }; let first_key_package = test_generator diff --git a/mls-rs/src/key_package/mod.rs b/mls-rs/src/key_package/mod.rs index b3ef83b0..6253a5cf 100644 --- a/mls-rs/src/key_package/mod.rs +++ b/mls-rs/src/key_package/mod.rs @@ -173,7 +173,6 @@ pub(crate) mod test_utils { use crate::{ crypto::test_utils::test_cipher_suite_provider, group::framing::MlsMessagePayload, - identity::basic::BasicIdentityProvider, identity::test_utils::get_test_signing_identity, tree_kem::{leaf_node::test_utils::get_test_capabilities, Lifetime}, MlsMessage, @@ -206,7 +205,6 @@ pub(crate) mod test_utils { cipher_suite_provider: &test_cipher_suite_provider(cipher_suite), signing_identity: &signing_identity, signing_key: &secret_key, - identity_provider: &BasicIdentityProvider, }; let key_package = generator