53 lines
3.1 KiB
Diff
53 lines
3.1 KiB
Diff
|
diff -up Python-2.7.9/Lib/test/test_ssl.py.ssl Python-2.7.9/Lib/test/test_ssl.py
|
||
|
|
--- Python-2.7.9/Lib/test/test_ssl.py.ssl 2014-12-11 10:40:22.657795081 +0100
|
||
|
|
+++ Python-2.7.9/Lib/test/test_ssl.py 2014-12-11 11:25:11.925579957 +0100
|
||
|
|
@@ -713,10 +713,7 @@ 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 | ssl.OP_NO_SSLv2,
|
||
|
|
- ctx.options)
|
||
|
|
- ctx.options |= ssl.OP_NO_SSLv3
|
||
|
|
+ # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value
|
||
|
|
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3,
|
||
|
|
ctx.options)
|
||
|
|
if can_clear_options():
|
||
|
|
@@ -2220,24 +2217,20 @@ else:
|
||
|
|
" SSL2 client to SSL23 server test unexpectedly failed:\n %s\n"
|
||
|
|
% str(x))
|
||
|
|
if hasattr(ssl, 'PROTOCOL_SSLv3'):
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3')
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1')
|
||
|
|
|
||
|
|
if hasattr(ssl, 'PROTOCOL_SSLv3'):
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_OPTIONAL)
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_OPTIONAL)
|
||
|
|
|
||
|
|
if hasattr(ssl, 'PROTOCOL_SSLv3'):
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_REQUIRED)
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_REQUIRED)
|
||
|
|
|
||
|
|
- # Server with specific SSL options
|
||
|
|
- if hasattr(ssl, 'PROTOCOL_SSLv3'):
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False,
|
||
|
|
- server_options=ssl.OP_NO_SSLv3)
|
||
|
|
# Will choose TLSv1
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True,
|
||
|
|
server_options=ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3)
|
||
|
|
@@ -2262,7 +2255,7 @@ else:
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
|
||
|
|
if no_sslv2_implies_sslv3_hello():
|
||
|
|
# No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, 'SSLv3',
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
|
||
|
|
client_options=ssl.OP_NO_SSLv2)
|
||
|
|
|
||
|
|
@skip_if_broken_ubuntu_ssl
|