Merge pull request #2157 from a-andreyev/aa13q/api-client-server-device-keys

Client-server: Fix upload keys example request

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: |-

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",

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",

changelogs/client_server/newsfragments/2157.clarification

@@ -0,0 +1 @@
+Clarify the encryption algorithms supported by the device of the device keys example.

changelogs/server_server/newsfragments/2157.clarification

@@ -0,0 +1 @@
+ Clarify the encryption algorithms supported by the device of the user keys query example.