Merge branch 'main' into own-proposal

awslabs · Jun 14, 2024 · 5a24654 · 5a24654
2 parents a6aa6a5 + 7c2926e
commit 5a24654
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git 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" }

diff --git a/mls-rs/src/key_package/generator.rs b/mls-rs/src/key_package/generator.rs
@@ -24,7 +24,10 @@ use crate::{
 use super::{KeyPackage, KeyPackageRef};
 
 #[derive(Clone, Debug)]
-pub struct KeyPackageGenerator<'a, CP: CipherSuiteProvider> {
+pub struct KeyPackageGenerator<'a, CP>
+where
+    CP: CipherSuiteProvider,
+{
     pub protocol_version: ProtocolVersion,
     pub cipher_suite_provider: &'a CP,
     pub signing_identity: &'a SigningIdentity,
@@ -70,7 +73,10 @@ impl KeyPackageGeneration {
     }
 }
 
-impl<'a, CP: CipherSuiteProvider> KeyPackageGenerator<'a, CP> {
+impl<'a, CP> KeyPackageGenerator<'a, CP>
+where
+    CP: CipherSuiteProvider,
+{
     #[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)]
     pub(super) async fn sign(&self, package: &mut KeyPackage) -> Result<(), MlsError> {
         package