summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-10-27 00:15:17 -0400
committerGitHub <noreply@github.com>2020-10-26 21:15:17 -0700
commit124a0134fdb7decb0136b4b6f7892b87b919e74e (patch)
tree01a47b984f122ec7891185010f8f96c30ccce6fb /tests
parent669dcc3488a4803b2c321218def6554805940c48 (diff)
downloadpyopenssl-124a0134fdb7decb0136b4b6f7892b87b919e74e.tar.gz
Drop CI for OpenSSL 1.0.2 (#953)
* Drop CI for OpenSSL 1.0.2 * Delete code for coverage reasons * Bump minimum cryptography version
Diffstat (limited to 'tests')
-rw-r--r--tests/test_ssl.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index e405b1a..aed2367 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -2621,17 +2621,8 @@ class TestConnection(object):
with a context using a different SSL method than the `Connection`
is using, a `OpenSSL.SSL.Error` is raised.
"""
- # Make this work on both OpenSSL 1.0.0, which doesn't support TLSv1.2
- # and also on OpenSSL 1.1.0 which doesn't support SSLv3. (SSL_ST_INIT
- # is a way to check for 1.1.0)
- if SSL_ST_INIT is None:
- v1 = TLSv1_2_METHOD
- v2 = TLSv1_METHOD
- elif hasattr(_lib, "SSLv3_method"):
- v1 = TLSv1_METHOD
- v2 = SSLv3_METHOD
- else:
- pytest.skip("Test requires either OpenSSL 1.1.0 or SSLv3")
+ v1 = TLSv1_2_METHOD
+ v2 = TLSv1_METHOD
key = load_privatekey(FILETYPE_PEM, server_key_pem)
cert = load_certificate(FILETYPE_PEM, server_cert_pem)