From 0bf591892b03c78cb0f134f5162d3b134734f8ab Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Tue, 21 Apr 2026 12:30:05 +0000 Subject: [PATCH 1/3] Add OpenSSL 4.0.0 support to build and test configurations - Add OpenSSL 4.0.0 to the build matrix in build.yml - Add "4.0.0" to the OpenSSL versions list in multissltests.py --- .github/workflows/build.yml | 1 + Tools/ssl/multissltests.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33a5950c1483a2..fd75961a31c665 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -283,6 +283,7 @@ jobs: - { name: openssl, version: 3.4.4 } - { name: openssl, version: 3.5.5 } - { name: openssl, version: 3.6.1 } + - { name: openssl, version: 4.0.0 } ## AWS-LC - { name: aws-lc, version: 1.68.0 } env: diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 48207e5330fa90..f6e354bb257c21 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -54,6 +54,7 @@ "3.4.4", "3.5.5", "3.6.1", + "4.0.0", # See make_ssl_data.py for notes on adding a new version. ] From dccde1cb7529820df25f1708f38206ce3c658552 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2026 12:33:18 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Tests/2026-04-21-12-33-14.gh-issue-148600.vnTb3t.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Tests/2026-04-21-12-33-14.gh-issue-148600.vnTb3t.rst diff --git a/Misc/NEWS.d/next/Tests/2026-04-21-12-33-14.gh-issue-148600.vnTb3t.rst b/Misc/NEWS.d/next/Tests/2026-04-21-12-33-14.gh-issue-148600.vnTb3t.rst new file mode 100644 index 00000000000000..38ca0add2f6d9b --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2026-04-21-12-33-14.gh-issue-148600.vnTb3t.rst @@ -0,0 +1 @@ +Add OpenSSL 4.0.0 support to test configurations From 122e2e80ce52f0ac56fdabf38ce79446fed6b789 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Tue, 21 Apr 2026 12:50:19 +0000 Subject: [PATCH 3/3] Enable TLS 1.2 to fix test failures Specifically: test_poplib and test_urllib2_localnet --- Modules/_ssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index ea8a6d3fc1daca..428859a9aaacd9 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -171,11 +171,11 @@ static void _PySSLFixErrno(void) { # define OPENSSL_NO_SSL3 # define OPENSSL_NO_TLS1 # define OPENSSL_NO_TLS1_1 -# define OPENSSL_NO_TLS1_2 +// # define OPENSSL_NO_TLS1_2 # define OPENSSL_NO_SSL3_METHOD # define OPENSSL_NO_TLS1_METHOD # define OPENSSL_NO_TLS1_1_METHOD -# define OPENSSL_NO_TLS1_2_METHOD +// # define OPENSSL_NO_TLS1_2_METHOD #endif /* OpenSSL API 1.1.0+ does not include version methods */