summary refs log tree commit diff
path: root/src/timeline/EventStore.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@ymail.com>2022-04-08 01:53:00 +0200
committerNicolas Werner <nicolas.werner@ymail.com>2022-04-08 01:53:00 +0200
commit66b7ff639c73c46cbedeb710ffc88887bc39517e (patch)
treebd368403ee16a05a4b5ff9558129bd671df06e36 /src/timeline/EventStore.cpp
parentTranslated using Weblate (Finnish) (diff)
downloadnheko-66b7ff639c73c46cbedeb710ffc88887bc39517e.tar.xz
Remove sender key from megolm session index
implements MSC3700

see https://github.com/matrix-org/matrix-spec-proposals/pull/3700
Diffstat (limited to '')
-rw-r--r--src/timeline/EventStore.cpp8
1 files changed, 3 insertions, 5 deletions
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