Robert Kuska 6afc2f
diff -up Python-3.4.2/Lib/test/test_ssl.py.ssl Python-3.4.2/Lib/test/test_ssl.py
Robert Kuska 6afc2f
--- Python-3.4.2/Lib/test/test_ssl.py.ssl	2014-12-11 12:25:21.886928225 +0100
Robert Kuska 6afc2f
+++ Python-3.4.2/Lib/test/test_ssl.py	2014-12-11 12:25:00.284746529 +0100
Robert Kuska 6afc2f
@@ -674,10 +674,7 @@ class ContextTests(unittest.TestCase):
Robert Kuska 6afc2f
     @skip_if_broken_ubuntu_ssl
Robert Kuska 6afc2f
     def test_options(self):
Robert Kuska 6afc2f
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
Robert Kuska 6afc2f
-        # OP_ALL | OP_NO_SSLv2 is the default value
Robert Kuska 6afc2f
-        self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2,
Robert Kuska 6afc2f
-                         ctx.options)
Robert Kuska 6afc2f
-        ctx.options |= ssl.OP_NO_SSLv3
Robert Kuska 6afc2f
+        # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value
Robert Kuska 6afc2f
         self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3,
Robert Kuska 6afc2f
                          ctx.options)
Robert Kuska 6afc2f
         if can_clear_options():
Robert Kuska 6afc2f
@@ -2149,21 +2146,18 @@ else:
Robert Kuska 6afc2f
                         sys.stdout.write(
Robert Kuska 6afc2f
                             " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n"
Robert Kuska 6afc2f
                             % str(x))
Robert Kuska 6afc2f
-            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True)
Robert Kuska 6afc2f
+            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True)
Robert Kuska 6afc2f
 
Robert Kuska 6afc2f
-            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2f
+            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
Robert Kuska 6afc2f
 
Robert Kuska 6afc2f
-            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
Robert Kuska 6afc2f
+            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED)
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
Robert Kuska 6afc2f
 
Robert Kuska 6afc2f
-            # Server with specific SSL options
Robert Kuska 6afc2f
-            try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False,
Robert Kuska 6afc2f
-                               server_options=ssl.OP_NO_SSLv3)
Robert Kuska 6afc2f
             # Will choose TLSv1
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True,
Robert Kuska 6afc2f
                                server_options=ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3)
Robert Kuska 6afc2f
@@ -2186,7 +2180,7 @@ else:
Robert Kuska 6afc2f
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
Robert Kuska 6afc2f
             if no_sslv2_implies_sslv3_hello():
Robert Kuska 6afc2f
                 # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
Robert Kuska 6afc2f
-                try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, True,
Robert Kuska 6afc2f
+                try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
Robert Kuska 6afc2f
                                    client_options=ssl.OP_NO_SSLv2)
Robert Kuska 6afc2f
 
Robert Kuska 6afc2f
         @skip_if_broken_ubuntu_ssl