Skip to content

Commit eb38f71

Browse files
committed
gh-144551: Update CI to use latest OpenSSL versions
Also update _ssl_data_36.h to include an added symbol from 3.6.1.
1 parent d625f7d commit eb38f71

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
# Keep 1.1.1w in our list despite it being upstream EOL and otherwise
262262
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
263263
# supported by important vendors such as AWS-LC.
264-
openssl_ver: [1.1.1w, 3.0.18, 3.3.5, 3.4.3, 3.5.4, 3.6.0]
264+
openssl_ver: [1.1.1w, 3.0.19, 3.3.6, 3.4.4, 3.5.5, 3.6.1]
265265
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
266266
env:
267267
OPENSSL_VER: ${{ matrix.openssl_ver }}

Modules/_ssl_data_36.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-01-17T13:03:49.335767+00:00 */
3-
/* Generated from Git commit openssl-3.6.0-0-g7b371d80d9 */
2+
/* Generated on 2026-02-13T18:19:19.227109+00:00 */
3+
/* Generated from Git commit openssl-3.6.1-0-gc9a9e5b10 */
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

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.18",
53-
"3.3.5",
54-
"3.4.3",
55-
"3.5.4",
56-
"3.6.0",
52+
"3.0.19",
53+
"3.3.6",
54+
"3.4.4",
55+
"3.5.5",
56+
"3.6.1",
5757
# See make_ssl_data.py for notes on adding a new version.
5858
]
5959

0 commit comments

Comments
 (0)