From: Barry Warsaw <barry@python.org>
Date: Fri, 28 Oct 2011 20:14:44 +0000 (-0400)
Subject: - Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
X-Git-Tag: v2.7.3rc1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be83698f21eabb1e787a56051a5acd5600d19e6d;p=thirdparty%2FPython%2Fcpython.git

- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index aa6c8509754c..0eb508deb317 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1025,7 +1025,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)
 
         @skip_if_broken_ubuntu_ssl
@@ -1039,7 +1040,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 9f7028fef5bf..72dff612d4df 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,8 @@ What's New in Python 2.7.3?
 Core and Builtins
 -----------------
 
+- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
+
 - Issue #13268: Fix the assert statement when a tuple is passed as the message.
 
 - Issue #13018: Fix reference leaks in error paths in dictobject.c.