bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170) · python/cpython@2985fea · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2985fea

Browse filesBrowse the repository at this point in the historyBrowse files

tiran

authored

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

1 parent efd6236 commit 2985fea
Copy full SHA for 2985fea

4 files changed

+8-3Lines changed: 8 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • build.yml
• Lib/test
  • test_ssl.py
• Misc/NEWS.d/next/Tests
  • 2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
• Tools/ssl
  • multissltests.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/build.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -220,7 +220,7 @@ jobs:
220	220	strategy:
221	221	fail-fast: false
222	222	matrix:
223		- openssl_ver: [1.1.1l, 3.0.0]
	223	+ openssl_ver: [1.1.1l, 3.0.1]
224	224	env:
225	225	OPENSSL_VER: ${{ matrix.openssl_ver }}
226	226	MULTISSL_DIR: ${{ github.workspace }}/multissl

Collapse file

‎Lib/test/test_ssl.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_ssl.py

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -540,7 +540,11 @@ def test_openssl_version(self):
540	540	self.assertLessEqual(status, 15)
541	541
542	542	libressl_ver = f"LibreSSL {major:d}"
543		- openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
	543	+ if major >= 3:
	544	+ # 3.x uses 0xMNN00PP0L
	545	+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}"
	546	+ else:
	547	+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
544	548	self.assertTrue(
545	549	s.startswith((openssl_ver, libressl_ver)),
546	550	(s, t, hex(n))

Collapse file

‎Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``.

Collapse file

‎Tools/ssl/multissltests.py‎

Copy file name to clipboardExpand all lines: Tools/ssl/multissltests.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -48,7 +48,7 @@
48	48
49	49	OPENSSL_RECENT_VERSIONS = [
50	50	"1.1.1l",
51		- "3.0.0"
	51	+ "3.0.1"
52	52	]
53	53
54	54	LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments

0 (0)