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.
49 lines
2.4 KiB
49 lines
2.4 KiB
6 years ago
|
From a1d7acf899fccd0eda10e011e2d11d1d81c2d9e6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robert Kuska <rkuska@redhat.com>
|
||
|
|
Date: Wed, 9 Mar 2016 20:16:17 +0100
|
||
|
|
Subject: [PATCH] Expect a failure when trying to connect with SSLv2 client to
|
||
|
|
SSLv23 server. Default value of options in tests enchanced to reflect SSLv2
|
||
|
|
being disabled
|
||
|
|
|
||
|
|
---
|
||
|
|
Lib/test/test_ssl.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||
|
|
index 11122db..b2ba186 100644
|
||
|
|
--- a/Lib/test/test_ssl.py
|
||
|
|
+++ b/Lib/test/test_ssl.py
|
||
|
|
@@ -691,7 +691,7 @@ class ContextTests(unittest.TestCase):
|
||
|
|
@skip_if_broken_ubuntu_ssl
|
||
|
|
def test_options(self):
|
||
|
|
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
|
||
|
|
- self.assertEqual(ssl.OP_ALL, ctx.options)
|
||
|
|
+ self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2, ctx.options)
|
||
|
|
ctx.options |= ssl.OP_NO_SSLv2
|
||
|
|
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2,
|
||
|
|
ctx.options)
|
||
|
|
@@ -2152,17 +2152,17 @@ else:
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True)
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False)
|
||
|
|
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False)
|
||
|
|
# SSLv23 client with specific SSL options
|
||
|
|
if no_sslv2_implies_sslv3_hello():
|
||
|
|
# 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, True,
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False,
|
||
|
|
client_options=ssl.OP_NO_SSLv3)
|
||
|
|
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True,
|
||
|
|
+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False,
|
||
|
|
client_options=ssl.OP_NO_TLSv1)
|
||
|
|
|
||
|
|
@skip_if_broken_ubuntu_ssl
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|