util/mkerr.pl: make it not depend on the function code

The output C code was made to use ERR_func_error_string() to see if a
string table was already loaded or not.  Since this function returns
NULL always, this check became useless.

Change it to use ERR_reason_error_string() instead, as there's no
reason to believe we will get rid of reason strings, ever.

To top it off, we rebuild all affected C sources.

Fixes #9756

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9756)

diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index 9d398f7d07f892a0c435c158f1090b6520986388..96878e2a46a615b0583e2cb0b38923619e2a83d5 100644 (file)
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -201,7 +201,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
 int ERR_load_ASN1_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_ASN1_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(ASN1_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(ASN1_str_reasons[0].error) == NULL)

         ERR_load_strings_const(ASN1_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(ASN1_str_reasons);
 #endif
     return 1;

diff --git a/crypto/async/async_err.c b/crypto/async/async_err.c
index f3643e107c829ed135606b0c015a4256a49fa968..7a06f75265b0f49fcc7345c9fab3b90e80caef88 100644 (file)
--- a/crypto/async/async_err.c
+++ b/crypto/async/async_err.c
@@ -29,7 +29,7 @@ static const ERR_STRING_DATA ASYNC_str_reasons[] = {
 int ERR_load_ASYNC_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_ASYNC_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(ASYNC_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(ASYNC_str_reasons[0].error) == NULL)

         ERR_load_strings_const(ASYNC_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(ASYNC_str_reasons);
 #endif
     return 1;

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 69f8d6470567a351911117acf4b031231e9dc977..178fdd6a79616e2e24bcaa53620fcf56e41492c5 100644 (file)
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -76,7 +76,7 @@ static const ERR_STRING_DATA BIO_str_reasons[] = {
 int ERR_load_BIO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_BIO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(BIO_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(BIO_str_reasons[0].error) == NULL)

         ERR_load_strings_const(BIO_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(BIO_str_reasons);
 #endif
     return 1;

diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index e1f260dcf852c6152420ce53fb6bc626de06d10c..ce0ea3865d7a1fc31504cc998ba129c3710b2d78 100644 (file)
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -47,7 +47,7 @@ static const ERR_STRING_DATA BN_str_reasons[] = {
 int ERR_load_BN_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_BN_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(BN_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(BN_str_reasons[0].error) == NULL)

         ERR_load_strings_const(BN_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(BN_str_reasons);
 #endif
     return 1;

diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 066ce567ee0370cbac29e1b53c22f24d1cca1c1f..702707bb8884523a33dae7c11c303c35b202cbfb 100644 (file)
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -22,7 +22,7 @@ static const ERR_STRING_DATA BUF_str_reasons[] = {
 int ERR_load_BUF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_BUF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(BUF_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(BUF_str_reasons[0].error) == NULL)

         ERR_load_strings_const(BUF_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(BUF_str_reasons);
 #endif
     return 1;

diff --git a/crypto/cmp/cmp_err.c b/crypto/cmp/cmp_err.c
index 77e0aa1b358ea72167cbb32d21c723674c46d776..4e3a5c347e8808fe48bae5b61fcfad1fea50ccb9 100644 (file)
--- a/crypto/cmp/cmp_err.c
+++ b/crypto/cmp/cmp_err.c
@@ -22,7 +22,7 @@ static const ERR_STRING_DATA CMP_str_reasons[] = {
 int ERR_load_CMP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CMP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CMP_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CMP_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CMP_str_reasons);
 #endif
     return 1;

diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index a5d5a47409a51f0d235f1ba2bacd46b914490a61..98500d7cba709543bbfa112ffd5c60930b4b5e0b 100644 (file)
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -146,7 +146,7 @@ static const ERR_STRING_DATA CMS_str_reasons[] = {
 int ERR_load_CMS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CMS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CMS_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CMS_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CMS_str_reasons);
 #endif
     return 1;

diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index f29d0bcc44abdc21d6e7a6e421d929ed3ae17f48..d4ae0406a3a8025088bd4b95177a7158c0969919 100644 (file)
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -28,7 +28,7 @@ static const ERR_STRING_DATA COMP_str_reasons[] = {
 int ERR_load_COMP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_COMP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(COMP_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)

         ERR_load_strings_const(COMP_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(COMP_str_reasons);
 #endif
     return 1;

diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index f337700929e5e32f3c73ea28d56aa7e082441fd1..96d2cd99f519ccb8f538733ab55212eb2b16708a 100644 (file)
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -58,7 +58,7 @@ static const ERR_STRING_DATA CONF_str_reasons[] = {
 int ERR_load_CONF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CONF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CONF_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CONF_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CONF_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CONF_str_reasons);
 #endif
     return 1;

diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index 012f181d2afaeb92e63689904a5d0092356c126f..0028b329a32199a14485a036b8a511786aac4271 100644 (file)
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -52,7 +52,7 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
 int ERR_load_CRYPTO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CRYPTO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CRYPTO_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CRYPTO_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CRYPTO_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CRYPTO_str_reasons);
 #endif
     return 1;

diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index 68d0d73d1e1fee95ddf737404b86ed04c0c5baf0..87e6a2da606c74a88bfccdb7bf3850cec52bbacd 100644 (file)
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -54,7 +54,7 @@ static const ERR_STRING_DATA CRMF_str_reasons[] = {
 int ERR_load_CRMF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CRMF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CRMF_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CRMF_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CRMF_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CRMF_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index a960428ca5319340b7084dc72e7e8ac556306806..f9b9b57b2203f03b3319edfbdfb067e69c64fb7e 100644 (file)
--- a/crypto/ct/ct_err.c
+++ b/crypto/ct/ct_err.c
@@ -48,7 +48,7 @@ static const ERR_STRING_DATA CT_str_reasons[] = {
 int ERR_load_CT_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_CT_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(CT_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(CT_str_reasons[0].error) == NULL)

         ERR_load_strings_const(CT_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(CT_str_reasons);
 #endif
     return 1;

diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index 69f1452441ea3530c581a269d519e6c9cb4b9484..e5eb32381d289437f18d6978ecc338ec83a45b29 100644 (file)
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -60,7 +60,7 @@ static const ERR_STRING_DATA DH_str_reasons[] = {
 int ERR_load_DH_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_DH_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(DH_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(DH_str_reasons[0].error) == NULL)

         ERR_load_strings_const(DH_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(DH_str_reasons);
 #endif
     return 1;

diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 5b0b71507f2f7410f49123b65d185f664562438b..f4d187e4b93cf9631d27a1ffcd4cfdd726a996dc 100644 (file)
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -39,7 +39,7 @@ static const ERR_STRING_DATA DSA_str_reasons[] = {
 int ERR_load_DSA_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_DSA_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(DSA_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(DSA_str_reasons[0].error) == NULL)

         ERR_load_strings_const(DSA_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(DSA_str_reasons);
 #endif
     return 1;

diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 4afb106a8f63500013fe40a288039dacfe765db0..8a4d9a812a4fc16fda68c0850eafde3b03fada23 100644 (file)
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -49,7 +49,7 @@ static const ERR_STRING_DATA DSO_str_reasons[] = {
 int ERR_load_DSO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_DSO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(DSO_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(DSO_str_reasons[0].error) == NULL)

         ERR_load_strings_const(DSO_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(DSO_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 566b40f13d4ce3d7cb8ea3db8b0aa3773a987843..66d9c4b16e8ad2e20d47f305355412f77b39271b 100644 (file)
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -112,7 +112,7 @@ static const ERR_STRING_DATA EC_str_reasons[] = {
 int ERR_load_EC_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_EC_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(EC_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(EC_str_reasons[0].error) == NULL)

         ERR_load_strings_const(EC_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(EC_str_reasons);
 #endif
     return 1;

diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index 75097753a1963ebbd042dce7352404e7d51bf65b..c602e0ffe79aca51c734ef22bc9e46f5bcce8c90 100644 (file)
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -81,7 +81,7 @@ static const ERR_STRING_DATA ENGINE_str_reasons[] = {
 int ERR_load_ENGINE_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_ENGINE_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(ENGINE_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(ENGINE_str_reasons[0].error) == NULL)

         ERR_load_strings_const(ENGINE_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(ENGINE_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ess/ess_err.c b/crypto/ess/ess_err.c
index 0b582277adbc41f61f475859521e09e47ce09d61..b494aa246f5afe0bd4eac629e4400f60cbde0478 100644 (file)
--- a/crypto/ess/ess_err.c
+++ b/crypto/ess/ess_err.c
@@ -28,7 +28,7 @@ static const ERR_STRING_DATA ESS_str_reasons[] = {
 int ERR_load_ESS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_ESS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(ESS_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(ESS_str_reasons[0].error) == NULL)

         ERR_load_strings_const(ESS_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(ESS_str_reasons);
 #endif
     return 1;

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 63174f98f62c8c86972262d2cc18cad412b2fd83..b74b87e4f5b3b74cd32e859fd181106495d5c800 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -161,7 +161,7 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
 int ERR_load_EVP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_EVP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(EVP_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(EVP_str_reasons[0].error) == NULL)

         ERR_load_strings_const(EVP_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(EVP_str_reasons);
 #endif
     return 1;

diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index f8b48fe0de89dec090783843b9289de9d4c328e9..b32e9f6f55ea51a48d90d6248acb32d4fda666c6 100644 (file)
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -24,7 +24,7 @@ static const ERR_STRING_DATA OBJ_str_reasons[] = {
 int ERR_load_OBJ_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_OBJ_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(OBJ_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(OBJ_str_reasons[0].error) == NULL)

         ERR_load_strings_const(OBJ_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(OBJ_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index fd479bcd9f0236e89c0ce17fbab376e788db6453..6e2152b3b2e225e3120c9cb46e6431967c803f6c 100644 (file)
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -65,7 +65,7 @@ static const ERR_STRING_DATA OCSP_str_reasons[] = {
 int ERR_load_OCSP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_OCSP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(OCSP_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(OCSP_str_reasons[0].error) == NULL)

         ERR_load_strings_const(OCSP_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(OCSP_str_reasons);
 #endif
     return 1;

diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
index a4743d10bd25088768dde81196c17bbe6517b716..014aade18585ab4752cfacedc1c51f0c8c2f20ae 100644 (file)
--- a/crypto/pem/pem_err.c
+++ b/crypto/pem/pem_err.c
@@ -60,7 +60,7 @@ static const ERR_STRING_DATA PEM_str_reasons[] = {
 int ERR_load_PEM_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_PEM_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(PEM_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(PEM_str_reasons[0].error) == NULL)

         ERR_load_strings_const(PEM_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(PEM_str_reasons);
 #endif
     return 1;

diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index c9fd1d7fe94c920d61c681da6634f99730ec468f..c3ad2bf7086f7737fb7c0b9a942f392dce8b1750 100644 (file)
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -56,7 +56,7 @@ static const ERR_STRING_DATA PKCS12_str_reasons[] = {
 int ERR_load_PKCS12_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_PKCS12_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(PKCS12_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(PKCS12_str_reasons[0].error) == NULL)

         ERR_load_strings_const(PKCS12_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(PKCS12_str_reasons);
 #endif
     return 1;

diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index 24201247d46504904a3d32c0e4047a534d5868a3..f7b87d552a616c8fd5ef0859f2b9864f867c7d41 100644 (file)
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -90,7 +90,7 @@ static const ERR_STRING_DATA PKCS7_str_reasons[] = {
 int ERR_load_PKCS7_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_PKCS7_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(PKCS7_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(PKCS7_str_reasons[0].error) == NULL)

         ERR_load_strings_const(PKCS7_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(PKCS7_str_reasons);
 #endif
     return 1;

diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index 49dc525273718b85681aeca2c9e8098fe0c45b91..477dedfd004a3dfb643082171737239b920d963f 100644 (file)
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -39,7 +39,7 @@ static const ERR_STRING_DATA PROP_str_reasons[] = {
 int ERR_load_PROP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_PROP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(PROP_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(PROP_str_reasons[0].error) == NULL)

         ERR_load_strings_const(PROP_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(PROP_str_reasons);
 #endif
     return 1;

diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index fa6be1ea80afdfd685ac7c515e1a1f607b7e3966..53d329380a0897a11c35e91fb107b9e65af42c95 100644 (file)
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -89,7 +89,7 @@ static const ERR_STRING_DATA RAND_str_reasons[] = {
 int ERR_load_RAND_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_RAND_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(RAND_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(RAND_str_reasons[0].error) == NULL)

         ERR_load_strings_const(RAND_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(RAND_str_reasons);
 #endif
     return 1;

diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 59230730562eee5b967bfb74c56513d80a56ffe4..692b1a1bd3069127e077eee0ca0079e2085d3222 100644 (file)
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -155,7 +155,7 @@ static const ERR_STRING_DATA RSA_str_reasons[] = {
 int ERR_load_RSA_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_RSA_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(RSA_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(RSA_str_reasons[0].error) == NULL)

         ERR_load_strings_const(RSA_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(RSA_str_reasons);
 #endif
     return 1;

diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index 24ecdf53801b40762d492aa28f4023925b554208..d8e11790565c7c521cb1e5bae66aafbf3b822c1f 100644 (file)
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -36,7 +36,7 @@ static const ERR_STRING_DATA SM2_str_reasons[] = {
 int ERR_load_SM2_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_SM2_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(SM2_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(SM2_str_reasons[0].error) == NULL)

         ERR_load_strings_const(SM2_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(SM2_str_reasons);
 #endif
     return 1;

diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c
index 417aa49ba60f358b3eff86cd099e7bf31d608342..aa8ab4f9b00d880930690b3aa7669fbca3dd53a6 100644 (file)
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -62,7 +62,7 @@ static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = {
 int ERR_load_OSSL_STORE_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_OSSL_STORE_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(OSSL_STORE_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(OSSL_STORE_str_reasons[0].error) == NULL)

         ERR_load_strings_const(OSSL_STORE_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(OSSL_STORE_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c
index b0203153a6c3e820fd8e5eef40da5eceb673b1dc..e87c492686c6c79a80649fd96b2272d22c2ca515 100644 (file)
--- a/crypto/ts/ts_err.c
+++ b/crypto/ts/ts_err.c
@@ -78,7 +78,7 @@ static const ERR_STRING_DATA TS_str_reasons[] = {
 int ERR_load_TS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_TS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(TS_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(TS_str_reasons[0].error) == NULL)

         ERR_load_strings_const(TS_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(TS_str_reasons);
 #endif
     return 1;

diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
index 7d6352b25baa85fadf386c7f5e5f273350906bec..2b564f71beb9e52019a243bab1b3246235df183f 100644 (file)
--- a/crypto/ui/ui_err.c
+++ b/crypto/ui/ui_err.c
@@ -39,7 +39,7 @@ static const ERR_STRING_DATA UI_str_reasons[] = {
 int ERR_load_UI_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_UI_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(UI_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(UI_str_reasons[0].error) == NULL)

         ERR_load_strings_const(UI_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(UI_str_reasons);
 #endif
     return 1;

diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c
index c02e1d2ef58b611dbb885d5be87b2d1e25466b39..cbda3f2cf8e0860ba42ea3ef99b1bfbebe024570 100644 (file)
--- a/crypto/x509/v3err.c
+++ b/crypto/x509/v3err.c
@@ -134,7 +134,7 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
 int ERR_load_X509V3_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_X509V3_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(X509V3_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(X509V3_str_reasons[0].error) == NULL)

         ERR_load_strings_const(X509V3_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(X509V3_str_reasons);
 #endif
     return 1;

diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index ff6d273310ea06a0285eca0befe85a98d4e441b5..1b01fd01316ecba4421c0b98d673a960cda3a293 100644 (file)
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -77,7 +77,7 @@ static const ERR_STRING_DATA X509_str_reasons[] = {
 int ERR_load_X509_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_X509_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(X509_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(X509_str_reasons[0].error) == NULL)

         ERR_load_strings_const(X509_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(X509_str_reasons);
 #endif
     return 1;

diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index 51f69e7919916fa3129fbb6ed39df3e3daec8705..da092fb02f422791db62fec078e793182f3bcbbd 100644 (file)
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -142,8 +142,8 @@ int ERR_load_RSA_strings(void);
 # define RSA_R_KEY_PRIME_NUM_INVALID                      165
 # define RSA_R_KEY_SIZE_TOO_SMALL                         120
 # define RSA_R_LAST_OCTET_INVALID                         134
 # define RSA_R_KEY_PRIME_NUM_INVALID                      165
 # define RSA_R_KEY_SIZE_TOO_SMALL                         120
 # define RSA_R_LAST_OCTET_INVALID                         134

-# define RSA_R_MISSING_PRIVATE_KEY                        179

 # define RSA_R_MGF1_DIGEST_NOT_ALLOWED                    152
 # define RSA_R_MGF1_DIGEST_NOT_ALLOWED                    152

+# define RSA_R_MISSING_PRIVATE_KEY                        179

 # define RSA_R_MODULUS_TOO_LARGE                          105
 # define RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R            168
 # define RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D             169
 # define RSA_R_MODULUS_TOO_LARGE                          105
 # define RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R            168
 # define RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D             169

diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index b9895593b97f571fb5af3b6c77274687e4867f0e..f9524a7f62eab1152e386c59ad0d17ddbfd10609 100644 (file)
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -91,7 +91,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
 int ERR_load_PROV_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_PROV_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(PROV_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(PROV_str_reasons[0].error) == NULL)

         ERR_load_strings_const(PROV_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(PROV_str_reasons);
 #endif
     return 1;

diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index ef9b95a0c9a48979a126c61ca5f536907bc1b081..fc819488154e96dc145ddc80015a64615e24ae84 100644 (file)
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -552,7 +552,7 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
 int ERR_load_SSL_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_SSL_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(SSL_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(SSL_str_reasons[0].error) == NULL)

         ERR_load_strings_const(SSL_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(SSL_str_reasons);
 #endif
     return 1;

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7fd34d277f4a68cdf49e6b84c1f113497f5c1725..c2888890cd30517424e4c413e10fb0c6aaa50efc 100755 (executable)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -607,7 +607,7 @@ EOF
 int ERR_load_${lib}_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
 int ERR_load_${lib}_strings(void)
 {
 #ifndef OPENSSL_NO_ERR

-    if (ERR_func_error_string(${lib}_str_reasons[0].error) == NULL)
+    if (ERR_reason_error_string(${lib}_str_reasons[0].error) == NULL)

         ERR_load_strings_const(${lib}_str_reasons);
 #endif
     return 1;
         ERR_load_strings_const(${lib}_str_reasons);
 #endif
     return 1;