mirror of
https://github.com/matrix-org/matrix-rust-sdk.git
synced 2026-05-19 06:04:31 -04:00
fixup! chore(crypto): Refactor the cross-signing key wrappers
This commit is contained in:
@@ -144,7 +144,7 @@ impl TryFrom<CrossSigningKey> for MasterPubkey {
|
||||
|
||||
fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
|
||||
if key.usage.contains(&KeyUsage::Master) && key.usage.len() == 1 {
|
||||
Ok(Self(key.into()))
|
||||
Ok(Self(key))
|
||||
} else {
|
||||
Err(serde::de::Error::custom(format!(
|
||||
"Expected cross signing key usage {} was not found",
|
||||
|
||||
@@ -70,7 +70,7 @@ impl TryFrom<CrossSigningKey> for SelfSigningPubkey {
|
||||
|
||||
fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
|
||||
if key.usage.contains(&KeyUsage::SelfSigning) && key.usage.len() == 1 {
|
||||
Ok(Self(key.into()))
|
||||
Ok(Self(key))
|
||||
} else {
|
||||
Err(serde::de::Error::custom(format!(
|
||||
"Expected cross signing key usage {} was not found",
|
||||
|
||||
@@ -64,7 +64,7 @@ impl TryFrom<CrossSigningKey> for UserSigningPubkey {
|
||||
|
||||
fn try_from(key: CrossSigningKey) -> Result<Self, Self::Error> {
|
||||
if key.usage.contains(&KeyUsage::UserSigning) && key.usage.len() == 1 {
|
||||
Ok(Self(key.into()))
|
||||
Ok(Self(key))
|
||||
} else {
|
||||
Err(serde::de::Error::custom(format!(
|
||||
"Expected cross signing key usage {} was not found",
|
||||
|
||||
Reference in New Issue
Block a user