diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
| commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
| tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/crypto/context_factory.py | |
| parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz | |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'synapse/crypto/context_factory.py')
| -rw-r--r-- | synapse/crypto/context_factory.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index f86bd19255..3143322d9c 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -16,6 +16,10 @@ from twisted.internet import ssl from OpenSSL import SSL from twisted.internet._sslverify import _OpenSSLECCurve, _defaultCurveName +import logging + +logger = logging.getLogger(__name__) + class ServerContextFactory(ssl.ContextFactory): """Factory for PyOpenSSL SSL contexts that are used to handle incoming @@ -31,7 +35,7 @@ class ServerContextFactory(ssl.ContextFactory): _ecCurve = _OpenSSLECCurve(_defaultCurveName) _ecCurve.addECKeyToContext(context) except: - pass + 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) @@ -40,4 +44,3 @@ class ServerContextFactory(ssl.ContextFactory): def getContext(self): return self._context - |