wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

e2ee/qr: clarify that the device's Ed25519 signing key should be used (#1829)

Browse source 
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
This commit is contained in:
Sumner Evans 2024-05-28 10:36:50 -06:00 • committed by GitHub
parent 3674985dd6
commit 500e83b9b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/1829.clarification Normal file
View file

@ -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).

5
content/client-server-api/modules/end_to_end_encryption.md
View file

@ -1197,11 +1197,12 @@ strings in the general form:
- the ID as a UTF-8 string - the ID as a UTF-8 string
- the first key, as 32 bytes. The key to use depends on the mode field: - 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 `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: - 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 - if `0x00`, then what the device thinks the other user's master
cross-signing key is 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 - if `0x02`, then what the device thinks the user's master cross-signing key
is is
- a random shared secret, as a byte string. It is suggested to use a secret - a random shared secret, as a byte string. It is suggested to use a secret