From 8e2ba5ad2ac3af0ea75b7be7f6d7370f67960f79 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 23 Jun 2020 16:20:51 -0400 Subject: [PATCH 1/3] remove nonexistent field in verification and fix types in secret storage --- event-schemas/schema/m.key.verification.accept | 5 ----- specification/modules/secrets.rst | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/event-schemas/schema/m.key.verification.accept b/event-schemas/schema/m.key.verification.accept index ad54488e..3f579cc4 100644 --- a/event-schemas/schema/m.key.verification.accept +++ b/event-schemas/schema/m.key.verification.accept @@ -13,11 +13,6 @@ properties: description: |- An opaque identifier for the verification process. Must be the same as 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: type: string description: |- diff --git a/specification/modules/secrets.rst b/specification/modules/secrets.rst index bc5386bf..2e8e3886 100644 --- a/specification/modules/secrets.rst +++ b/specification/modules/secrets.rst @@ -161,11 +161,11 @@ encrypted as follows: ============ =========== ======================================================= Parameter Type Description ============ =========== ======================================================= -iv String **Required.** The 16-byte initialization vector, +iv string **Required.** The 16-byte initialization vector, encoded as base64. -ciphertext String **Required.** The AES-CTR-encrypted data, encoded as +ciphertext string **Required.** The AES-CTR-encrypted data, encoded as 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 @@ -185,10 +185,10 @@ name string **Required.** The name of the key. algorithm string **Required.** The encryption algorithm to be used for this key. Currently, only ``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. -iv String The 16-byte initialization vector, encoded as base64. -mac String The MAC of the result of encrypting 32 bytes of 0, +iv string The 16-byte initialization vector, encoded as base64. +mac string The MAC of the result of encrypting 32 bytes of 0, encoded as base64. ============ =========== ======================================================= From 72ad26ec927b5b19ff7d80cb350423ebc9820bcc Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 23 Jun 2020 16:24:32 -0400 Subject: [PATCH 2/3] fix changelog --- changelogs/client_server/newsfragments/2647.clarification | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/client_server/newsfragments/2647.clarification b/changelogs/client_server/newsfragments/2647.clarification index a79ec474..a0c5e7cc 100644 --- a/changelogs/client_server/newsfragments/2647.clarification +++ b/changelogs/client_server/newsfragments/2647.clarification @@ -1 +1 @@ -Improve consistency and clarity of event schema ``title``s. +Improve consistency and clarity of event schema ``title``\ s. From 3e3eafc6ce34a12eeef656f38e5402497c16b3de Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 23 Jun 2020 16:34:48 -0400 Subject: [PATCH 3/3] add changelog --- changelogs/client_server/newsfragments/2653.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/2653.clarification diff --git a/changelogs/client_server/newsfragments/2653.clarification b/changelogs/client_server/newsfragments/2653.clarification new file mode 100644 index 00000000..4476d8b3 --- /dev/null +++ b/changelogs/client_server/newsfragments/2653.clarification @@ -0,0 +1 @@ +Fix some errors in the end-to-end encryption spec.