From 500e83b9b796c25a66fae94be19daa2ec7b9c9a9 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 28 May 2024 10:36:50 -0600 Subject: [PATCH] e2ee/qr: clarify that the device's Ed25519 signing key should be used (#1829) Signed-off-by: Sumner Evans --- changelogs/client_server/newsfragments/1829.clarification | 1 + content/client-server-api/modules/end_to_end_encryption.md | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/client_server/newsfragments/1829.clarification diff --git a/changelogs/client_server/newsfragments/1829.clarification b/changelogs/client_server/newsfragments/1829.clarification new file mode 100644 index 00000000..68ce6207 --- /dev/null +++ b/changelogs/client_server/newsfragments/1829.clarification @@ -0,0 +1 @@ +Clarify that the device's Ed25519 signing key should be used in QR code verification (as opposed to the device's Curve25519 identity key). diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md index f18cb9eb..1b3bd7b3 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -1197,11 +1197,12 @@ strings in the general form: - the ID as a UTF-8 string - the first key, as 32 bytes. The key to use depends on the mode field: - if `0x00` or `0x01`, then the current user's own master cross-signing public key - - if `0x02`, then the current device's device key + - if `0x02`, then the current device's Ed25519 signing key - the second key, as 32 bytes. The key to use depends on the mode field: - if `0x00`, then what the device thinks the other user's master cross-signing key is - - if `0x01`, then what the device thinks the other device's device key is + - if `0x01`, then what the device thinks the other device's Ed25519 signing + key is - if `0x02`, then what the device thinks the user's master cross-signing key is - a random shared secret, as a byte string. It is suggested to use a secret