Skip to content

Commit 70eb56b

Browse files
authored
gh-148600: Add Modules/_ssl_data_40.h data (#148601)
The Modules/_ssl_data_40.h file was created with the commands: python Tools/ssl/multissltests.py --steps=library --base-directory "$PWD/multissl" --openssl '4.0.0' --system Linux python Tools/ssl/make_ssl_data.py multissl/src/openssl-4.0.0 Modules/_ssl_data_40.h Update Modules/_ssl.c to include it on OpenSSL 4.0.0 and newer. Update test_ssl for the new error message.
1 parent cb339d3 commit 70eb56b

File tree

3 files changed

+9368
-7
lines changed

3 files changed

+9368
-7
lines changed

Lib/test/test_ssl.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4674,7 +4674,9 @@ def cb_raising(ssl_sock, server_name, initial_context):
46744674
sni_name='supermessage')
46754675

46764676
# Allow for flexible libssl error messages.
4677-
regex = "(SSLV3_ALERT_HANDSHAKE_FAILURE|NO_PRIVATE_VALUE)"
4677+
regex = ("(TLS_ALERT_HANDSHAKE_FAILURE"
4678+
"|SSLV3_ALERT_HANDSHAKE_FAILURE"
4679+
"|NO_PRIVATE_VALUE)")
46784680
self.assertRegex(cm.exception.reason, regex)
46794681
self.assertEqual(catch.unraisable.exc_type, ZeroDivisionError)
46804682

Modules/_ssl.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,18 @@ static void _PySSLFixErrno(void) {
153153

154154
/* Include generated data (error codes) */
155155
/* See Tools/ssl/make_ssl_data.py for notes on adding a new version. */
156-
#if (OPENSSL_VERSION_NUMBER >= 0x30401000L)
157-
#include "_ssl_data_36.h"
156+
#if (OPENSSL_VERSION_NUMBER >= 0x40000000L)
157+
# include "_ssl_data_40.h"
158+
#elif (OPENSSL_VERSION_NUMBER >= 0x30401000L)
159+
# include "_ssl_data_36.h"
158160
#elif (OPENSSL_VERSION_NUMBER >= 0x30100000L)
159-
#include "_ssl_data_340.h"
161+
# include "_ssl_data_340.h"
160162
#elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
161-
#include "_ssl_data_300.h"
163+
# include "_ssl_data_300.h"
162164
#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)
163-
#include "_ssl_data_111.h"
165+
# include "_ssl_data_111.h"
164166
#else
165-
#error Unsupported OpenSSL version
167+
# error Unsupported OpenSSL version
166168
#endif
167169

168170
#if (OPENSSL_VERSION_NUMBER >= 0x40000000L)

0 commit comments

Comments
 (0)