From a01097d60b9c711d71cd5d1c63cb4fb5b95a8a63 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 10 Jul 2015 13:26:18 +0100
Subject: [PATCH] Assume that each device for a user has only one of each type
 of key

---
 synapse/rest/client/v2_alpha/keys.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py
index 4b617c251..f03126775 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>"