archive
/
matrix-spec
mirror of https://github.com/matrix-org/matrix-spec
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Travis Ralston <travpc@gmail.com>
pull/977/head
Hubert Chathi 4 years ago committed by Richard van der Hoff
parent de1a468630
commit 1638d2f32e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File

9
content/client-server-api/modules/end_to_end_encryption.md
Unescape Escape View File

@ -416,7 +416,7 @@ In general, verification operates as follows:
methods that Alice's client supports. (Note that "Alice" and "Bob" may in methods that Alice's client supports. (Note that "Alice" and "Bob" may in
fact be the same user, in the case where a user is verifying their own fact be the same user, in the case where a user is verifying their own
devices.) devices.)
- Bob's client prompts Bob to accepts the key verification. When Bob accepts - Bob's client prompts Bob to accept the key verification. When Bob accepts
the verification, Bob's client sends an `m.key.verification.ready` event. the verification, Bob's client sends an `m.key.verification.ready` event.
This event indicates the verification methods, corresponding to the This event indicates the verification methods, corresponding to the
verification methods supported by Alice's client, that Bob's client supports. verification methods supported by Alice's client, that Bob's client supports.
@ -424,7 +424,9 @@ In general, verification operates as follows:
methods supported by both devices to use for verification. When Alice or Bob methods supported by both devices to use for verification. When Alice or Bob
selects a verification method, their device begins the verification by selects a verification method, their device begins the verification by
sending an `m.key.verification.start` event, indicating the selected sending an `m.key.verification.start` event, indicating the selected
verification method. verification method. Note that if there is only one verification method in
common between the devices then the receiver's device (Bob) can auto-select
it.
- Alice and Bob complete the verification as defined by the selected - Alice and Bob complete the verification as defined by the selected
verification method. This could involve their clients exchanging messages, verification method. This could involve their clients exchanging messages,
Alice and Bob exchanging information out-of-band, and/or Alice and Bob Alice and Bob exchanging information out-of-band, and/or Alice and Bob
@ -490,7 +492,8 @@ ensure that encryption does not hinder the verification. For example, if the
verification messages are encrypted, clients must ensure that all the verification messages are encrypted, clients must ensure that all the
recipient's unverified devices receive the keys necessary to decrypt the recipient's unverified devices receive the keys necessary to decrypt the
messages, even if they would normally not be given the keys to decrypt messages messages, even if they would normally not be given the keys to decrypt messages
in the room. Alternatively, verification messages may be sent unencrypted. in the room. Alternatively, verification messages may be sent unencrypted,
though this is not encouraged.
Upon receipt of Alice's `m.key.verification.request` message, if Bob's device Upon receipt of Alice's `m.key.verification.request` message, if Bob's device
does not understand any of the methods, it should not cancel the request as one does not understand any of the methods, it should not cancel the request as one

Write Preview
Loading…
Cancel
Save