watcha
/
watcha-synapse
mirror of https://github.com/watcha-fr/synapse
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused VerifyKey.expired and .time_added fields (#5235)

Browse Source 
These were never used, and poking arbitary data into objects from other
packages seems confusing at best.
pull/14/head
Richard van der Hoff 6 years ago committed by GitHub
parent 2e052110ee
commit cc187f9337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      changelog.d/5235.misc
  2. 3
      synapse/crypto/keyring.py

1
changelog.d/5235.misc
Unescape View File

@ -0,0 +1 @@
Remove unused VerifyKey.expired and .time_added fields.

3
synapse/crypto/keyring.py
Unescape View File

@ -589,7 +589,6 @@ class Keyring(object):
key_base64 = key_data["key"] key_base64 = key_data["key"]
key_bytes = decode_base64(key_base64) key_bytes = decode_base64(key_base64)
verify_key = decode_verify_key_bytes(key_id, key_bytes) verify_key = decode_verify_key_bytes(key_id, key_bytes)
verify_key.time_added = time_now_ms
verify_keys[key_id] = verify_key verify_keys[key_id] = verify_key
old_verify_keys = {} old_verify_keys = {}
@ -598,8 +597,6 @@ class Keyring(object):
key_base64 = key_data["key"] key_base64 = key_data["key"]
key_bytes = decode_base64(key_base64) key_bytes = decode_base64(key_base64)
verify_key = decode_verify_key_bytes(key_id, key_bytes) verify_key = decode_verify_key_bytes(key_id, key_bytes)
verify_key.expired = key_data["expired_ts"]
verify_key.time_added = time_now_ms
old_verify_keys[key_id] = verify_key old_verify_keys[key_id] = verify_key
server_name = response_json["server_name"] server_name = response_json["server_name"]

Write Preview
Loading…
Cancel
Save