Skip to content

gh-131423: Update OpenSSL data to 3.4.1 on Linux #131618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 25, 2025
Merged

gh-131423: Update OpenSSL data to 3.4.1 on Linux #131618

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
85ec7b2
update OpenSSL CI build configuration
picnixz Mar 18, 2025
40ad7ce
update OpenSSL mnemonics
picnixz Mar 19, 2025
b35b7fa
update macOS and Windows OpenSSL configurations
picnixz Mar 20, 2025
578bb0e
Merge remote-tracking branch 'upstream/main' into ci/update/ssl-versi…
picnixz Mar 23, 2025
296a98c
update SBOM
picnixz Mar 23, 2025
326d947
update SBOM
picnixz Mar 23, 2025
cf7a65d
update configure requirements
picnixz Mar 23, 2025
5bbc702
blurb
picnixz Mar 23, 2025
ce35aa3
Merge branch 'main' into ci/update/ssl-versions-131423
picnixz Mar 26, 2025
41863fb
revert cosmetic changes
picnixz Mar 26, 2025
0089506
Merge remote-tracking branch 'upstream/main' into ci/update/ssl-versi…
picnixz Mar 28, 2025
579f4a8
remove un-necessary NEWS entry for Windows builds
picnixz Mar 28, 2025
905f1a5
Merge branch 'main' into ci/update/ssl-versions-131423
picnixz Apr 5, 2025
867ebf1
Merge remote-tracking branch 'upstream/main' into ci/update/ssl-versi…
picnixz Apr 7, 2025
7a2a34f
remove redundant NEWS
picnixz Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-24.04]
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
openssl_ver: [3.0.16, 3.1.8, 3.2.4, 3.3.3, 3.4.1]
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
env:
OPENSSL_VER: ${{ matrix.openssl_ver }}
Expand Down Expand Up @@ -339,7 +339,7 @@ jobs:
needs: build-context
if: needs.build-context.outputs.run-tests == 'true'
env:
OPENSSL_VER: 3.0.15
OPENSSL_VER: 3.0.16
PYTHONSTRICTEXTENSIONBUILD: 1
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -458,7 +458,7 @@ jobs:
matrix:
os: [ubuntu-24.04]
env:
OPENSSL_VER: 3.0.15
OPENSSL_VER: 3.0.16
PYTHONSTRICTEXTENSIONBUILD: 1
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
steps:
Expand Down
2 changes: 1 addition & 1 deletion Doc/using/configure.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Features and minimum versions required to build CPython:

* Support for threads.

* OpenSSL 1.1.1 is the minimum version and OpenSSL 3.0.9 is the recommended
* OpenSSL 1.1.1 is the minimum version and OpenSSL 3.0.16 is the recommended
minimum version for the :mod:`ssl` and :mod:`hashlib` extension modules.

* SQLite 3.15.2 for the :mod:`sqlite3` extension module.
Expand Down
6 changes: 3 additions & 3 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ def library_recipes():

result.extend([
dict(
name="OpenSSL 3.0.15",
url="https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz",
checksum='23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533',
name="OpenSSL 3.0.16",
url="https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz",
checksum='57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86',
buildrecipe=build_universal_openssl,
configure=None,
install=None,
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-03-23-11-33-09.gh-issue-131423.bQlcEb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`ssl` can show descriptions for errors added in OpenSSL 3.4.1.
Patch by Bénédikt Tran.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2025-03-23-11-32-35.gh-issue-131423.lcSz9s.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update Windows installer to use OpenSSL 3.0.16.
Patch by Bénédikt Tran.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/macOS/2025-03-23-11-32-09.gh-issue-131423.s1Lvli.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update macOS installer to use OpenSSL 3.0.16.
Patch by Bénédikt Tran.
4 changes: 3 additions & 1 deletion Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ static void _PySSLFixErrno(void) {

/* Include generated data (error codes) */
/* See make_ssl_data.h for notes on adding a new version. */
#if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
#if (OPENSSL_VERSION_NUMBER >= 0x30401000L)
#include "_ssl_data_34.h"
#elif (OPENSSL_VERSION_NUMBER >= 0x30100000L)
#include "_ssl_data_340.h"
#elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
#include "_ssl_data_300.h"
#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)
Expand Down
Loading
Loading