Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[crypto-awslc] update aws-lc-rs to 1.7.3 #159

Merged
merged 2 commits into from
Jun 14, 2024
Merged

[crypto-awslc] update aws-lc-rs to 1.7.3 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
026b0d9
[crypto-awslc] update aws-lc to 1.7.3
tomleavy Jun 13, 2024
b2637f8
Remove unused identity_provider field in KeyPackageGenerator
tomleavy Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mls-rs-crypto-awslc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
1 change: 0 additions & 1 deletion mls-rs/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mls-rs/src/group/proposal_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions mls-rs/src/group/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions mls-rs/src/key_package/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand All @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions mls-rs/src/key_package/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Loading