char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Fix the SAS MAC calculation KEYIDS -> KEY_IDS.

master
Damir Jelić 2020-07-30 15:45:19 +02:00
parent a07767d417
commit a58ace70a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix_sdk_crypto/src/verification/mod.rs
View File

@ -174,7 +174,7 @@ fn receive_mac_event(
let mut keys = event.content.mac.keys().cloned().collect::<Vec<String>>(); let mut keys = event.content.mac.keys().cloned().collect::<Vec<String>>();
keys.sort(); keys.sort();
let keys = sas let keys = sas
.calculate_mac(&keys.join(","), &format!("{}KEYIDS", &info)) .calculate_mac(&keys.join(","), &format!("{}KEY_IDS", &info))
.expect("Can't calculate SAS MAC"); .expect("Can't calculate SAS MAC");
if keys != event.content.keys { if keys != event.content.keys {
@ -267,7 +267,7 @@ fn get_mac_content(sas: &OlmSas, ids: &SasIds, flow_id: &str) -> MacEventContent
let mut keys = mac.keys().cloned().collect::<Vec<String>>(); let mut keys = mac.keys().cloned().collect::<Vec<String>>();
keys.sort(); keys.sort();
let keys = sas let keys = sas
.calculate_mac(&keys.join(","), &format!("{}KEYIDS", &info)) .calculate_mac(&keys.join(","), &format!("{}KEY_IDS", &info))
.expect("Can't calculate SAS MAC"); .expect("Can't calculate SAS MAC");
MacEventContent { MacEventContent {