mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 08:30:21 +00:00
vendor-prefix the EDU name until MSC1756 is merged into the spec
This commit is contained in:
parent
3e3f9b684e
commit
404e8c8532
2 changed files with 4 additions and 2 deletions
|
@ -55,8 +55,9 @@ class E2eKeysHandler(object):
|
||||||
|
|
||||||
federation_registry = hs.get_federation_registry()
|
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(
|
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
|
# doesn't really work as part of the generic query API, because the
|
||||||
# query request requires an object POST, but we abuse the
|
# query request requires an object POST, but we abuse the
|
||||||
|
|
|
@ -231,7 +231,8 @@ class DeviceWorkerStore(SQLBaseStore):
|
||||||
# add the updated cross-signing keys to the results list
|
# add the updated cross-signing keys to the results list
|
||||||
for user_id, result in iteritems(cross_signing_keys_by_user):
|
for user_id, result in iteritems(cross_signing_keys_by_user):
|
||||||
result["user_id"] = user_id
|
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
|
# 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
|
# devices, in which case E2E isn't going to work well anyway. We'll just
|
||||||
|
|
Loading…
Reference in a new issue