diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-07-10 13:26:18 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-07-10 13:26:18 +0100 |
| commit | a01097d60b9c711d71cd5d1c63cb4fb5b95a8a63 (patch) | |
| tree | a05e8a886381651607f1470cc3137a43106a1089 /synapse | |
| parent | Don't bother with a timeout for one time keys on the server. (diff) | |
| download | synapse-a01097d60b9c711d71cd5d1c63cb4fb5b95a8a63.tar.xz | |
Assume that each device for a user has only one of each type of key
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 4b617c2519..f031267751 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -41,11 +41,11 @@ class KeyUploadServlet(RestServlet): "m.olm.curve25519-aes-sha256", ] "keys": { - "<algorithm>:<key_id>": "<key_base64>", + "<algorithm>:<device_id>": "<key_base64>", }, "signatures:" { - "<user_id>/<device_id>" { - "<algorithm>:<key_id>": "<signature_base64>" + "<user_id>" { + "<algorithm>:<device_id>": "<signature_base64>" } } }, "one_time_keys": { "<algorithm>:<key_id>": "<key_base64>" |