summary refs log tree commit diff
path: root/synapse/crypto/context_factory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-12 11:22:06 +0100
committerErik Johnston <erik@matrix.org>2018-09-12 11:22:06 +0100
commitebb3cc4ab62362ae2ff5e4c6524d39cbacdbb17d (patch)
tree2ac4307d4864acd383434a1d60b11b23b03ef8ea /synapse/crypto/context_factory.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentPort crypto/ to Python 3 (#3822) (diff)
downloadsynapse-ebb3cc4ab62362ae2ff5e4c6524d39cbacdbb17d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse 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 1a391adec1..02b76dfcfb 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py
@@ -123,6 +123,6 @@ class ClientTLSOptionsFactory(object): def get_options(self, host): return ClientTLSOptions( - host.decode('utf-8'), + host, CertificateOptions(verify=False).getContext() )