From 66b7ff639c73c46cbedeb710ffc88887bc39517e Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 8 Apr 2022 01:53:00 +0200 Subject: Remove sender key from megolm session index implements MSC3700 see https://github.com/matrix-org/matrix-spec-proposals/pull/3700 --- src/timeline/EventStore.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/timeline/EventStore.cpp') diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 867b9cd2..79bd028a 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -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 -- cgit 1.5.1