Skip to content

Commit db5c576

Browse files
authored
pythongh-127330: Update for OpenSSL 3.4 & document+improve the update process (pythonGH-127331)
- Add `git describe` output to headers generated by `make_ssl_data.py` This info is more important than the date when the file was generated. It does mean that the tool now requires a Git checkout of OpenSSL, not for example a release tarball. - Regenerate the older file to add the info. To the other older file, add a note about manual edits. - Add notes on how to add a new OpenSSL version - Add 3.4 error messages and multissl tests
1 parent 3a77980 commit db5c576

File tree

9 files changed

+719
-11
lines changed

9 files changed

+719
-11
lines changed

.github/workflows/build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ jobs:
250250
fail-fast: false
251251
matrix:
252252
os: [ubuntu-24.04]
253-
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
253+
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
254+
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
254255
env:
255256
OPENSSL_VER: ${{ matrix.openssl_ver }}
256257
MULTISSL_DIR: ${{ github.workspace }}/multissl
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
:mod:`ssl` can show descriptions for errors added in OpenSSL 3.4.

Modules/_ssl.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ static void _PySSLFixErrno(void) {
120120
#endif
121121

122122
/* Include generated data (error codes) */
123+
/* See make_ssl_data.h for notes on adding a new version. */
123124
#if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
124-
#include "_ssl_data_31.h"
125+
#include "_ssl_data_34.h"
125126
#elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
126127
#include "_ssl_data_300.h"
127128
#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)

Modules/_ssl_data_111.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T02:58:04.081473 */
1+
/* File generated by Tools/ssl/make_ssl_data.py */
2+
/* Generated on 2024-11-27T12:48:46.194048+00:00 */
3+
/* Generated from Git commit OpenSSL_1_1_1w-0-ge04bd3433f */
24
static struct py_ssl_library_code library_codes[] = {
35
#ifdef ERR_LIB_ASN1
46
{"ASN1", ERR_LIB_ASN1},

Modules/_ssl_data_300.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T03:03:52.163218 */
1+
/* File generated by Tools/ssl/make_ssl_data.py */
2+
/* Generated on 2023-06-01T03:03:52.163218 */
3+
/* Manually edited to add definitions from 1.1.1 (GH-105174) */
4+
25
static struct py_ssl_library_code library_codes[] = {
36
#ifdef ERR_LIB_ASN1
47
{"ASN1", ERR_LIB_ASN1},

0 commit comments

Comments
 (0)