You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.4 KiB
26 lines
1.4 KiB
diff -up Python-2.7.5/Lib/test/test_ssl.py.ssl2 Python-2.7.5/Lib/test/test_ssl.py |
|
--- Python-2.7.5/Lib/test/test_ssl.py.ssl2 2015-03-04 12:19:26.345387741 +0100 |
|
+++ Python-2.7.5/Lib/test/test_ssl.py 2015-03-04 12:32:43.485702679 +0100 |
|
@@ -689,7 +689,8 @@ class ContextTests(unittest.TestCase): |
|
@skip_if_broken_ubuntu_ssl |
|
def test_options(self): |
|
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) |
|
- # OP_ALL | OP_NO_SSLv2 is the default value |
|
+ self.assertEqual(ssl.OP_ALL, ctx.options) |
|
+ ctx.options |= ssl.OP_NO_SSLv2 |
|
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2, |
|
ctx.options) |
|
ctx.options |= ssl.OP_NO_SSLv3 |
|
@@ -2142,9 +2143,9 @@ else: |
|
# No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs |
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, |
|
client_options=ssl.OP_NO_SSLv2) |
|
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, |
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True, |
|
client_options=ssl.OP_NO_SSLv3) |
|
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, |
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True, |
|
client_options=ssl.OP_NO_TLSv1) |
|
|
|
@skip_if_broken_ubuntu_ssl |
|
|
|
|