mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-34001: Fix test_ssl with LibreSSL (GH-13783)

Browse source
This commit is contained in:
Christian Heimes 2019-09-11 19:24:47 +02:00 • committed by T. Wouters
parent e24594bfe7
commit c9bc49c5f6
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_ssl.py
View file

@ -1109,6 +1109,7 @@ class ContextTests(unittest.TestCase):
@unittest.skipUnless(hasattr(ssl.SSLContext, 'minimum_version'), @unittest.skipUnless(hasattr(ssl.SSLContext, 'minimum_version'),
"required OpenSSL 1.1.0g") "required OpenSSL 1.1.0g")
@unittest.skipIf(IS_LIBRESSL, "see bpo-34001")
def test_min_max_version(self): def test_min_max_version(self):
ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
# OpenSSL default is MINIMUM_SUPPORTED, however some vendors like # OpenSSL default is MINIMUM_SUPPORTED, however some vendors like
@ -3731,8 +3732,8 @@ class ThreadedTests(unittest.TestCase):
self.assertEqual(s.version(), 'TLSv1.1') self.assertEqual(s.version(), 'TLSv1.1')
# client 1.0, server 1.2 (mismatch) # client 1.0, server 1.2 (mismatch)
server_context.minimum_version = ssl.TLSVersion.TLSv1_2
server_context.maximum_version = ssl.TLSVersion.TLSv1_2 server_context.maximum_version = ssl.TLSVersion.TLSv1_2
server_context.minimum_version = ssl.TLSVersion.TLSv1_2
client_context.maximum_version = ssl.TLSVersion.TLSv1 client_context.maximum_version = ssl.TLSVersion.TLSv1
client_context.maximum_version = ssl.TLSVersion.TLSv1 client_context.maximum_version = ssl.TLSVersion.TLSv1
with ThreadedEchoServer(context=server_context) as server: with ThreadedEchoServer(context=server_context) as server:

2
Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst Normal file
View file

@ -0,0 +1,2 @@
Make test_ssl pass with LibreSSL. LibreSSL handles minimum and maximum TLS
version differently than OpenSSL.