Skip to content

Commit 8cb7311

Browse files
[3.14] gh-139573: Update OpenSSL in CI (GH-139577) (#139583)
gh-139573: Update OpenSSL in CI (GH-139577) (cherry picked from commit 98e748b) Co-authored-by: Zachary Ware <zach@python.org>
1 parent bc85a34 commit 8cb7311

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ jobs:
320320
# Keep 1.1.1w in our list despite it being upstream EOL and otherwise
321321
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
322322
# supported by important vendors such as AWS-LC.
323-
openssl_ver: [1.1.1w, 3.0.17, 3.2.5, 3.3.4, 3.4.2, 3.5.2]
323+
openssl_ver: [1.1.1w, 3.0.18, 3.2.6, 3.3.5, 3.4.3, 3.5.4]
324324
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
325325
env:
326326
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -410,7 +410,7 @@ jobs:
410410
needs: build-context
411411
if: needs.build-context.outputs.run-tests == 'true'
412412
env:
413-
OPENSSL_VER: 3.0.16
413+
OPENSSL_VER: 3.0.18
414414
PYTHONSTRICTEXTENSIONBUILD: 1
415415
steps:
416416
- uses: actions/checkout@v4
@@ -530,7 +530,7 @@ jobs:
530530
matrix:
531531
os: [ubuntu-24.04]
532532
env:
533-
OPENSSL_VER: 3.0.16
533+
OPENSSL_VER: 3.0.18
534534
PYTHONSTRICTEXTENSIONBUILD: 1
535535
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
536536
steps:

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ inputs.os }}
3131
timeout-minutes: 60
3232
env:
33-
OPENSSL_VER: 3.0.15
33+
OPENSSL_VER: 3.0.18
3434
PYTHONSTRICTEXTENSIONBUILD: 1
3535
TERM: linux
3636
steps:

Doc/using/configure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Features and minimum versions required to build CPython:
2222

2323
* Support for threads.
2424

25-
* OpenSSL 1.1.1 is the minimum version and OpenSSL 3.0.16 is the recommended
25+
* OpenSSL 1.1.1 is the minimum version and OpenSSL 3.0.18 is the recommended
2626
minimum version for the :mod:`ssl` and :mod:`hashlib` extension modules.
2727

2828
* SQLite 3.15.2 for the :mod:`sqlite3` extension module.

Modules/_ssl_data_35.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* File generated by Tools/ssl/make_ssl_data.py */
2-
/* Generated on 2025-08-13T16:42:33.155822+00:00 */
3-
/* Generated from Git commit openssl-3.5.2-0-g0893a6235 */
2+
/* Generated on 2025-10-04T17:49:19.148321+00:00 */
3+
/* Generated from Git commit openssl-3.5.4-0-gc1eeb9406 */
44

55
/* generated from args.lib2errnum */
66
static struct py_ssl_library_code library_codes[] = {
@@ -5338,6 +5338,11 @@ static struct py_ssl_error_code error_codes[] = {
53385338
#else
53395339
{"FIPS_MODULE_ENTERING_ERROR_STATE", 57, 224},
53405340
#endif
5341+
#ifdef PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR
5342+
{"FIPS_MODULE_IMPORT_PCT_ERROR", ERR_LIB_PROV, PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR},
5343+
#else
5344+
{"FIPS_MODULE_IMPORT_PCT_ERROR", 57, 253},
5345+
#endif
53415346
#ifdef PROV_R_FIPS_MODULE_IN_ERROR_STATE
53425347
{"FIPS_MODULE_IN_ERROR_STATE", ERR_LIB_PROV, PROV_R_FIPS_MODULE_IN_ERROR_STATE},
53435348
#else

Tools/ssl/multissltests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
]
4949

5050
OPENSSL_RECENT_VERSIONS = [
51-
"3.0.16",
52-
"3.2.5",
53-
"3.3.4",
54-
"3.4.2",
55-
"3.5.2",
51+
"3.0.18",
52+
"3.2.6",
53+
"3.3.5",
54+
"3.4.3",
55+
"3.5.4",
5656
# See make_ssl_data.py for notes on adding a new version.
5757
]
5858

0 commit comments

Comments
 (0)