summary refs log tree commit diff
path: root/synapse/crypto/context_factory.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2015-07-09 00:45:41 +0100
committerMatthew Hodgson <matthew@matrix.org>2015-07-09 00:45:41 +0100
commitfb8d2862c1d7582096b5f8bd6194dcbe8e1afc01 (patch)
tree367069f6c0d7c7c785cfc6bd799d4b0b827a105a /synapse/crypto/context_factory.py
parentdocument tls_certificate_chain_path more clearly (diff)
downloadsynapse-fb8d2862c1d7582096b5f8bd6194dcbe8e1afc01.tar.xz
remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates
Diffstat (limited to 'synapse/crypto/context_factory.py')
-rw-r--r--synapse/crypto/context_factory.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index d515007ca0..c4390f3b2b 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -37,9 +37,7 @@ class ServerContextFactory(ssl.ContextFactory):
         except:
             logger.exception("Failed to enable elliptic curve for TLS")
         context.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
-        context.use_certificate(config.tls_certificate)
-        if config.tls_certificate_chain_file:
-            context.use_certificate_chain_file(config.tls_certificate_chain_file)
+        context.use_certificate_chain_file(config.tls_certificate_file)
 
         if not config.no_tls:
             context.use_privatekey(config.tls_private_key)