Robert Kuska 6afc2ff
diff -up Python-3.4.2/Lib/test/test_ssl.py.ssl Python-3.4.2/Lib/test/test_ssl.py
Robert Kuska 6afc2ff
--- Python-3.4.2/Lib/test/test_ssl.py.ssl	2014-12-11 12:25:21.886928225 +0100
Robert Kuska 6afc2ff
+++ Python-3.4.2/Lib/test/test_ssl.py	2014-12-11 12:25:00.284746529 +0100
Robert Kuska 6afc2ff
@@ -674,10 +674,7 @@ class ContextTests(unittest.TestCase):
Robert Kuska 6afc2ff
     @skip_if_broken_ubuntu_ssl
Robert Kuska 6afc2ff
     def test_options(self):
Robert Kuska 6afc2ff
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
Robert Kuska 6afc2ff
-        # OP_ALL | OP_NO_SSLv2 is the default value
Robert Kuska 6afc2ff
-        self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2,
Robert Kuska 6afc2ff
-                         ctx.options)
Robert Kuska 6afc2ff
-        ctx.options |= ssl.OP_NO_SSLv3
Robert Kuska 6afc2ff
+        # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value
Robert Kuska 6afc2ff
         self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3,
Robert Kuska 6afc2ff
                          ctx.options)
Robert Kuska 6afc2ff
         if can_clear_options():
Matej Stuchlik 318f360
@@ -2186,7 +2180,7 @@ else:
Matej Stuchlik 318f360
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
Matej Stuchlik 318f360
             if no_sslv2_implies_sslv3_hello():
Matej Stuchlik 318f360
                 # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
Matej Stuchlik 318f360
-                try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, True,
Matej Stuchlik 318f360
+                try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
Matej Stuchlik 318f360
                                    client_options=ssl.OP_NO_SSLv2)
Matej Stuchlik 318f360
 
Matej Stuchlik 318f360
         @skip_if_broken_ubuntu_ssl
Matej Stuchlik 318f360
diff -up Python-3.4.3/Lib/test/test_ssl.py.foo Python-3.4.3/Lib/test/test_ssl.py
Matej Stuchlik 318f360
--- Python-3.4.3/Lib/test/test_ssl.py.foo	2015-03-12 10:08:58.268065970 +0100
Matej Stuchlik 318f360
+++ Python-3.4.3/Lib/test/test_ssl.py	2015-03-12 10:10:09.733347118 +0100
Matej Stuchlik 318f360
@@ -2168,17 +2168,17 @@ else:
Robert Kuska 6afc2ff
                             " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n"
Robert Kuska 6afc2ff
                             % str(x))
Matej Stuchlik 318f360
             if hasattr(ssl, 'PROTOCOL_SSLv3'):
Matej Stuchlik 318f360
-                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True)
Matej Stuchlik 318f360
+                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True)
Robert Kuska 6afc2ff
 
Matej Stuchlik 318f360
             if hasattr(ssl, 'PROTOCOL_SSLv3'):
Matej Stuchlik 318f360
-                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
Matej Stuchlik 318f360
+                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2ff
 
Matej Stuchlik 318f360
             if hasattr(ssl, 'PROTOCOL_SSLv3'):
Matej Stuchlik 318f360
-                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
Matej Stuchlik 318f360
+                try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED)
Robert Kuska 6afc2ff
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
Robert Kuska 6afc2ff