diff options
| author | Christian Heimes <christian@python.org> | 2019-09-11 19:24:47 +0200 |
|---|---|---|
| committer | T. Wouters <thomas@python.org> | 2019-09-11 10:24:47 -0700 |
| commit | c9bc49c5f6e26a7c958307c2ac338951a7534d9a (patch) | |
| tree | a84c8fecfa35a46108de47f5a595900522a6594e | |
| parent | e24594bfe75aff3e654665cb940ddc4d4acffd2f (diff) | |
| download | cpython-git-c9bc49c5f6e26a7c958307c2ac338951a7534d9a.tar.gz | |
bpo-34001: Fix test_ssl with LibreSSL (GH-13783)
| -rw-r--r-- | Lib/test/test_ssl.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index b71928368b..54e2716276 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1109,6 +1109,7 @@ class ContextTests(unittest.TestCase): @unittest.skipUnless(hasattr(ssl.SSLContext, 'minimum_version'), "required OpenSSL 1.1.0g") + @unittest.skipIf(IS_LIBRESSL, "see bpo-34001") def test_min_max_version(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) # OpenSSL default is MINIMUM_SUPPORTED, however some vendors like @@ -3731,8 +3732,8 @@ class ThreadedTests(unittest.TestCase): self.assertEqual(s.version(), 'TLSv1.1') # 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.minimum_version = ssl.TLSVersion.TLSv1_2 client_context.maximum_version = ssl.TLSVersion.TLSv1 client_context.maximum_version = ssl.TLSVersion.TLSv1 with ThreadedEchoServer(context=server_context) as server: diff --git a/Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst b/Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst new file mode 100644 index 0000000000..35c65a8fbf --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst @@ -0,0 +1,2 @@ +Make test_ssl pass with LibreSSL. LibreSSL handles minimum and maximum TLS +version differently than OpenSSL. |