summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:49:48 -0400
committerGitHub <noreply@github.com>2019-10-31 22:49:48 -0400
commitc3fc176c6047c8194262a64599d000e9cb43f7f8 (patch)
treeb50ab095311a0e492ce71829c1c29438f485a262 /synapse
parentMerge branch 'develop' into cross-signing_federation (diff)
downloadsynapse-c3fc176c6047c8194262a64599d000e9cb43f7f8.tar.xz
Update synapse/storage/data_stores/main/devices.py
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/data_stores/main/devices.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/devices.py b/synapse/storage/data_stores/main/devices.py
index 717eab4159..71f62036c0 100644
--- a/synapse/storage/data_stores/main/devices.py
+++ b/synapse/storage/data_stores/main/devices.py
@@ -203,7 +203,7 @@ class DeviceWorkerStore(SQLBaseStore):
                 result = cross_signing_keys_by_user.setdefault(user_id, {})
                 result["master_key"] = master_key_by_user[user_id]["key_info"]
             elif (
-                user_id in master_key_by_user
+                user_id in self_signing_key_by_user
                 and device_id == self_signing_key_by_user[user_id]["device_id"]
             ):
                 result = cross_signing_keys_by_user.setdefault(user_id, {})