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

remove nonexistent field in verification and fix types in secret storage

Browse source
This commit is contained in:
Hubert Chathi 2020-06-23 16:20:51 -04:00
parent 83e4d8c413
commit 8e2ba5ad2a
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
event-schemas/schema/m.key.verification.accept
View file

@ -13,11 +13,6 @@ properties:
description: |- description: |-
An opaque identifier for the verification process. Must be the same as An opaque identifier for the verification process. Must be the same as
the one used for the ``m.key.verification.start`` message. the one used for the ``m.key.verification.start`` message.
method:
type: string
enum: ["m.sas.v1"]
description: |-
The verification method to use.
key_agreement_protocol: key_agreement_protocol:
type: string type: string
description: |- description: |-

12
specification/modules/secrets.rst
View file

@ -161,11 +161,11 @@ encrypted as follows:
============ =========== ======================================================= ============ =========== =======================================================
Parameter Type Description Parameter Type Description
============ =========== ======================================================= ============ =========== =======================================================
iv String **Required.** The 16-byte initialization vector, iv string **Required.** The 16-byte initialization vector,
encoded as base64. encoded as base64.
ciphertext String **Required.** The AES-CTR-encrypted data, encoded as ciphertext string **Required.** The AES-CTR-encrypted data, encoded as
base64. base64.
mac String **Required.** The MAC, encoded as base64. mac string **Required.** The MAC, encoded as base64.
============ =========== ======================================================= ============ =========== =======================================================
For the purposes of allowing clients to check whether a user has correctly For the purposes of allowing clients to check whether a user has correctly
@ -185,10 +185,10 @@ name string **Required.** The name of the key.
algorithm string **Required.** The encryption algorithm to be used for algorithm string **Required.** The encryption algorithm to be used for
this key. Currently, only this key. Currently, only
``m.secret_storage.v1.aes-hmac-sha2`` is supported. ``m.secret_storage.v1.aes-hmac-sha2`` is supported.
passphrase string See `deriving keys from passphrases`_ section for a passphrase object See `deriving keys from passphrases`_ section for a
description of this property. description of this property.
iv String The 16-byte initialization vector, encoded as base64. iv string The 16-byte initialization vector, encoded as base64.
mac String The MAC of the result of encrypting 32 bytes of 0, mac string The MAC of the result of encrypting 32 bytes of 0,
encoded as base64. encoded as base64.
============ =========== ======================================================= ============ =========== =======================================================