Skip to content

Commit 6297185

Browse files
authored
[3.14] gh-149254: Update CI to use latest OpenSSL versions (GH-149333)
Also update Modules/_ssl_data_35.h to include an added symbol from 3.5.6. (adapted from commit 68fe899)
1 parent 487ebb4 commit 6297185

4 files changed

Lines changed: 20 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,11 @@ jobs:
305305
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
306306
# supported by important vendors such as AWS-LC.
307307
- { name: openssl, version: 1.1.1w }
308-
- { name: openssl, version: 3.0.19 }
309-
- { name: openssl, version: 3.3.6 }
310-
- { name: openssl, version: 3.4.4 }
311-
- { name: openssl, version: 3.5.5 }
312-
- { name: openssl, version: 3.6.1 }
308+
- { name: openssl, version: 3.0.20 }
309+
- { name: openssl, version: 3.3.7 }
310+
- { name: openssl, version: 3.4.5 }
311+
- { name: openssl, version: 3.5.6 }
312+
- { name: openssl, version: 3.6.2 }
313313
env:
314314
SSLLIB_VER: ${{ matrix.ssllib.version }}
315315
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -423,7 +423,7 @@ jobs:
423423
needs: build-context
424424
if: needs.build-context.outputs.run-ubuntu == 'true'
425425
env:
426-
OPENSSL_VER: 3.0.18
426+
OPENSSL_VER: 3.0.20
427427
PYTHONSTRICTEXTENSIONBUILD: 1
428428
steps:
429429
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -531,7 +531,7 @@ jobs:
531531
matrix:
532532
os: [ubuntu-24.04]
533533
env:
534-
OPENSSL_VER: 3.0.18
534+
OPENSSL_VER: 3.0.20
535535
PYTHONSTRICTEXTENSIONBUILD: 1
536536
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
537537
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.18
33+
OPENSSL_VER: 3.0.20
3434
PYTHONSTRICTEXTENSIONBUILD: 1
3535
TERM: linux
3636
steps:

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 2026-02-13T19:18:20.130102+00:00 */
3-
/* Generated from Git commit openssl-3.5.5-0-g67b5686b4 */
2+
/* Generated on 2026-05-03T20:36:01.807725+00:00 */
3+
/* Generated from Git commit openssl-3.5.6-0-g286ddeaac */
44

55
/* generated from args.lib2errnum */
66
static struct py_ssl_library_code library_codes[] = {
@@ -4248,6 +4248,11 @@ static struct py_ssl_error_code error_codes[] = {
42484248
#else
42494249
{"CONNECT_FAILURE", 61, 100},
42504250
#endif
4251+
#ifdef HTTP_R_CONTENT_TYPE_MISMATCH
4252+
{"CONTENT_TYPE_MISMATCH", ERR_LIB_HTTP, HTTP_R_CONTENT_TYPE_MISMATCH},
4253+
#else
4254+
{"CONTENT_TYPE_MISMATCH", 61, 131},
4255+
#endif
42514256
#ifdef HTTP_R_ERROR_PARSING_ASN1_LENGTH
42524257
{"ERROR_PARSING_ASN1_LENGTH", ERR_LIB_HTTP, HTTP_R_ERROR_PARSING_ASN1_LENGTH},
42534258
#else

Tools/ssl/multissltests.py

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

5151
OPENSSL_RECENT_VERSIONS = [
52-
"3.0.19",
53-
"3.3.6",
54-
"3.4.4",
55-
"3.5.5",
56-
"3.6.1",
52+
"3.0.20",
53+
"3.3.7",
54+
"3.4.5",
55+
"3.5.6",
56+
"3.6.2",
5757
# See make_ssl_data.py for notes on adding a new version.
5858
]
5959

0 commit comments

Comments
 (0)