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

Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms

Browse Source
pull/977/head
Hubert Chathi 5 years ago
parent 1d165eec29 06ee66d6b0
commit 788e98711e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
proposals/2241-e2e-verification-in-dms.md
Unescape Escape View File

@ -97,7 +97,7 @@ case this proposal should follow suit.
methods may use the device IDs as part of the verification process. methods may use the device IDs as part of the verification process.
Clients should ignore `m.key.verification.start` events that correspond to Clients should ignore `m.key.verification.start` events that correspond to
verification requests that it did not send. verification requests that they did not send.
#### Rejecting a key verification #### Rejecting a key verification
@ -144,7 +144,7 @@ Clients should ignore events with an `m.relates_to` that have a `rel_type` of
`m.reference` that refer to a verification where it is not the requester `m.reference` that refer to a verification where it is not the requester
nor the accepter. nor the accepter.
### SAS verification ### SAS verification
The messages used in SAS verification are the same as those currently defined, The messages used in SAS verification are the same as those currently defined,
except that instead of the `transaction_id` property, an `m.relates_to` except that instead of the `transaction_id` property, an `m.relates_to`

Write Preview
Loading…
Cancel
Save