Fixed #461 -- make the tests pass when SSLv3 isn't supported (#644)
* Fixed #461 -- make the tests pass when SSLv3 isn't supported
We no longer support OpenSSL 1.0.0, so TLSv1.2 should always be available and this code can be simplified.
* Try the opposite direction?
* Another shot at getting this passing
* uhhh
* grump
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index fafffa3..1ca7f8b 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -2509,12 +2509,14 @@
# 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 not None:
+ 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:
- v1 = TLSv1_2_METHOD
- v2 = TLSv1_METHOD
+ pytest.skip("Test requires either OpenSSL 1.1.0 or SSLv3")
key = load_privatekey(FILETYPE_PEM, server_key_pem)
cert = load_certificate(FILETYPE_PEM, server_cert_pem)