mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
(cherry picked from commit 2985feac4e)

Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Miss Islington (bot) 2021-12-17 07:38:11 -08:00 • committed by GitHub
parent 87539cc716
commit 251d2eadc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -225,7 +225,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
openssl_ver: [1.1.1l, 3.0.0] openssl_ver: [1.1.1l, 3.0.1]
env: env:
OPENSSL_VER: ${{ matrix.openssl_ver }} OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl MULTISSL_DIR: ${{ github.workspace }}/multissl

6
Lib/test/test_ssl.py
View file

@ -539,7 +539,11 @@ class BasicSocketTests(unittest.TestCase):
self.assertLessEqual(status, 15) self.assertLessEqual(status, 15)
libressl_ver = f"LibreSSL {major:d}" 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( self.assertTrue(
s.startswith((openssl_ver, libressl_ver)), s.startswith((openssl_ver, libressl_ver)),
(s, t, hex(n)) (s, t, hex(n))

1
Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst Normal file
View file

@ -0,0 +1 @@
Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``.

2
Tools/ssl/multissltests.py
View file

@ -48,7 +48,7 @@ OPENSSL_OLD_VERSIONS = [
OPENSSL_RECENT_VERSIONS = [ OPENSSL_RECENT_VERSIONS = [
"1.1.1l", "1.1.1l",
"3.0.0" "3.0.1"
] ]
LIBRESSL_OLD_VERSIONS = [ LIBRESSL_OLD_VERSIONS = [