Skip to content

Commit 40ad7ce

Browse files
committed
update OpenSSL mnemonics
Since mnemonics from 3.4.1 are different (renumbered) from 3.4.0. To ease future updates, we assume the following: `_ssl_data_<MAJOR><PATCH>.h` contains the latest OpenSSL data. If the previous `_ssl_data_<MAJOR><PATCH>.h` file is incompatible with the newest one (e.g., because some mnemonics were renamed or removed), the old one is renamed to `_ssl_data_<MAJOR><MINOR><PATCH>.h` where <PATCH> is the patch number it was based upon. In this commit, OpenSSL 3.4.1 mnemonics are not compatible with OpenSSL 3.4.0 mnemonics as they were renumbered. Therefore, `_ssl_data_34.h` is renamed to `_ssl_data_340.h` and `_ssl_data_34x.h` now contains OpenSSL 3.4.1 mnemonics. We also refined the mnemonics that are selected, discarding those that are mnemonics-like but should not be used as such (e.g., ERR_LIB_MASK and ERR_LIB_OFFSET for OpenSSL 1.1.1).
1 parent 85ec7b2 commit 40ad7ce

6 files changed

Lines changed: 23879 additions & 14425 deletions

File tree

Modules/_ssl.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ static void _PySSLFixErrno(void) {
121121

122122
/* Include generated data (error codes) */
123123
/* See make_ssl_data.h for notes on adding a new version. */
124-
#if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
124+
#if (OPENSSL_VERSION_NUMBER >= 0x30401000L)
125125
#include "_ssl_data_34.h"
126+
#elif (OPENSSL_VERSION_NUMBER >= 0x30100000L)
127+
#include "_ssl_data_340.h"
126128
#elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
127129
#include "_ssl_data_300.h"
128130
#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)

0 commit comments

Comments
 (0)