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

fixup! events: Deprecate MessageAuthenticationCode::HkdfHmacSha256

Browse Source
This commit is contained in:
Kévin Commaille 2023-02-14 22:06:37 +01:00 committed by Kévin Commaille
parent 4323fe8b3f
commit 4718a88bfe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,7 @@ mod tests {
"method": "m.sas.v1", "method": "m.sas.v1",
"key_agreement_protocol": "curve25519", "key_agreement_protocol": "curve25519",
"hash": "sha256", "hash": "sha256",
"message_authentication_code": "hkdf-hmac-sha256", "message_authentication_code": "hkdf-hmac-sha256.v2",
"short_authentication_string": ["decimal"] "short_authentication_string": ["decimal"]
}, },
"type": "m.key.verification.accept", "type": "m.key.verification.accept",

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

@ -152,8 +152,8 @@ pub struct SasV1Content {
/// The message authentication codes that the sending device understands. /// The message authentication codes that the sending device understands.
/// ///
/// Must include at least `hkdf-hmac-sha256.v2`. Should also include `hkdf-hmac-sha256` for /// Must include at least `hkdf-hmac-sha256.v2`. Should also include `hkdf-hmac-sha256` for
/// compatibility with older clients, though this identifier is deprecated and will be /// compatibility with older clients, though this MAC is deprecated and will be removed in a
/// removed in a future version of the spec. /// future version of the spec.
pub message_authentication_codes: Vec<MessageAuthenticationCode>, pub message_authentication_codes: Vec<MessageAuthenticationCode>,
/// The SAS methods the sending device (and the sending device's user) understands. /// The SAS methods the sending device (and the sending device's user) understands.
@ -355,7 +355,7 @@ mod tests {
"method": "m.sas.v1", "method": "m.sas.v1",
"hashes": ["sha256"], "hashes": ["sha256"],
"key_agreement_protocols": ["curve25519"], "key_agreement_protocols": ["curve25519"],
"message_authentication_codes": ["hkdf-hmac-sha256"], "message_authentication_codes": ["hkdf-hmac-sha256.v2"],
"short_authentication_string": ["decimal"] "short_authentication_string": ["decimal"]
}); });