summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-10-28 21:08:12 (GMT)
committerBarry Warsaw <barry@python.org>2011-10-28 21:08:12 (GMT)
commitc21a81bf7679f0c49f8407dbb16b49a3b8215fd4 (patch)
treef0e21fb8688472940151fa1e1b0ea5ff226c58e4
parent608cab54e4f1a896106e449b854f80ad719548fc (diff)
parent5a8f03f6634bd52fff2413335e84877acef6a135 (diff)
downloadcpython-c21a81bf7679f0c49f8407dbb16b49a3b8215fd4.zip
cpython-c21a81bf7679f0c49f8407dbb16b49a3b8215fd4.tar.gz
cpython-c21a81bf7679f0c49f8407dbb16b49a3b8215fd4.tar.bz2
- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
-rw-r--r--Lib/test/test_ssl.py6
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 327bb84..a2b4040 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1405,7 +1405,8 @@ else:
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
if hasattr(ssl, 'PROTOCOL_SSLv2'):
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False)
- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False)
+ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
+ client_options=ssl.OP_NO_SSLv3)
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
if no_sslv2_implies_sslv3_hello():
# No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
@@ -1423,7 +1424,8 @@ else:
if hasattr(ssl, 'PROTOCOL_SSLv2'):
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False)
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False)
- try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False)
+ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False,
+ client_options=ssl.OP_NO_TLSv1)
def test_starttls(self):
"""Switching from clear text to encrypted and back again."""
diff --git a/Misc/NEWS b/Misc/NEWS
index 0b1edff..92f8818 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1500,6 +1500,8 @@ Extension Modules
Tests
-----
+- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
+
- Re-enable lib2to3's test_parser.py tests, though with an expected failure
(see issue 13125).