Fix code for reporting old verify keys in synapse

2017-04-24 18:51:25 +01:00 · 2017-04-24 18:51:25 +01:00 · e6e2627636
parent 30f7bfa121
commit e6e2627636
1 changed files with 2 additions and 3 deletions
--- a/synapse/rest/key/v2/local_key_resource.py
+++ b/synapse/rest/key/v2/local_key_resource.py
@ -84,12 +84,11 @@ class LocalKey(Resource):
            }

        old_verify_keys = {}
-        for key in self.config.old_signing_keys:
-            key_id = "%s:%s" % (key.alg, key.version)
+        for key_id, key in self.config.old_signing_keys.items():
            verify_key_bytes = key.encode()
            old_verify_keys[key_id] = {
                u"key": encode_base64(verify_key_bytes),
-                u"expired_ts": key.expired,
+                u"expired_ts": key.expired_ts,
            }

        tls_fingerprints = self.config.tls_fingerprints