Skip to content

Commit 1df00a9

Browse files
uhoregturt2live
authored andcommitted
Apply suggestions from code review
Co-authored-by: Travis Ralston <[email protected]>
1 parent 0c2c723 commit 1df00a9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

content/client-server-api/modules/end_to_end_encryption.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,15 +416,17 @@ In general, verification operates as follows:
416416
methods that Alice's client supports. (Note that "Alice" and "Bob" may in
417417
fact be the same user, in the case where a user is verifying their own
418418
devices.)
419-
- Bob's client prompts Bob to accepts the key verification. When Bob accepts
419+
- Bob's client prompts Bob to accept the key verification. When Bob accepts
420420
the verification, Bob's client sends an `m.key.verification.ready` event.
421421
This event indicates the verification methods, corresponding to the
422422
verification methods supported by Alice's client, that Bob's client supports.
423423
- Alice's or Bob's devices allow their users to select one of the verification
424424
methods supported by both devices to use for verification. When Alice or Bob
425425
selects a verification method, their device begins the verification by
426426
sending an `m.key.verification.start` event, indicating the selected
427-
verification method.
427+
verification method. Note that if there is only one verification method in
428+
common between the devices then the receiver's device (Bob) can auto-select
429+
it.
428430
- Alice and Bob complete the verification as defined by the selected
429431
verification method. This could involve their clients exchanging messages,
430432
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
490492
verification messages are encrypted, clients must ensure that all the
491493
recipient's unverified devices receive the keys necessary to decrypt the
492494
messages, even if they would normally not be given the keys to decrypt messages
493-
in the room. Alternatively, verification messages may be sent unencrypted.
495+
in the room. Alternatively, verification messages may be sent unencrypted,
496+
though this is not encouraged.
494497

495498
Upon receipt of Alice's `m.key.verification.request` message, if Bob's device
496499
does not understand any of the methods, it should not cancel the request as one

0 commit comments

Comments
 (0)