summary refs log tree commit diff
path: root/synapse/crypto/context_factory.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
committerRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
commitea74189a903aec2437de31863d1bb3205f66995f (patch)
treeae56d5c6cc91cff675e0842b34da12abb0fa6a31 /synapse/crypto/context_factory.py
parentRevert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#... (diff)
parentSpaces summary: call out to other servers (#9653) (diff)
downloadsynapse-ea74189a903aec2437de31863d1bb3205f66995f.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/crypto/context_factory.py')
-rw-r--r--synapse/crypto/context_factory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py

index 14b21796d9..4ca13011e5 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py
@@ -219,7 +219,7 @@ class SSLClientConnectionCreator: # ... and we also gut-wrench a '_synapse_tls_verifier' attribute into the # tls_protocol so that the SSL context's info callback has something to # call to do the cert verification. - setattr(tls_protocol, "_synapse_tls_verifier", self._verifier) + tls_protocol._synapse_tls_verifier = self._verifier return connection