mirror of
https://github.com/python/cpython.git
synced 2026-05-04 09:31:02 +00:00
gh-149254: Update CI to use latest OpenSSL and AWS-LC versions (GH-149330)
Also update Modules/_ssl_data_36.h to include an added symbol from OpenSSL 3.6.2.
This commit is contained in:
parent
d254d6ee49
commit
68fe899feb
4 changed files with 21 additions and 16 deletions
16
.github/workflows/build.yml
vendored
16
.github/workflows/build.yml
vendored
|
|
@ -278,13 +278,13 @@ jobs:
|
|||
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
|
||||
# supported by important vendors such as AWS-LC.
|
||||
- { name: openssl, version: 1.1.1w }
|
||||
- { name: openssl, version: 3.0.19 }
|
||||
- { name: openssl, version: 3.3.6 }
|
||||
- { name: openssl, version: 3.4.4 }
|
||||
- { name: openssl, version: 3.5.5 }
|
||||
- { name: openssl, version: 3.6.1 }
|
||||
- { name: openssl, version: 3.0.20 }
|
||||
- { name: openssl, version: 3.3.7 }
|
||||
- { name: openssl, version: 3.4.5 }
|
||||
- { name: openssl, version: 3.5.6 }
|
||||
- { name: openssl, version: 3.6.2 }
|
||||
## AWS-LC
|
||||
- { name: aws-lc, version: 1.68.0 }
|
||||
- { name: aws-lc, version: 1.72.1 }
|
||||
env:
|
||||
SSLLIB_VER: ${{ matrix.ssllib.version }}
|
||||
MULTISSL_DIR: ${{ github.workspace }}/multissl
|
||||
|
|
@ -398,7 +398,7 @@ jobs:
|
|||
needs: build-context
|
||||
if: needs.build-context.outputs.run-ubuntu == 'true'
|
||||
env:
|
||||
OPENSSL_VER: 3.5.5
|
||||
OPENSSL_VER: 3.5.6
|
||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||
steps:
|
||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||
|
|
@ -506,7 +506,7 @@ jobs:
|
|||
matrix:
|
||||
os: [ubuntu-24.04]
|
||||
env:
|
||||
OPENSSL_VER: 3.5.5
|
||||
OPENSSL_VER: 3.5.6
|
||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
|
||||
steps:
|
||||
|
|
|
|||
2
.github/workflows/reusable-ubuntu.yml
vendored
2
.github/workflows/reusable-ubuntu.yml
vendored
|
|
@ -35,7 +35,7 @@ jobs:
|
|||
runs-on: ${{ inputs.os }}
|
||||
timeout-minutes: 60
|
||||
env:
|
||||
OPENSSL_VER: 3.5.5
|
||||
OPENSSL_VER: 3.5.6
|
||||
PYTHONSTRICTEXTENSIONBUILD: 1
|
||||
TERM: linux
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* File generated by Tools/ssl/make_ssl_data.py */
|
||||
/* Generated on 2026-02-13T18:19:19.227109+00:00 */
|
||||
/* Generated from Git commit openssl-3.6.1-0-gc9a9e5b10 */
|
||||
/* Generated on 2026-05-03T19:50:43.034653+00:00 */
|
||||
/* Generated from Git commit openssl-3.6.2-0-gfe686e15d */
|
||||
|
||||
/* generated from args.lib2errnum */
|
||||
static struct py_ssl_library_code library_codes[] = {
|
||||
|
|
@ -4263,6 +4263,11 @@ static struct py_ssl_error_code error_codes[] = {
|
|||
#else
|
||||
{"CONNECT_FAILURE", 61, 100},
|
||||
#endif
|
||||
#ifdef HTTP_R_CONTENT_TYPE_MISMATCH
|
||||
{"CONTENT_TYPE_MISMATCH", ERR_LIB_HTTP, HTTP_R_CONTENT_TYPE_MISMATCH},
|
||||
#else
|
||||
{"CONTENT_TYPE_MISMATCH", 61, 131},
|
||||
#endif
|
||||
#ifdef HTTP_R_ERROR_PARSING_ASN1_LENGTH
|
||||
{"ERROR_PARSING_ASN1_LENGTH", ERR_LIB_HTTP, HTTP_R_ERROR_PARSING_ASN1_LENGTH},
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@
|
|||
]
|
||||
|
||||
OPENSSL_RECENT_VERSIONS = [
|
||||
"3.0.19",
|
||||
"3.3.6",
|
||||
"3.4.4",
|
||||
"3.5.5",
|
||||
"3.6.1",
|
||||
"3.0.20",
|
||||
"3.3.7",
|
||||
"3.4.5",
|
||||
"3.5.6",
|
||||
"3.6.2",
|
||||
# See make_ssl_data.py for notes on adding a new version.
|
||||
]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue