chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

events: Move MessageAuthenticationCode::HkdfHmacSha256V2 out of unstable-msc3783

Browse Source
This commit is contained in:
Kévin Commaille 2023-02-14 21:14:45 +01:00 committed by Kévin Commaille
parent fa06f2f839
commit 798c25e32a
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ruma-common/CHANGELOG.md
View File

@ -8,6 +8,7 @@ Bug fixes:
Improvements:
* Add `MatrixVersion::V1_6`
* Stabilize support for fixed base64 for SAS verification (MSC3783 / Matrix 1.6)
# 0.11.2

1
crates/ruma-common/Cargo.toml
View File

@ -42,7 +42,6 @@ unstable-msc3551 = ["unstable-msc1767"]
unstable-msc3552 = ["unstable-msc3551"]
unstable-msc3553 = ["unstable-msc3552"]
unstable-msc3554 = ["unstable-msc1767"]
unstable-msc3783 = []
unstable-msc3931 = []
unstable-msc3932 = ["unstable-msc3931"]
unstable-pdu = []

8
crates/ruma-common/src/events/key/verification.rs
View File

@ -57,8 +57,7 @@ pub enum MessageAuthenticationCode {
HkdfHmacSha256,
/// The second version of the HKDF-HMAC-SHA256 MAC.
#[cfg(feature = "unstable-msc3783")]
#[ruma_enum(rename = "org.matrix.msc3783.hkdf-hmac-sha256")]
#[ruma_enum(rename = "hkdf-hmac-sha256.v2", alias = "org.matrix.msc3783.hkdf-hmac-sha256")]
HkdfHmacSha256V2,
/// The HMAC-SHA256 MAC.
@ -147,13 +146,12 @@ mod tests {
}
#[test]
#[cfg(feature = "unstable-msc3783")]
fn serialize_mac_method_msc3783() {
fn serialize_mac_method_v2() {
let serialized =
serde_json::to_string(&MessageAuthenticationCode::HkdfHmacSha256V2).unwrap();
let deserialized: MessageAuthenticationCode = serde_json::from_str(&serialized).unwrap();
assert_eq!(serialized, "\"org.matrix.msc3783.hkdf-hmac-sha256\"");
assert_eq!(serialized, "\"hkdf-hmac-sha256.v2\"");
assert_eq!(deserialized, MessageAuthenticationCode::HkdfHmacSha256V2);
}
}

2
crates/ruma/Cargo.toml
View File

@ -151,7 +151,6 @@ unstable-msc3554 = ["ruma-common/unstable-msc3554"]
unstable-msc3575 = ["ruma-client-api?/unstable-msc3575"]
unstable-msc3618 = ["ruma-federation-api?/unstable-msc3618"]
unstable-msc3723 = ["ruma-federation-api?/unstable-msc3723"]
unstable-msc3783 = ["ruma-common/unstable-msc3783"]
unstable-msc3931 = ["ruma-common/unstable-msc3931"]
unstable-msc3932 = ["ruma-common/unstable-msc3932"]
unstable-pdu = ["ruma-common/unstable-pdu"]
@ -190,7 +189,6 @@ __ci = [
"unstable-msc3575",
"unstable-msc3618",
"unstable-msc3723",
"unstable-msc3783",
"unstable-msc3932",
]