summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-29 11:57:26 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-29 11:57:26 +0100
commit46d200a3a15352e45e167f8cecaca6631c03eea1 (patch)
treee39cc2fe6c436f453ad9174e3dbedd3cd559f017 /synapse/crypto/keyring.py
parentAnd don't bump the schema version unnecessarily (diff)
downloadsynapse-46d200a3a15352e45e167f8cecaca6631c03eea1.tar.xz
Implement minimum_valid_until_ts in the remote key resource
Diffstat (limited to 'synapse/crypto/keyring.py')
-rw-r--r--synapse/crypto/keyring.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 0d24aa7ac2..bfe6e61602 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -289,6 +289,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.time_added = time_now_ms
                 verify_keys[key_id] = verify_key
 
         old_verify_keys = {}