commit 251d2eadc7f5b4042245709f41c38169a284e146
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Dec 17 07:38:11 2021 -0800
committer GitHub <noreply@github.com> Fri Dec 17 07:38:11 2021 -0800
tree 6cd8629c5546fcca0734604cb5c7eeb03c56675f
parent 87539cc716fab47cd4f501f2441c4ab8e80bce6f

bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)

(cherry picked from commit 2985feac4e02d590bb78bcce9e30864be53280ac)

Co-authored-by: Christian Heimes <christian@python.org>

Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index a485f7d..873db64 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -539,7 +539,11 @@ def test_openssl_version(self):
         self.assertLessEqual(status, 15)
 
         libressl_ver = f"LibreSSL {major:d}"
-        openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
+        if major >= 3:
+            # 3.x uses 0xMNN00PP0L
+            openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}"
+        else:
+            openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
         self.assertTrue(
             s.startswith((openssl_ver, libressl_ver)),
             (s, t, hex(n))