8000 gh-127330: Update for OpenSSL 3.4 by encukou · Pull Request #127331 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-127330: Update for OpenSSL 3.4 #127331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 28, 2024
Merged

gh-127330: Update for OpenSSL 3.4 #127331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
318838a
Add `git describe` output to make_ssl_data.py
encukou Nov 26, 2024
7ebe9aa
Add notes on adding a new OpenSSL version
encukou Nov 27, 2024
16f47c6
Generate data for OpenSSL 3.4 and add it to multissltests
encukou Nov 27, 2024
bc310fe
Regenerate _ssl_data_111.h, to show the source commit
encukou Nov 27, 2024
2f256a3
_ssl_data_300.h: Edit the headsr to log manual edits
encukou Nov 27, 2024
e734721
Fix typo
encukou Nov 27, 2024
68810ef
Add blurb
encukou Nov 27, 2024
ea72022
Use a wildcard for c-analyzer
encukou Nov 27, 2024
783129a
Use UTF-8
encukou Nov 28, 2024
f4336cd
Missing word in comment
encukou Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-24.04]
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
env:
OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-11-27-14-23-02.gh-issue-127331.9sNEC9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:mod:`ssl` can show descriptions for errors added in OpenSSL 3.4.
3 changes: 2 additions & 1 deletion Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ static void _PySSLFixErrno(void) {
#endif

/* Include generated data (error codes) */
/* See make_ssl_data.h for notes on adding a new version. */
#if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
#include "_ssl_data_31.h"
#include "_ssl_data_34.h"
#elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
#include "_ssl_data_300.h"
#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)
Expand Down
4 changes: 3 additions & 1 deletion Modules/_ssl_data_111.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T02:58:04.081473 */
/* File generated by Tools/ssl/make_ssl_data.py */
/* Generated on 2024-11-27T12:48:46.194048+00:00 */
/* Generated from Git commit OpenSSL_1_1_1w-0-ge04bd3433f */
static struct py_ssl_library_code library_codes[] = {
#ifdef ERR_LIB_ASN1
{"ASN1", ERR_LIB_ASN1},
Expand Down
5 changes: 4 additions & 1 deletion Modules/_ssl_data_300.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T03:03:52.163218 */
/* File generated by Tools/ssl/make_ssl_data.py */
/* Generated on 2023-06-01T03:03:52.163218 */
/* Manually edited to add definitions from 1.1.1 (GH-105174) */

static struct py_ssl_library_code library_codes[] = {
#ifdef ERR_LIB_ASN1
{"ASN1", ERR_LIB_ASN1},
Expand Down
Loading
Loading
0