|
|
@ -666,36 +666,36 @@ supplied as the input keying material. No salt is used. When the
|
|
|
|
`key_agreement_protocol` is `curve25519-hkdf-sha256`, the info parameter
|
|
|
|
`key_agreement_protocol` is `curve25519-hkdf-sha256`, the info parameter
|
|
|
|
is the concatenation of:
|
|
|
|
is the concatenation of:
|
|
|
|
|
|
|
|
|
|
|
|
> - The string `MATRIX_KEY_VERIFICATION_SAS|`.
|
|
|
|
- The string `MATRIX_KEY_VERIFICATION_SAS|`.
|
|
|
|
> - The Matrix ID of the user who sent the `m.key.verification.start`
|
|
|
|
- The Matrix ID of the user who sent the `m.key.verification.start`
|
|
|
|
> message, followed by `|`.
|
|
|
|
message, followed by `|`.
|
|
|
|
> - The Device ID of the device which sent the
|
|
|
|
- The Device ID of the device which sent the
|
|
|
|
> `m.key.verification.start` message, followed by `|`.
|
|
|
|
`m.key.verification.start` message, followed by `|`.
|
|
|
|
> - The public key from the `m.key.verification.key` message sent by
|
|
|
|
- The public key from the `m.key.verification.key` message sent by
|
|
|
|
> the device which sent the `m.key.verification.start` message,
|
|
|
|
the device which sent the `m.key.verification.start` message,
|
|
|
|
> followed by `|`.
|
|
|
|
followed by `|`.
|
|
|
|
> - The Matrix ID of the user who sent the `m.key.verification.accept`
|
|
|
|
- The Matrix ID of the user who sent the `m.key.verification.accept`
|
|
|
|
> message, followed by `|`.
|
|
|
|
message, followed by `|`.
|
|
|
|
> - The Device ID of the device which sent the
|
|
|
|
- The Device ID of the device which sent the
|
|
|
|
> `m.key.verification.accept` message, followed by `|`.
|
|
|
|
`m.key.verification.accept` message, followed by `|`.
|
|
|
|
> - The public key from the `m.key.verification.key` message sent by
|
|
|
|
- The public key from the `m.key.verification.key` message sent by
|
|
|
|
> the device which sent the `m.key.verification.accept` message,
|
|
|
|
the device which sent the `m.key.verification.accept` message,
|
|
|
|
> followed by `|`.
|
|
|
|
followed by `|`.
|
|
|
|
> - The `transaction_id` being used.
|
|
|
|
- The `transaction_id` being used.
|
|
|
|
|
|
|
|
|
|
|
|
When the `key_agreement_protocol` is the deprecated method `curve25519`,
|
|
|
|
When the `key_agreement_protocol` is the deprecated method `curve25519`,
|
|
|
|
the info parameter is the concatenation of:
|
|
|
|
the info parameter is the concatenation of:
|
|
|
|
|
|
|
|
|
|
|
|
> - The string `MATRIX_KEY_VERIFICATION_SAS`.
|
|
|
|
- The string `MATRIX_KEY_VERIFICATION_SAS`.
|
|
|
|
> - The Matrix ID of the user who sent the `m.key.verification.start`
|
|
|
|
- The Matrix ID of the user who sent the `m.key.verification.start`
|
|
|
|
> message.
|
|
|
|
message.
|
|
|
|
> - The Device ID of the device which sent the
|
|
|
|
- The Device ID of the device which sent the
|
|
|
|
> `m.key.verification.start` message.
|
|
|
|
`m.key.verification.start` message.
|
|
|
|
> - The Matrix ID of the user who sent the `m.key.verification.accept`
|
|
|
|
- The Matrix ID of the user who sent the `m.key.verification.accept`
|
|
|
|
> message.
|
|
|
|
message.
|
|
|
|
> - The Device ID of the device which sent the
|
|
|
|
- The Device ID of the device which sent the
|
|
|
|
> `m.key.verification.accept` message.
|
|
|
|
`m.key.verification.accept` message.
|
|
|
|
> - The `transaction_id` being used.
|
|
|
|
- The `transaction_id` being used.
|
|
|
|
|
|
|
|
|
|
|
|
New implementations are discouraged from implementing the `curve25519`
|
|
|
|
New implementations are discouraged from implementing the `curve25519`
|
|
|
|
method.
|
|
|
|
method.
|
|
|
@ -710,14 +710,14 @@ For verification of each party's device keys, HKDF is as defined in RFC
|
|
|
|
supplied as the input keying material. No salt is used, and in the info
|
|
|
|
supplied as the input keying material. No salt is used, and in the info
|
|
|
|
parameter is the concatenation of:
|
|
|
|
parameter is the concatenation of:
|
|
|
|
|
|
|
|
|
|
|
|
> - The string `MATRIX_KEY_VERIFICATION_MAC`.
|
|
|
|
- The string `MATRIX_KEY_VERIFICATION_MAC`.
|
|
|
|
> - The Matrix ID of the user whose key is being MAC-ed.
|
|
|
|
- The Matrix ID of the user whose key is being MAC-ed.
|
|
|
|
> - The Device ID of the device sending the MAC.
|
|
|
|
- The Device ID of the device sending the MAC.
|
|
|
|
> - The Matrix ID of the other user.
|
|
|
|
- The Matrix ID of the other user.
|
|
|
|
> - The Device ID of the device receiving the MAC.
|
|
|
|
- The Device ID of the device receiving the MAC.
|
|
|
|
> - The `transaction_id` being used.
|
|
|
|
- The `transaction_id` being used.
|
|
|
|
> - The Key ID of the key being MAC-ed, or the string `KEY_IDS` if the
|
|
|
|
- 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.
|
|
|
|
item being MAC-ed is the list of key IDs.
|
|
|
|
|
|
|
|
|
|
|
|
###### SAS method: `decimal`
|
|
|
|
###### SAS method: `decimal`
|
|
|
|
|
|
|
|
|
|
|
|