thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sender key from megolm session index

Browse source 
implements MSC3700

see https://github.com/matrix-org/matrix-spec-proposals/pull/3700
This commit is contained in:
Nicolas Werner 2022-04-08 01:53:00 +02:00
parent a5e0e47a81
commit 66b7ff639c
4 changed files with 102 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/timeline/EventStore.cpp
View file

@ -691,17 +691,15 @@ EventStore::decryptEvent(const IdIndex &idx,
break;
}
case olm::DecryptionErrorCode::DbError:
nhlog::db()->critical("failed to retrieve megolm session with index ({}, {}, {})",
nhlog::db()->critical("failed to retrieve megolm session with index ({}, {})",
index.room_id,
index.session_id,
index.sender_key,
decryptionResult.error_message.value_or(""));
break;
case olm::DecryptionErrorCode::DecryptionFailed:
nhlog::crypto()->critical("failed to decrypt message with index ({}, {}, {}): {}",
nhlog::crypto()->critical("failed to decrypt message with index ({}, {}): {}",
index.room_id,
index.session_id,
index.sender_key,
decryptionResult.error_message.value_or(""));
break;
case olm::DecryptionErrorCode::ParsingFailed:
@ -710,7 +708,7 @@ EventStore::decryptEvent(const IdIndex &idx,
nhlog::crypto()->critical("Reply attack while decryptiong event {} in room {} from {}!",
e.event_id,
room_id_,
index.sender_key);
e.sender);
break;
case olm::DecryptionErrorCode::NoError:
// unreachable