diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
| commit | f31e65ca8b3a056b81c9ee1c8e5be298e36ed495 (patch) | |
| tree | 414d6a488f090cea0aff41ef8ca7346f47567a62 /synapse/crypto/context_factory.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff) | |
| parent | D'oh: underscore, not hyphen (diff) | |
| download | synapse-f31e65ca8b3a056b81c9ee1c8e5be298e36ed495.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/crypto/context_factory.py')
| -rw-r--r-- | synapse/crypto/context_factory.py | 5 |
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") |