From 0f799e9197a0042eadd2c6fc95b101329af945b2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 21 Nov 2022 12:03:45 +0000
Subject: [PATCH 1/2] Further improvements to e2ee logging

A followup to #2884. In particular, it is not always the case that the
`sender_key` in a `m.room_key_withheld` message is the sender of that message.
---
 src/crypto/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/crypto/index.ts b/src/crypto/index.ts
index 04a6e5e1ae6..ccf201edd6b 100644
--- a/src/crypto/index.ts
+++ b/src/crypto/index.ts
@@ -3269,9 +3269,9 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap
         }
 
         logger.info(
-            `Got room key withheld event from ${event.getSender()} (${content.sender_key}) `
-            + `for ${content.algorithm}/${content.room_id}/${content.session_id} `
-            + `with reason ${content.code} (${content.reason})`,
+            `Got room key withheld event from ${event.getSender()}q `
+            + `for ${content.algorithm} session ${content.sender_key}|${content.session_id} `
+            + `in room ${content.room_id} with code ${content.code} (${content.reason})`,
         );
 
         const alg = this.getRoomDecryptor(content.room_id, content.algorithm);

From 75b1094742879aa603fe0353c9e7b9f215d8e4f4 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:19:03 +0000
Subject: [PATCH 2/2] Update src/crypto/index.ts

---
 src/crypto/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/crypto/index.ts b/src/crypto/index.ts
index ccf201edd6b..4a7f73e9bd4 100644
--- a/src/crypto/index.ts
+++ b/src/crypto/index.ts
@@ -3269,7 +3269,7 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap
         }
 
         logger.info(
-            `Got room key withheld event from ${event.getSender()}q `
+            `Got room key withheld event from ${event.getSender()} `
             + `for ${content.algorithm} session ${content.sender_key}|${content.session_id} `
             + `in room ${content.room_id} with code ${content.code} (${content.reason})`,
         );