diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-22 22:33:23 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-22 22:33:23 -0400 |
| commit | 404e8c85321b4fe9b9b74e07841367c4cf201551 (patch) | |
| tree | 622a5a49d700c4455b184c5a2b5d5d9da4177e16 | |
| parent | fix unit test (diff) | |
| download | synapse-404e8c85321b4fe9b9b74e07841367c4cf201551.tar.xz | |
vendor-prefix the EDU name until MSC1756 is merged into the spec
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 3 | ||||
| -rw-r--r-- | synapse/storage/devices.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 73572f4614..d25af42f5f 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -55,8 +55,9 @@ class E2eKeysHandler(object): federation_registry = hs.get_federation_registry() + # FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec federation_registry.register_edu_handler( - "m.signing_key_update", self._edu_updater.incoming_signing_key_update + "org.matrix.signing_key_update", self._edu_updater.incoming_signing_key_update ) # doesn't really work as part of the generic query API, because the # query request requires an object POST, but we abuse the diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index 1aaef1fbb0..6ac165068e 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -231,7 +231,8 @@ class DeviceWorkerStore(SQLBaseStore): # add the updated cross-signing keys to the results list for user_id, result in iteritems(cross_signing_keys_by_user): result["user_id"] = user_id - cross_signing_results.append(("m.signing_key_update", result)) + # FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec + cross_signing_results.append(("org.matrix.signing_key_update", result)) # That should only happen if a client is spamming the server with new # devices, in which case E2E isn't going to work well anyway. We'll just |