diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-23 16:39:13 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-23 16:39:13 +0100 |
| commit | 4bbf7156efdc493fc1c9e3177bef90c45f25f0d3 (patch) | |
| tree | a90839618a5b02ae4516c32db500c0a539efd272 /synapse/crypto | |
| parent | Implement remote key lookup api (diff) | |
| download | synapse-4bbf7156efdc493fc1c9e3177bef90c45f25f0d3.tar.xz | |
Update to match the specification for key/v2
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 17ac66731c..d248776bc1 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -273,7 +273,7 @@ class Keyring(object): key_base64 = key_data["key"] key_bytes = decode_base64(key_base64) verify_key = decode_verify_key_bytes(key_id, key_bytes) - verify_key.expired = key_data["expired"] + verify_key.expired = key_data["expired_ts"] verify_key.time_added = time_now_ms old_verify_keys[key_id] = verify_key @@ -297,7 +297,7 @@ class Keyring(object): ) signed_key_json_bytes = encode_canonical_json(signed_key_json) - ts_valid_until_ms = signed_key_json[u"valid_until"] + ts_valid_until_ms = signed_key_json[u"valid_until_ts"] updated_key_ids = set() if requested_id is not None: |