wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't include unrelated changes

Browse source
This commit is contained in:
Hubert Chathi 2020-05-11 11:54:50 -04:00
parent 9dc6e00335
commit 86d0d04ed1
1 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
proposals/xxxx-sas-v2.md
View file

@ -21,25 +21,11 @@ concatenation of:
which sent the `m.key.verification.accept` message, followed by `|`. which sent the `m.key.verification.accept` message, followed by `|`.
* The `transaction_id` being used. * The `transaction_id` being used.
A new `message_authentication_code` method, `hkdf-hmac-sha256.v2` is introduced. It The differences from `curve25519` are the addition of the public keys, and the
is the same as `hkdf-hmac-sha256`, except that the info parameter for the HKDF addition of `|` as delimiter between the fields.
is the concatenation of:
* The string `MATRIX_KEY_VERIFICATION_MAC|`. The `key_agreement_protocol` `curve25519` is deprecated and may be removed in
* The Matrix ID of the user whose key is being MAC-ed, followed by `|`. the future.
* The Device ID of the device sending the MAC, followed by `|`.
* The Matrix ID of the other user, followed by `|`.
* The Device ID of the device receiving the MAC, followed by `|`.
* The transaction_id being used, followed by `|`.
* The Key ID of the key being MAC-ed, or the string `KEY_IDS` if the item
being MAC-ed is the list of key IDs.
A new `short_authentication_string` method, `emoji.v2` is introduced. It is
the same as `emoji`, but emoji number 34 is changed from 🔧 (`U+1F527` Spanner)
to ⭐ (`U+2B50` Star).
The `key_agreement_protocol` `curve25519`, `message_authentication_code`
`hkdf-hmac-sha256`, and `short_authentication_string` `emoji` are deprecated.
## Potential issues ## Potential issues