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

Merge branch 'crypto-improvements' into new-state-store

master
Damir Jelić 2020-12-04 17:02:32 +01:00
parent a7b31c90e0 f483a56f81
commit 2bcdd0163b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix_sdk_crypto/src/identities/manager.rs
View File

@ -136,8 +136,8 @@ impl IdentityManager {
if user_id != &device_keys.user_id || device_id != &device_keys.device_id { if user_id != &device_keys.user_id || device_id != &device_keys.device_id {
warn!( warn!(
"Mismatch in device keys payload of device {} from user {}", "Mismatch in device keys payload of device {}|{} from user {}|{}",
device_keys.device_id, device_keys.user_id device_id, device_keys.device_id, user_id, device_keys.user_id
); );
continue; continue;
} }

2
matrix_sdk_crypto/src/olm/account.rs
View File

@ -307,7 +307,7 @@ impl Account {
// return with an error if it isn't one. // return with an error if it isn't one.
OlmMessage::Message(_) => { OlmMessage::Message(_) => {
warn!( warn!(
"Failed to decrypt a non-pre-key message with all "Failed to decrypt a non-pre-key message with all \
available sessions {} {}", available sessions {} {}",
sender, sender_key sender, sender_key
); );