From 9ed19a37ada6dd085ecc717b2d80d01bc369acd0 Mon Sep 17 00:00:00 2001 From: Alexey Andreyev Date: Mon, 8 Jul 2019 16:30:54 +0300 Subject: [PATCH] Client-server: Fix upload keys example request Contributes to #1733 Signed-off-by: Alexey Andreyev --- api/client-server/definitions/device_keys.yaml | 2 +- api/client-server/keys.yaml | 4 ++-- api/server-server/user_keys.yaml | 4 ++-- changelogs/client_server/newsfragments/2157.clarification | 1 + changelogs/server_server/newsfragments/2157.clarification | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/client_server/newsfragments/2157.clarification create mode 100644 changelogs/server_server/newsfragments/2157.clarification diff --git a/api/client-server/definitions/device_keys.yaml b/api/client-server/definitions/device_keys.yaml index 888c93a4..41504aba 100644 --- a/api/client-server/definitions/device_keys.yaml +++ b/api/client-server/definitions/device_keys.yaml @@ -33,7 +33,7 @@ properties: type: string description: |- The encryption algorithms supported by this device. - example: ["m.olm.curve25519-aes-sha256", "m.megolm.v1.aes-sha"] + example: ["m.olm.v1.curve25519-aes-sha2", "m.megolm.v1.aes-sha2"] keys: type: object description: |- diff --git a/api/client-server/keys.yaml b/api/client-server/keys.yaml index cce0edca..69e39def 100644 --- a/api/client-server/keys.yaml +++ b/api/client-server/keys.yaml @@ -217,8 +217,8 @@ paths: "user_id": "@alice:example.com", "device_id": "JLAFKJWSCS", "algorithms": [ - "m.olm.v1.curve25519-aes-sha256", - "m.megolm.v1.aes-sha" + "m.olm.v1.curve25519-aes-sha2", + "m.megolm.v1.aes-sha2" ], "keys": { "curve25519:JLAFKJWSCS": "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI", diff --git a/api/server-server/user_keys.yaml b/api/server-server/user_keys.yaml index ea59de2d..93237d80 100644 --- a/api/server-server/user_keys.yaml +++ b/api/server-server/user_keys.yaml @@ -180,8 +180,8 @@ paths: "user_id": "@alice:example.com", "device_id": "JLAFKJWSCS", "algorithms": [ - "m.olm.v1.curve25519-aes-sha256", - "m.megolm.v1.aes-sha" + "m.olm.v1.curve25519-aes-sha2", + "m.megolm.v1.aes-sha2" ], "keys": { "curve25519:JLAFKJWSCS": "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI", diff --git a/changelogs/client_server/newsfragments/2157.clarification b/changelogs/client_server/newsfragments/2157.clarification new file mode 100644 index 00000000..5c1d549b --- /dev/null +++ b/changelogs/client_server/newsfragments/2157.clarification @@ -0,0 +1 @@ +Clarify the encryption algorithms supported by the device of the device keys example. diff --git a/changelogs/server_server/newsfragments/2157.clarification b/changelogs/server_server/newsfragments/2157.clarification new file mode 100644 index 00000000..0acf7495 --- /dev/null +++ b/changelogs/server_server/newsfragments/2157.clarification @@ -0,0 +1 @@ + Clarify the encryption algorithms supported by the device of the user keys query example.