]> granicus.if.org Git - python/commitdiff
bpo-34001: Fix test_ssl with LibreSSL (GH-13783)
authorChristian Heimes <christian@python.org>
Wed, 11 Sep 2019 17:24:47 +0000 (19:24 +0200)
committerT. Wouters <thomas@python.org>
Wed, 11 Sep 2019 17:24:47 +0000 (10:24 -0700)
Lib/test/test_ssl.py
Misc/NEWS.d/next/Tests/2019-06-03-20-47-10.bpo-34001.KvYx9z.rst [new file with mode: 0644]

index b71928368b0464aaf668554328dec7f18856eb26..54e27162763850edc98cacf45b18231cb9ebb8b6 100644 (file)
@@ -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 (file)
index 0000000..35c65a8
--- /dev/null
@@ -0,0 +1,2 @@
+Make test_ssl pass with LibreSSL. LibreSSL handles minimum and maximum TLS
+version differently than OpenSSL.