Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-02 22:18:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Hubert Chathi 2019-10-23 13:24:18 -04:00
parent 1d165eec29 06ee66d6b0
commit 788e98711e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
proposals/2241-e2e-verification-in-dms.md
View file

@ -97,7 +97,7 @@ case this proposal should follow suit.
methods may use the device IDs as part of the verification process.
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
@ -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
nor the accepter.
### SAS verification
### SAS verification
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`