diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
| commit | 3accee1a8c2804620713ac4ff068a4a18a7de192 (patch) | |
| tree | 5bfad3c1e8653713f8e14062732f892797279a92 /synapse/rest/key | |
| parent | Merge pull request #2136 from bbigras/patch-1 (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-3accee1a8c2804620713ac4ff068a4a18a7de192.tar.xz | |
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0
Diffstat (limited to 'synapse/rest/key')
| -rw-r--r-- | synapse/rest/key/v2/local_key_resource.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/key/v2/local_key_resource.py b/synapse/rest/key/v2/local_key_resource.py index ff95269ba8..be68d9a096 100644 --- 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 |