maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2156 from matrix-org/markjh/old_verify_keys

Browse source 
Fix code for reporting old verify keys in synapse
This commit is contained in:
Mark Haines 2017-04-25 10:44:25 +01:00 committed by GitHub
parent 30f7bfa121 e6e2627636
commit 33d5134b59
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/rest/key/v2/local_key_resource.py
View file

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