From 46ae0efce1128b4d5793981c133c21a5176401e1 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 28 Oct 2011 16:52:17 -0400 Subject: [PATCH] - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. --- Lib/test/test_ssl.py | 6 ++++-- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a79fce63bb8..f942d956587 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1315,7 +1315,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 @@ -1333,7 +1334,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 b3c7fd18aff..527874dae66 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -171,6 +171,8 @@ Library Tests ----- +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + - Issue #12821: Fix test_fcntl failures on OpenBSD 5. - Re-enable lib2to3's test_parser.py tests, though with an expected failure