From d1b3198dc7750d2d299db30e7e6ce9a6bb86d1ec Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 4 Aug 2024 18:54:35 -0400 Subject: [PATCH] Remove conditionals for TLS 1.3 It is always available now --- src/OpenSSL/SSL.py | 7 ++----- tests/test_ssl.py | 14 ++------------ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py index 5bd2ad3b..ab41b3af 100644 --- a/src/OpenSSL/SSL.py +++ b/src/OpenSSL/SSL.py @@ -82,6 +82,7 @@ "OP_NO_TLSv1", "OP_NO_TLSv1_1", "OP_NO_TLSv1_2", + "OP_NO_TLSv1_3", "MODE_RELEASE_BUFFERS", "OP_SINGLE_DH_USE", "OP_SINGLE_ECDH_USE", @@ -188,11 +189,7 @@ OP_NO_TLSv1: int = _lib.SSL_OP_NO_TLSv1 OP_NO_TLSv1_1: int = _lib.SSL_OP_NO_TLSv1_1 OP_NO_TLSv1_2: int = _lib.SSL_OP_NO_TLSv1_2 -try: - OP_NO_TLSv1_3: int = _lib.SSL_OP_NO_TLSv1_3 - __all__.append("OP_NO_TLSv1_3") -except AttributeError: - pass +OP_NO_TLSv1_3: int = _lib.SSL_OP_NO_TLSv1_3 MODE_RELEASE_BUFFERS: int = _lib.SSL_MODE_RELEASE_BUFFERS diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 392673ef..d95e8478 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -101,7 +101,6 @@ SSLEAY_DIR, SSLEAY_PLATFORM, SSLEAY_VERSION, - TLS1_1_VERSION, TLS1_2_VERSION, TLS1_3_VERSION, TLS_METHOD, @@ -137,11 +136,6 @@ except ImportError: SSL_ST_INIT = SSL_ST_BEFORE = SSL_ST_OK = SSL_ST_RENEGOTIATE = None -try: - from OpenSSL.SSL import OP_NO_TLSv1_3 -except ImportError: - OP_NO_TLSv1_3 = None - from .test_crypto import ( client_cert_pem, client_key_pem, @@ -1016,12 +1010,8 @@ def keylog(conn, line): assert all(b"CLIENT_RANDOM" in line for conn, line in called) def test_set_proto_version(self): - if OP_NO_TLSv1_3 is None: - high_version = TLS1_2_VERSION - low_version = TLS1_1_VERSION - else: - high_version = TLS1_3_VERSION - low_version = TLS1_2_VERSION + high_version = TLS1_3_VERSION + low_version = TLS1_2_VERSION server_context = Context(TLS_METHOD) server_context.use_certificate(