summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-20 16:23:47 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-20 16:23:47 +0100
commit2f9157b427efe243c306fc219accb1dba9807f10 (patch)
treeffda99124d251e09d81f342b5d2cedb7007778bd /synapse/rest
parentAdd methods for storing and retrieving the raw key json (diff)
downloadsynapse-2f9157b427efe243c306fc219accb1dba9807f10.tar.xz
Implement v2 key lookup
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/key/v2/local_key_resource.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/key/v2/local_key_resource.py b/synapse/rest/key/v2/local_key_resource.py
index f1ac1c8fb3..1c0e0717c1 100644
--- a/synapse/rest/key/v2/local_key_resource.py
+++ b/synapse/rest/key/v2/local_key_resource.py
@@ -74,7 +74,9 @@ class LocalKey(Resource):
         for key in self.config.signing_key:
             verify_key_bytes = key.verify_key.encode()
             key_id = "%s:%s" % (key.alg, key.version)
-            verify_keys[key_id] = encode_base64(verify_key_bytes)
+            verify_keys[key_id] = {
+                u"key": encode_base64(verify_key_bytes)
+            }
 
         old_verify_keys = {}
         for key in self.config.old_signing_keys: