summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 13:12:55 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 13:12:55 +0100
commit882ac83d8d314c5e1490197aaadd19efcbaaf168 (patch)
tree45ae8fab11d2acf826fe3f06bfe2f84c723145b9
parentSYN-383: Actually, we expect this value to be a dict (diff)
downloadsynapse-882ac83d8d314c5e1490197aaadd19efcbaaf168.tar.xz
Fix scripts-dev/convert_server_keys.py to have correct format
-rw-r--r--scripts-dev/convert_server_keys.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py
index 024ddcdbd0..7080ec5fd2 100644
--- a/scripts-dev/convert_server_keys.py
+++ b/scripts-dev/convert_server_keys.py
@@ -47,7 +47,10 @@ def convert_v1_to_v2(server_name, valid_until, keys, certificate):
     return {
         "old_verify_keys": {},
         "server_name": server_name,
-        "verify_keys": keys,
+        "verify_keys": {
+            key_id: {"key": key}
+            for key_id, key in keys
+        },
         "valid_until_ts": valid_until,
         "tls_fingerprints": [fingerprint(certificate)],
     }