diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
| commit | 7a6df013cc8a128278d2ce7e5eb569e0b424f9b0 (patch) | |
| tree | 5de624a65953eb96ab67274462d850a88c0cce3c /synapse/crypto/context_factory.py | |
| parent | make lazy_load_members configurable in filters (diff) | |
| parent | Merge pull request #3256 from matrix-org/3218-official-prom (diff) | |
| download | synapse-7a6df013cc8a128278d2ce7e5eb569e0b424f9b0.tar.xz | |
merge develop
Diffstat (limited to 'synapse/crypto/context_factory.py')
| -rw-r--r-- | synapse/crypto/context_factory.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index cff3ca809a..0397f73ab4 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -13,8 +13,8 @@ # limitations under the License. from twisted.internet import ssl -from OpenSSL import SSL -from twisted.internet._sslverify import _OpenSSLECCurve, _defaultCurveName +from OpenSSL import SSL, crypto +from twisted.internet._sslverify import _defaultCurveName import logging @@ -32,8 +32,9 @@ class ServerContextFactory(ssl.ContextFactory): @staticmethod def configure_context(context, config): try: - _ecCurve = _OpenSSLECCurve(_defaultCurveName) - _ecCurve.addECKeyToContext(context) + _ecCurve = crypto.get_elliptic_curve(_defaultCurveName) + context.set_tmp_ecdh(_ecCurve) + except Exception: logger.exception("Failed to enable elliptic curve for TLS") context.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) |