diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-09 11:55:52 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-09 11:55:52 +0100 |
| commit | 4019b48aaa2f107887d911909bcd4cadcd828e48 (patch) | |
| tree | c853d6dd17c3aa2f419332ec0283aaeca6af7b29 /synapse/crypto | |
| parent | Change format of receipts to allow inclusion of data (diff) | |
| parent | We don't want semicolons. (diff) | |
| download | synapse-4019b48aaa2f107887d911909bcd4cadcd828e48.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/context_factory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index 2f8618a0df..c4390f3b2b 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -35,9 +35,9 @@ class ServerContextFactory(ssl.ContextFactory): _ecCurve = _OpenSSLECCurve(_defaultCurveName) _ecCurve.addECKeyToContext(context) except: - logger.exception("Failed to enable eliptic curve for TLS") + 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) + context.use_certificate_chain_file(config.tls_certificate_file) if not config.no_tls: context.use_privatekey(config.tls_private_key) |