summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2021-12-08 05:01:38 -0500
committerGitHub <noreply@github.com>2021-12-08 10:01:38 +0000
commit8541809cb952ebf0da2a95dd93eccd5644dab49d (patch)
tree0654ddc2c59a47d0619842a697494c41b856b7cc /synapse/storage
parentFix case in `wait_for_background_updates` where `self.store` does not exist (... (diff)
downloadsynapse-8541809cb952ebf0da2a95dd93eccd5644dab49d.tar.xz
Send and handle cross-signing messages using the stable prefix. (#10520)
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/databases/main/devices.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py
index d5a4a661cd..838a2a6a3d 100644
--- a/synapse/storage/databases/main/devices.py
+++ b/synapse/storage/databases/main/devices.py
@@ -274,7 +274,9 @@ class DeviceWorkerStore(SQLBaseStore):
         # add the updated cross-signing keys to the results list
         for user_id, result in cross_signing_keys_by_user.items():
             result["user_id"] = user_id
-            # FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
+            results.append(("m.signing_key_update", result))
+            # also send the unstable version
+            # FIXME: remove this when enough servers have upgraded
             results.append(("org.matrix.signing_key_update", result))
 
         return now_stream_id, results