|
 |
ae2451 |
diff -up Python-2.7.5/Lib/test/test_ssl.py.ssl2 Python-2.7.5/Lib/test/test_ssl.py
|
|
|
ae2451 |
--- Python-2.7.5/Lib/test/test_ssl.py.ssl2 2015-03-04 12:19:26.345387741 +0100
|
|
|
ae2451 |
+++ Python-2.7.5/Lib/test/test_ssl.py 2015-03-04 12:32:43.485702679 +0100
|
|
|
ae2451 |
@@ -689,7 +689,8 @@ class ContextTests(unittest.TestCase):
|
|
|
ae2451 |
@skip_if_broken_ubuntu_ssl
|
|
|
ae2451 |
def test_options(self):
|
|
|
ae2451 |
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
|
|
|
ae2451 |
- # OP_ALL | OP_NO_SSLv2 is the default value
|
|
|
ae2451 |
+ self.assertEqual(ssl.OP_ALL, ctx.options)
|
|
|
ae2451 |
+ ctx.options |= ssl.OP_NO_SSLv2
|
|
|
ae2451 |
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2,
|
|
|
ae2451 |
ctx.options)
|
|
|
ae2451 |
ctx.options |= ssl.OP_NO_SSLv3
|
|
|
ae2451 |
@@ -2142,9 +2143,9 @@ else:
|
|
|
ae2451 |
# No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
|
|
|
ae2451 |
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False,
|
|
|
ae2451 |
client_options=ssl.OP_NO_SSLv2)
|
|
|
ae2451 |
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False,
|
|
|
ae2451 |
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True,
|
|
|
ae2451 |
client_options=ssl.OP_NO_SSLv3)
|
|
|
ae2451 |
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False,
|
|
|
ae2451 |
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True,
|
|
|
ae2451 |
client_options=ssl.OP_NO_TLSv1)
|
|
|
ae2451 |
|
|
|
ae2451 |
@skip_if_broken_ubuntu_ssl
|
|
|
ae2451 |
|