summary refs log tree commit diff
path: root/synapse/crypto/context_factory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-06 11:34:06 +0000
committerErik Johnston <erik@matrix.org>2015-03-06 11:34:06 +0000
commit3ce8540484a3cc29ce2970ebf6608b6fd3359931 (patch)
treef822a98ea71d21d477693dac7a3bd31f83d2f549 /synapse/crypto/context_factory.py
parentMerge pull request #102 from matrix-org/randomize_stream_timeout (diff)
downloadsynapse-3ce8540484a3cc29ce2970ebf6608b6fd3359931.tar.xz
Don't look for an TLS private key if we have set --no-tls
Diffstat (limited to 'synapse/crypto/context_factory.py')
-rw-r--r--synapse/crypto/context_factory.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index 24d4abf3e9..2f8618a0df 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -38,7 +38,10 @@ class ServerContextFactory(ssl.ContextFactory):
             logger.exception("Failed to enable eliptic curve for TLS")
         context.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
         context.use_certificate(config.tls_certificate)
-        context.use_privatekey(config.tls_private_key)
+
+        if not config.no_tls:
+            context.use_privatekey(config.tls_private_key)
+
         context.load_tmp_dh(config.tls_dh_params_path)
         context.set_cipher_list("!ADH:HIGH+kEDH:!AECDH:HIGH+kEECDH")