Skip to content

Commit 7cc3334

Browse files
zwarezware
authored
gh-156369: Update OpenSSL error ID data (GH-156380)
1 parent 369f04a commit 7cc3334

3 files changed

Lines changed: 66 additions & 10 deletions

File tree

‎Modules/_ssl_data_300.h‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* 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) */
2+
/* Generated on 2026-08-25T19:28:21.667000+00:00 */
3+
/* Generated from Git commit openssl-3.0.22-0-ga279090b9 */
4+
/* Manually edited to retain definitions from 1.1.1 (GH-105174) */
45

6+
/* generated from args.lib2errnum */
57
static struct py_ssl_library_code library_codes[] = {
68
#ifdef ERR_LIB_ASN1
79
{"ASN1", ERR_LIB_ASN1},
@@ -168,10 +170,10 @@ static struct py_ssl_library_code library_codes[] = {
168170
#ifdef ERR_LIB_X509V3
169171
{"X509V3", ERR_LIB_X509V3},
170172
#endif
171-
{ NULL }
173+
{NULL, 0} /* sentinel */
172174
};
173175

174-
176+
/* generated from args.reasons */
175177
static struct py_ssl_error_code error_codes[] = {
176178
#ifdef ASN1_R_ADDING_OBJECT
177179
{"ADDING_OBJECT", ERR_LIB_ASN1, ASN1_R_ADDING_OBJECT},
@@ -1538,6 +1540,11 @@ static struct py_ssl_error_code error_codes[] = {
15381540
#else
15391541
{"CERTIFICATE_VERIFY_ERROR", 46, 100},
15401542
#endif
1543+
#ifdef CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA
1544+
{"CIPHER_AEAD_IN_ENVELOPED_DATA", ERR_LIB_CMS, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA},
1545+
#else
1546+
{"CIPHER_AEAD_IN_ENVELOPED_DATA", 46, 182},
1547+
#endif
15411548
#ifdef CMS_R_CIPHER_AEAD_SET_TAG_ERROR
15421549
{"CIPHER_AEAD_SET_TAG_ERROR", ERR_LIB_CMS, CMS_R_CIPHER_AEAD_SET_TAG_ERROR},
15431550
#else
@@ -1643,6 +1650,11 @@ static struct py_ssl_error_code error_codes[] = {
16431650
#else
16441651
{"ERROR_SETTING_RECIPIENTINFO", 46, 116},
16451652
#endif
1653+
#ifdef CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT
1654+
{"ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT", ERR_LIB_CMS, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT},
1655+
#else
1656+
{"ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT", 46, 196},
1657+
#endif
16461658
#ifdef CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR
16471659
{"ESS_SIGNING_CERTID_MISMATCH_ERROR", ERR_LIB_CMS, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR},
16481660
#else
@@ -1963,6 +1975,11 @@ static struct py_ssl_error_code error_codes[] = {
19631975
#else
19641976
{"UNSUPPORTED_RECIPIENT_TYPE", 46, 154},
19651977
#endif
1978+
#ifdef CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM
1979+
{"UNSUPPORTED_SIGNATURE_ALGORITHM", ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM},
1980+
#else
1981+
{"UNSUPPORTED_SIGNATURE_ALGORITHM", 46, 195},
1982+
#endif
19661983
#ifdef CMS_R_UNSUPPORTED_TYPE
19671984
{"UNSUPPORTED_TYPE", ERR_LIB_CMS, CMS_R_UNSUPPORTED_TYPE},
19681985
#else
@@ -2088,6 +2105,11 @@ static struct py_ssl_error_code error_codes[] = {
20882105
#else
20892106
{"RECURSIVE_DIRECTORY_INCLUDE", 14, 111},
20902107
#endif
2108+
#ifdef CONF_R_RECURSIVE_SECTION_REFERENCE
2109+
{"RECURSIVE_SECTION_REFERENCE", ERR_LIB_CONF, CONF_R_RECURSIVE_SECTION_REFERENCE},
2110+
#else
2111+
{"RECURSIVE_SECTION_REFERENCE", 14, 126},
2112+
#endif
20912113
#ifdef CONF_R_RELATIVE_PATH
20922114
{"RELATIVE_PATH", ERR_LIB_CONF, CONF_R_RELATIVE_PATH},
20932115
#else
@@ -2573,6 +2595,11 @@ static struct py_ssl_error_code error_codes[] = {
25732595
#else
25742596
{"PEER_KEY_ERROR", 5, 111},
25752597
#endif
2598+
#ifdef DH_R_Q_TOO_LARGE
2599+
{"Q_TOO_LARGE", ERR_LIB_DH, DH_R_Q_TOO_LARGE},
2600+
#else
2601+
{"Q_TOO_LARGE", 5, 130},
2602+
#endif
25762603
#ifdef DH_R_SHARED_INFO_ERROR
25772604
{"SHARED_INFO_ERROR", ERR_LIB_DH, DH_R_SHARED_INFO_ERROR},
25782605
#else
@@ -7483,6 +7510,11 @@ static struct py_ssl_error_code error_codes[] = {
74837510
#else
74847511
{"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080},
74857512
#endif
7513+
#ifdef SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL
7514+
{"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL},
7515+
#else
7516+
{"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", 20, 1120},
7517+
#endif
74867518
#ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION
74877519
{"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION},
74887520
#else
@@ -7503,6 +7535,11 @@ static struct py_ssl_error_code error_codes[] = {
75037535
#else
75047536
{"TLSV1_ALERT_UNKNOWN_CA", 20, 1048},
75057537
#endif
7538+
#ifdef SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY
7539+
{"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY},
7540+
#else
7541+
{"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", 20, 1115},
7542+
#endif
75067543
#ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED
75077544
{"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_USER_CANCELLED},
75087545
#else
@@ -8408,11 +8445,21 @@ static struct py_ssl_error_code error_codes[] = {
84088445
#else
84098446
{"CRL_ALREADY_DELTA", 11, 127},
84108447
#endif
8448+
#ifdef X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH
8449+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", ERR_LIB_X509, X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH},
8450+
#else
8451+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", 11, 147},
8452+
#endif
84118453
#ifdef X509_R_CRL_VERIFY_FAILURE
84128454
{"CRL_VERIFY_FAILURE", ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE},
84138455
#else
84148456
{"CRL_VERIFY_FAILURE", 11, 131},
84158457
#endif
8458+
#ifdef X509_R_DUPLICATE_ATTRIBUTE
8459+
{"DUPLICATE_ATTRIBUTE", ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE},
8460+
#else
8461+
{"DUPLICATE_ATTRIBUTE", 11, 140},
8462+
#endif
84168463
#ifdef X509_R_ERROR_GETTING_MD_BY_NID
84178464
{"ERROR_GETTING_MD_BY_NID", ERR_LIB_X509, X509_R_ERROR_GETTING_MD_BY_NID},
84188465
#else
@@ -8583,6 +8630,5 @@ static struct py_ssl_error_code error_codes[] = {
85838630
#else
85848631
{"WRONG_TYPE", 11, 122},
85858632
#endif
8586-
{ NULL }
8633+
{NULL, 0, 0} /* sentinel */
85878634
};
8588-

‎Modules/_ssl_data_36.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* File generated by Tools/ssl/make_ssl_data.py */
2-
/* Generated on 2026-05-03T19:50:43.034653+00:00 */
3-
/* Generated from Git commit openssl-3.6.2-0-gfe686e15d */
2+
/* Generated on 2026-08-25T19:23:56.859950+00:00 */
3+
/* Generated from Git commit openssl-3.6.4-0-gd3c1b1169 */
44

55
/* generated from args.lib2errnum */
66
static struct py_ssl_library_code library_codes[] = {
@@ -9268,6 +9268,11 @@ static struct py_ssl_error_code error_codes[] = {
92689268
#else
92699269
{"CRL_ALREADY_DELTA", 11, 127},
92709270
#endif
9271+
#ifdef X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH
9272+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", ERR_LIB_X509, X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH},
9273+
#else
9274+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", 11, 147},
9275+
#endif
92719276
#ifdef X509_R_CRL_VERIFY_FAILURE
92729277
{"CRL_VERIFY_FAILURE", ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE},
92739278
#else

‎Modules/_ssl_data_40.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* File generated by Tools/ssl/make_ssl_data.py */
2-
/* Generated on 2026-04-15T09:18:34.696139+00:00 */
3-
/* Generated from Git commit v3.15.0a8-132-gd14e31ed683 */
2+
/* Generated on 2026-08-25T19:25:20.590415+00:00 */
3+
/* Generated from Git commit openssl-4.0.2-0-gf089acdf4 */
44

55
/* generated from args.lib2errnum */
66
static struct py_ssl_library_code library_codes[] = {
@@ -9163,6 +9163,11 @@ static struct py_ssl_error_code error_codes[] = {
91639163
#else
91649164
{"CRL_ALREADY_DELTA", 11, 127},
91659165
#endif
9166+
#ifdef X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH
9167+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", ERR_LIB_X509, X509_R_CRL_SIGNATURE_ALGORITHM_MISMATCH},
9168+
#else
9169+
{"CRL_SIGNATURE_ALGORITHM_MISMATCH", 11, 147},
9170+
#endif
91669171
#ifdef X509_R_CRL_VERIFY_FAILURE
91679172
{"CRL_VERIFY_FAILURE", ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE},
91689173
#else

0 commit comments

Comments
 (0)