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

Merge pull request #452 from matrix-org/paul/SYN-558 

Actually look up required remote server key IDs
pull/453/head
Mark Haines 2015-12-21 11:01:56 +00:00
parent f85949bde0 a6ba41e078
commit 42a7a09eea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/crypto/keyring.py
View File

@ -230,7 +230,9 @@ class Keyring(object):
missing_keys = {} missing_keys = {}
for group in group_id_to_group.values(): for group in group_id_to_group.values():
missing_keys.setdefault(group.server_name, set()).union(group.key_ids) missing_keys.setdefault(group.server_name, set()).update(
group.key_ids
)
for fn in key_fetch_fns: for fn in key_fetch_fns:
results = yield fn(missing_keys.items()) results = yield fn(missing_keys.items())