diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 13:01:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 13:01:57 +0100 |
| commit | 350b88656ab7a4ff871dfebc85b9db6d294a4295 (patch) | |
| tree | 07ec2cdb9d669e994ec4f8ec5e7a62a39bdeabc6 /synapse | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff) | |
| download | synapse-350b88656ab7a4ff871dfebc85b9db6d294a4295.tar.xz | |
SYN-383: Actually, we expect this value to be a dict
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/crypto/keyring.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index a061def16a..2a5a8914c0 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -312,8 +312,9 @@ class Keyring(object): time_now_ms = self.clock.time_msec() response_keys = {} verify_keys = {} - for key_id, key_base64 in response_json["verify_keys"].items(): + for key_id, key_data in response_json["verify_keys"].items(): if is_signing_algorithm_supported(key_id): + key_base64 = key_data["key"] key_bytes = decode_base64(key_base64) verify_key = decode_verify_key_bytes(key_id, key_bytes) verify_key.time_added = time_now_ms |