diff --git a/openmls/src/group/tests_and_kats/tests/proposal_validation.rs b/openmls/src/group/tests_and_kats/tests/proposal_validation.rs index aba7dcdbe..56859ecdc 100644 --- a/openmls/src/group/tests_and_kats/tests/proposal_validation.rs +++ b/openmls/src/group/tests_and_kats/tests/proposal_validation.rs @@ -1046,11 +1046,11 @@ fn test_valsem105() { for key_package_version in [ KeyPackageTestVersion::WrongCiphersuite, KeyPackageTestVersion::WrongVersion, - //KeyPackageTestVersion::UnsupportedVersion, - // KeyPackageTestVersion::UnsupportedCiphersuite, + KeyPackageTestVersion::UnsupportedVersion, + KeyPackageTestVersion::UnsupportedCiphersuite, KeyPackageTestVersion::ValidTestCase, ] { - println!("running test {key_package_version:?}"); + println!("# running test {key_package_version:?}"); // Let's set up a group with Alice and Bob as members. let ProposalValidationTestSetup { diff --git a/openmls/src/treesync/node/leaf_node/capabilities.rs b/openmls/src/treesync/node/leaf_node/capabilities.rs index a8d2a841f..302370976 100644 --- a/openmls/src/treesync/node/leaf_node/capabilities.rs +++ b/openmls/src/treesync/node/leaf_node/capabilities.rs @@ -175,8 +175,7 @@ impl Capabilities { /// Check if these [`Capabilities`] contains the credential. pub(crate) fn contains_credential(&self, credential_type: CredentialType) -> bool { - default_credentials().contains(&credential_type) - || self.credentials().contains(&credential_type) + self.credentials().contains(&credential_type) } /// Check if these [`Capabilities`] contain the extension. @@ -191,17 +190,12 @@ impl Capabilities { /// Check if these [`Capabilities`] contain the version. pub(crate) fn contains_version(&self, version: ProtocolVersion) -> bool { - default_versions().contains(&version) || self.versions().contains(&version) + self.versions().contains(&version) } /// Check if these [`Capabilities`] contain the ciphersuite. pub(crate) fn contains_ciphersuite(&self, ciphersuite: VerifiableCiphersuite) -> bool { - let is_default = default_ciphersuites() - .into_iter() - .map(|c| c.into()) - .any(|c: VerifiableCiphersuite| ciphersuite == c); - - is_default || self.ciphersuites().contains(&ciphersuite) + self.ciphersuites().contains(&ciphersuite) } }