OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

The algorithm is part of the key id

pull/2053/head
Erik Johnston 2017-03-28 11:34:37 +01:00
parent 6ebe2d23b1
commit 58a35366be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/storage/end_to_end_keys.py
View File

@ -144,14 +144,14 @@ class EndToEndKeyStore(SQLBaseStore):
)
existing_key_map = {
row["key_id"]: (row["algorithm"], row["key_json"]) for row in rows
(row["algorithm"], row["key_id"]): row["key_json"] for row in rows
}
new_keys = [] # Keys that we need to insert
for algorithm, key_id, json_bytes in key_list:
if key_id in existing_key_map:
ex_algo, ex_bytes = existing_key_map[key_id]
if algorithm != ex_algo or json_bytes != ex_bytes:
if (algorithm, key_id) in existing_key_map:
ex_bytes = existing_key_map[key_id]
if json_bytes != ex_bytes:
raise SynapseError(
400, "One time key with key_id %r already exists" % (key_id,)
)