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

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

Browse source 
Client-server: Fix upload keys example request
This commit is contained in:
Hubert Chathi 2019-07-08 15:57:56 -04:00 • committed by GitHub
commit ee04b778cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/client-server/definitions/device_keys.yaml
View file

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

4
api/client-server/keys.yaml
View file

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

4
api/server-server/user_keys.yaml
View file

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

1
changelogs/client_server/newsfragments/2157.clarification Normal file
View file

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

1
changelogs/server_server/newsfragments/2157.clarification Normal file
View file

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