https://github.com/python/cpython/commit/396f1ddbb109005ef7bd6426065b95ddce2c6d88
commit: 396f1ddbb109005ef7bd6426065b95ddce2c6d88
branch: 3.14
author: Zachary Ware <[email protected]>
committer: hugovk <[email protected]>
date: 2026-08-26T10:35:50+09:00
summary:
[3.14] gh-156369: Update OpenSSL error ID data (GH-156380) (#156393)
(cherry picked from commit 7cc333439b6426a43cdbca690d9170c9db0d8669)
files:
M Modules/_ssl_data_300.h
M Modules/_ssl_data_35.h
diff --git a/Modules/_ssl_data_300.h b/Modules/_ssl_data_300.h
index b687ce43c77d669..39b637a8f6a2ca4 100644
--- a/Modules/_ssl_data_300.h
+++ b/Modules/_ssl_data_300.h
@@ -1,7 +1,9 @@
/* 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) */
+/* Generated on 2026-08-25T19:28:21.667000+00:00 */
+/* Generated from Git commit openssl-3.0.22-0-ga279090b9 */
+/* Manually edited to retain definitions from 1.1.1 (GH-105174) */
+/* generated from args.lib2errnum */
static struct py_ssl_library_code library_codes[] = {
#ifdef ERR_LIB_ASN1
{"ASN1", ERR_LIB_ASN1},
@@ -168,10 +170,10 @@ static struct py_ssl_library_code library_codes[] = {
#ifdef ERR_LIB_X509V3
{"X509V3", ERR_LIB_X509V3},
#endif
- { NULL }
+ {NULL, 0} /* sentinel */
};
-
+/* generated from args.reasons */
static struct py_ssl_error_code error_codes[] = {
#ifdef ASN1_R_ADDING_OBJECT
{"ADDING_OBJECT", ERR_LIB_ASN1, ASN1_R_ADDING_OBJECT},
@@ -1538,6 +1540,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"CERTIFICATE_VERIFY_ERROR", 46, 100},
#endif
+ #ifdef CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA
+ {"CIPHER_AEAD_IN_ENVELOPED_DATA", ERR_LIB_CMS,
CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA},
+ #else
+ {"CIPHER_AEAD_IN_ENVELOPED_DATA", 46, 182},
+ #endif
#ifdef CMS_R_CIPHER_AEAD_SET_TAG_ERROR
{"CIPHER_AEAD_SET_TAG_ERROR", ERR_LIB_CMS,
CMS_R_CIPHER_AEAD_SET_TAG_ERROR},
#else
@@ -1643,6 +1650,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"ERROR_SETTING_RECIPIENTINFO", 46, 116},
#endif
+ #ifdef CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT
+ {"ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT", ERR_LIB_CMS,
CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT},
+ #else
+ {"ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT", 46, 196},
+ #endif
#ifdef CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR
{"ESS_SIGNING_CERTID_MISMATCH_ERROR", ERR_LIB_CMS,
CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR},
#else
@@ -1963,6 +1975,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"UNSUPPORTED_RECIPIENT_TYPE", 46, 154},
#endif
+ #ifdef CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM
+ {"UNSUPPORTED_SIGNATURE_ALGORITHM", ERR_LIB_CMS,
CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM},
+ #else
+ {"UNSUPPORTED_SIGNATURE_ALGORITHM", 46, 195},
+ #endif
#ifdef CMS_R_UNSUPPORTED_TYPE
{"UNSUPPORTED_TYPE", ERR_LIB_CMS, CMS_R_UNSUPPORTED_TYPE},
#else
@@ -2088,6 +2105,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"RECURSIVE_DIRECTORY_INCLUDE", 14, 111},
#endif
+ #ifdef CONF_R_RECURSIVE_SECTION_REFERENCE
+ {"RECURSIVE_SECTION_REFERENCE", ERR_LIB_CONF,
CONF_R_RECURSIVE_SECTION_REFERENCE},
+ #else
+ {"RECURSIVE_SECTION_REFERENCE", 14, 126},
+ #endif
#ifdef CONF_R_RELATIVE_PATH
{"RELATIVE_PATH", ERR_LIB_CONF, CONF_R_RELATIVE_PATH},
#else
@@ -2573,6 +2595,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"PEER_KEY_ERROR", 5, 111},
#endif
+ #ifdef DH_R_Q_TOO_LARGE
+ {"Q_TOO_LARGE", ERR_LIB_DH, DH_R_Q_TOO_LARGE},
+ #else
+ {"Q_TOO_LARGE", 5, 130},
+ #endif
#ifdef DH_R_SHARED_INFO_ERROR
{"SHARED_INFO_ERROR", ERR_LIB_DH, DH_R_SHARED_INFO_ERROR},
#else
@@ -7483,6 +7510,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080},
#endif
+ #ifdef SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL
+ {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", ERR_LIB_SSL,
SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL},
+ #else
+ {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", 20, 1120},
+ #endif
#ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION
{"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL,
SSL_R_TLSV1_ALERT_NO_RENEGOTIATION},
#else
@@ -7503,6 +7535,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"TLSV1_ALERT_UNKNOWN_CA", 20, 1048},
#endif
+ #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY
+ {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", ERR_LIB_SSL,
SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY},
+ #else
+ {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", 20, 1115},
+ #endif
#ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED
{"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL,
SSL_R_TLSV1_ALERT_USER_CANCELLED},
#else
@@ -8408,11 +8445,21 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"CRL_ALREADY_DELTA", 11, 127},
#endif
+ #ifdef X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH
+ {"CRL_SIGNATURE_ALGORITHM_MISMATCH", ERR_LIB_X509,
X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH},
+ #else
+ {"CRL_SIGNATURE_ALGORITHM_MISMATCH", 11, 147},
+ #endif
#ifdef X509_R_CRL_VERIFY_FAILURE
{"CRL_VERIFY_FAILURE", ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE},
#else
{"CRL_VERIFY_FAILURE", 11, 131},
#endif
+ #ifdef X509_R_DUPLICATE_ATTRIBUTE
+ {"DUPLICATE_ATTRIBUTE", ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE},
+ #else
+ {"DUPLICATE_ATTRIBUTE", 11, 140},
+ #endif
#ifdef X509_R_ERROR_GETTING_MD_BY_NID
{"ERROR_GETTING_MD_BY_NID", ERR_LIB_X509, X509_R_ERROR_GETTING_MD_BY_NID},
#else
@@ -8583,6 +8630,5 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"WRONG_TYPE", 11, 122},
#endif
- { NULL }
+ {NULL, 0, 0} /* sentinel */
};
-
diff --git a/Modules/_ssl_data_35.h b/Modules/_ssl_data_35.h
index 89c97f3be51a7fd..fd323e6ee5a2c07 100644
--- a/Modules/_ssl_data_35.h
+++ b/Modules/_ssl_data_35.h
@@ -1,6 +1,6 @@
/* File generated by Tools/ssl/make_ssl_data.py */
-/* Generated on 2026-05-03T20:36:01.807725+00:00 */
-/* Generated from Git commit openssl-3.5.6-0-g286ddeaac */
+/* Generated on 2026-08-25T19:23:56.859950+00:00 */
+/* Generated from Git commit openssl-3.6.4-0-gd3c1b1169 */
/* generated from args.lib2errnum */
static struct py_ssl_library_code library_codes[] = {
@@ -1868,6 +1868,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"NOT_KEK", 46, 123},
#endif
+ #ifdef CMS_R_NOT_KEM
+ {"NOT_KEM", ERR_LIB_CMS, CMS_R_NOT_KEM},
+ #else
+ {"NOT_KEM", 46, 197},
+ #endif
#ifdef CMS_R_NOT_KEY_AGREEMENT
{"NOT_KEY_AGREEMENT", ERR_LIB_CMS, CMS_R_NOT_KEY_AGREEMENT},
#else
@@ -2063,6 +2068,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"UNKNOWN_ID", 46, 150},
#endif
+ #ifdef CMS_R_UNKNOWN_KDF_ALGORITHM
+ {"UNKNOWN_KDF_ALGORITHM", ERR_LIB_CMS, CMS_R_UNKNOWN_KDF_ALGORITHM},
+ #else
+ {"UNKNOWN_KDF_ALGORITHM", 46, 198},
+ #endif
#ifdef CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM
{"UNSUPPORTED_COMPRESSION_ALGORITHM", ERR_LIB_CMS,
CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM},
#else
@@ -2083,6 +2093,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"UNSUPPORTED_ENCRYPTION_TYPE", 46, 192},
#endif
+ #ifdef CMS_R_UNSUPPORTED_KDF_ALGORITHM
+ {"UNSUPPORTED_KDF_ALGORITHM", ERR_LIB_CMS,
CMS_R_UNSUPPORTED_KDF_ALGORITHM},
+ #else
+ {"UNSUPPORTED_KDF_ALGORITHM", 46, 199},
+ #endif
#ifdef CMS_R_UNSUPPORTED_KEK_ALGORITHM
{"UNSUPPORTED_KEK_ALGORITHM", ERR_LIB_CMS,
CMS_R_UNSUPPORTED_KEK_ALGORITHM},
#else
@@ -5773,6 +5788,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"PSS_SALTLEN_TOO_SMALL", 57, 172},
#endif
+ #ifdef PROV_R_REPEATED_PARAMETER
+ {"REPEATED_PARAMETER", ERR_LIB_PROV, PROV_R_REPEATED_PARAMETER},
+ #else
+ {"REPEATED_PARAMETER", 57, 252},
+ #endif
#ifdef PROV_R_REQUEST_TOO_LARGE_FOR_DRBG
{"REQUEST_TOO_LARGE_FOR_DRBG", ERR_LIB_PROV,
PROV_R_REQUEST_TOO_LARGE_FOR_DRBG},
#else
@@ -9248,6 +9268,11 @@ static struct py_ssl_error_code error_codes[] = {
#else
{"CRL_ALREADY_DELTA", 11, 127},
#endif
+ #ifdef X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH
+ {"CRL_SIGNATURE_ALGORITHM_MISMATCH", ERR_LIB_X509,
X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH},
+ #else
+ {"CRL_SIGNATURE_ALGORITHM_MISMATCH", 11, 147},
+ #endif
#ifdef X509_R_CRL_VERIFY_FAILURE
{"CRL_VERIFY_FAILURE", ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE},
#else
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
