Skip to content

Commit 92858ce

Browse files
committed
[3.14] gh-149254: Update CI to use latest OpenSSL versions (GH-149330)
Also update Modules/_ssl_data_35.h to include symbols added between 3.5.5 and 3.5.6. (adapted from commit 68fe899)
1 parent 3789129 commit 92858ce

4 files changed

Lines changed: 22 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ jobs:
312312
# Keep 1.1.1w in our list despite it being upstream EOL and otherwise
313313
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
314314
# supported by important vendors such as AWS-LC.
315-
openssl_ver: [1.1.1w, 3.0.18, 3.2.6, 3.3.5, 3.4.3, 3.5.4]
315+
openssl_ver: [1.1.1w, 3.0.20, 3.3.7, 3.4.5, 3.5.6, 3.6.2]
316316
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
317317
env:
318318
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -424,7 +424,7 @@ jobs:
424424
needs: build-context
425425
if: needs.build-context.outputs.run-tests == 'true'
426426
env:
427-
OPENSSL_VER: 3.0.18
427+
OPENSSL_VER: 3.0.20
428428
PYTHONSTRICTEXTENSIONBUILD: 1
429429
steps:
430430
- uses: actions/checkout@v4
@@ -544,7 +544,7 @@ jobs:
544544
matrix:
545545
os: [ubuntu-24.04]
546546
env:
547-
OPENSSL_VER: 3.0.18
547+
OPENSSL_VER: 3.0.20
548548
PYTHONSTRICTEXTENSIONBUILD: 1
549549
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
550550
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: 12 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-10-04T17:49:19.148321+00:00 */
3-
/* Generated from Git commit openssl-3.5.4-0-gc1eeb9406 */
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[] = {
@@ -1668,6 +1668,11 @@ static struct py_ssl_error_code error_codes[] = {
16681668
#else
16691669
{"CERTIFICATE_VERIFY_ERROR", 46, 100},
16701670
#endif
1671+
#ifdef CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA
1672+
{"CIPHER_AEAD_IN_ENVELOPED_DATA", ERR_LIB_CMS, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA},
1673+
#else
1674+
{"CIPHER_AEAD_IN_ENVELOPED_DATA", 46, 200},
1675+
#endif
16711676
#ifdef CMS_R_CIPHER_AEAD_SET_TAG_ERROR
16721677
{"CIPHER_AEAD_SET_TAG_ERROR", ERR_LIB_CMS, CMS_R_CIPHER_AEAD_SET_TAG_ERROR},
16731678
#else
@@ -4243,6 +4248,11 @@ static struct py_ssl_error_code error_codes[] = {
42434248
#else
42444249
{"CONNECT_FAILURE", 61, 100},
42454250
#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
42464256
#ifdef HTTP_R_ERROR_PARSING_ASN1_LENGTH
42474257
{"ERROR_PARSING_ASN1_LENGTH", ERR_LIB_HTTP, HTTP_R_ERROR_PARSING_ASN1_LENGTH},
42484258
#else

Tools/ssl/multissltests.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@
4545
OPENSSL_OLD_VERSIONS = [
4646
"1.1.1w",
4747
"3.1.8",
48+
"3.2.6",
4849
]
4950

5051
OPENSSL_RECENT_VERSIONS = [
51-
"3.0.18",
52-
"3.2.6",
53-
"3.3.5",
54-
"3.4.3",
55-
"3.5.4",
52+
"3.0.20",
53+
"3.3.7",
54+
"3.4.5",
55+
"3.5.6",
56+
"3.6.2",
5657
# See make_ssl_data.py for notes on adding a new version.
5758
]
5859

0 commit comments

Comments
 (0)