Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix code for reporting old verify keys in synapse #2156

Merged
merged 1 commit into from
Apr 25, 2017
+2 −3
Merged

Fix code for reporting old verify keys in synapse #2156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions synapse/rest/key/v2/local_key_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,11 @@ def response_json_object(self):
}

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():
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been trying to use .iteritems() everywhere fwiw, but its fine here

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
Expand Down