Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-27 21:44:10 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
This commit is contained in:
Hubert Chathi 2023-02-07 19:55:45 -05:00 committed by GitHub
parent 2190080ad1
commit 3d91eccdeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -670,9 +670,9 @@ The process between Alice and Bob verifying each other would be:
their devices if they match or not. their devices if they match or not.
15. Assuming they match, Alice and Bob's devices each calculate Message 15. Assuming they match, Alice and Bob's devices each calculate Message
Authentication Codes (MACs) for: Authentication Codes (MACs) for:
* the keys that they wish to verify (usually their device ed25519 key and * Each of the keys that they wish the other user to verify (usually their
their master cross-signing key) device ed25519 key and their master cross-signing key).
* the list of key IDs that they wish the other user to verify. * The complete list of key IDs that they wish the other user to verify.
The MAC calculation is defined [below](#mac-calculation). The MAC calculation is defined [below](#mac-calculation).
16. Alice's device sends Bob's device an `m.key.verification.mac` 16. Alice's device sends Bob's device an `m.key.verification.mac`
@ -680,10 +680,10 @@ The process between Alice and Bob verifying each other would be:
key IDs to be verified. Bob's device does the same for Bob's device key IDs to be verified. Bob's device does the same for Bob's device
keys and key IDs concurrently with Alice. keys and key IDs concurrently with Alice.
17. When the other device receives the `m.key.verification.mac` message, 17. When the other device receives the `m.key.verification.mac` message,
the device calculates the MAC of its copies of the other device's the device calculates the MACs of its copies of the other device's
keys given in the message, as well as the MAC of the keys given in the message, as well as the MAC of the
comma-separated, sorted, list of key IDs in the message. The device comma-separated, sorted, list of key IDs in the message. The device
compares these with the HMAC values given in the message, and if compares these with the MAC values given in the message, and if
everything matches then the device keys are verified. everything matches then the device keys are verified.
18. Alice and Bob's devices send `m.key.verification.done` messages to complete 18. Alice and Bob's devices send `m.key.verification.done` messages to complete
the verification. the verification.