err: rename err_load_xxx_strings_int functions

The new names are ossl_err_load_xxx_strings.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15446)

diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index af706e638eb6d08a8b61a9887ae9281696ef8659..a7b32e3a6e1a8af48bf0c535823b2f9b8eb68225 100644 (file)
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -202,7 +202,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
 
 #endif
 
-int err_load_ASN1_strings_int(void)
+int ossl_err_load_ASN1_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(ASN1_str_reasons[0].error) == NULL)

diff --git a/crypto/async/async_err.c b/crypto/async/async_err.c
index 285a0f22905d94896786d47e6163689e1c0f48ef..925d1eb5342c3518c64ec0a7498bc9ee6ddfbce2 100644 (file)
--- a/crypto/async/async_err.c
+++ b/crypto/async/async_err.c
@@ -27,7 +27,7 @@ static const ERR_STRING_DATA ASYNC_str_reasons[] = {
 
 #endif
 
-int err_load_ASYNC_strings_int(void)
+int ossl_err_load_ASYNC_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(ASYNC_str_reasons[0].error) == NULL)

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index d70bb084362bf32ca80ac889f724ff798d00b89b..7a36c61148a7fc12f891f8f751ca0c2c2811040e 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[] = {
 
 #endif
 
-int err_load_BIO_strings_int(void)
+int ossl_err_load_BIO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(BIO_str_reasons[0].error) == NULL)

diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index e4ac23e1b6d123398506802f51379a1f65f96039..6b25d1b503a8cb0d4ae0f355cb09a63a02b62b16 100644 (file)
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -45,7 +45,7 @@ static const ERR_STRING_DATA BN_str_reasons[] = {
 
 #endif
 
-int err_load_BN_strings_int(void)
+int ossl_err_load_BN_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(BN_str_reasons[0].error) == NULL)

diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 7eee54f3218ad9a452387187f8da1bb6b0145dfc..ffe6f7b854f282e27c640ab5e073ebbd08d78fba 100644 (file)
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -20,7 +20,7 @@ static const ERR_STRING_DATA BUF_str_reasons[] = {
 
 #endif
 
-int err_load_BUF_strings_int(void)
+int ossl_err_load_BUF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(BUF_str_reasons[0].error) == NULL)

diff --git a/crypto/cmp/cmp_err.c b/crypto/cmp/cmp_err.c
index 93aed38f9a4c2a75b8c4080fbfe12ffade1c323c..09acdee98676be7970fd3fab09d37f306e778c02 100644 (file)
--- a/crypto/cmp/cmp_err.c
+++ b/crypto/cmp/cmp_err.c
@@ -160,7 +160,7 @@ static const ERR_STRING_DATA CMP_str_reasons[] = {
 
 # endif
 
-int err_load_CMP_strings_int(void)
+int ossl_err_load_CMP_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)

diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index 33186a5ca9134058d3e4fecf650a8543041cb326..1fba9d8502494dc80719be2931cf783f9e197641 100644 (file)
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -163,7 +163,7 @@ static const ERR_STRING_DATA CMS_str_reasons[] = {
 
 # endif
 
-int err_load_CMS_strings_int(void)
+int ossl_err_load_CMS_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)

diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index 972e75cdaf0e0a9ac0192e8365e32d0f00edd767..c0bfeb865bdd33dfaa789d1c35ed2d462a5bef27 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[] = {
 
 # endif
 
-int err_load_COMP_strings_int(void)
+int ossl_err_load_COMP_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)

diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index a06f55b104d5389bb95f662159ab579d656d57a6..68ee90b97055e77a2f7f2b2cdf4999703170c5b6 100644 (file)
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -62,7 +62,7 @@ static const ERR_STRING_DATA CONF_str_reasons[] = {
 
 #endif
 
-int err_load_CONF_strings_int(void)
+int ossl_err_load_CONF_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CONF_str_reasons[0].error) == NULL)

diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index a56cb2c8040ea1258b5a19be3065cb598d677228..79c1a90595723da7124d3f441e4b8c1dd8b9f906 100644 (file)
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -58,7 +58,7 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
 
 #endif
 
-int err_load_CRYPTO_strings_int(void)
+int ossl_err_load_CRYPTO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CRYPTO_str_reasons[0].error) == NULL)

diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index bc7e8558f95bd50342dbb01bebb1218c1a73ffab..8cb3682c440e47296b676f44100da494e80560b8 100644 (file)
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -61,7 +61,7 @@ static const ERR_STRING_DATA CRMF_str_reasons[] = {
 
 # endif
 
-int err_load_CRMF_strings_int(void)
+int ossl_err_load_CRMF_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CRMF_str_reasons[0].error) == NULL)

diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index d067b713c1a13e02d7313ce35dccddf03eca3a75..810b3f507060e965dd33e3eb360f10d8b40a4541 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[] = {
 
 # endif
 
-int err_load_CT_strings_int(void)
+int ossl_err_load_CT_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CT_str_reasons[0].error) == NULL)

diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index 3652e89b3d4ebb3a1e1c70a3d4c3497c39e853a3..4152397426cc939ca7214fc4db808835a7dcdb1c 100644 (file)
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -62,7 +62,7 @@ static const ERR_STRING_DATA DH_str_reasons[] = {
 
 # endif
 
-int err_load_DH_strings_int(void)
+int ossl_err_load_DH_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(DH_str_reasons[0].error) == NULL)

diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 888c043d89da036b41d3e25215dfe5926edbc605..5685d5e83eb32c3626b6ee4defae389bcdcf9555 100644 (file)
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -41,7 +41,7 @@ static const ERR_STRING_DATA DSA_str_reasons[] = {
 
 # endif
 
-int err_load_DSA_strings_int(void)
+int ossl_err_load_DSA_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(DSA_str_reasons[0].error) == NULL)

diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index c018a16464e898f74558162ea2547aa73ed68f8c..f3f5002b778645d0cd269ec1ba2602b58d912d8e 100644 (file)
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -46,7 +46,7 @@ static const ERR_STRING_DATA DSO_str_reasons[] = {
 
 #endif
 
-int err_load_DSO_strings_int(void)
+int ossl_err_load_DSO_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(DSO_str_reasons[0].error) == NULL)

diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 108df5695b39a82cb4307eb542b4dc97a894cbdb..9e21968499ff239a128f47ce0a2c123268704fd2 100644 (file)
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -119,7 +119,7 @@ static const ERR_STRING_DATA EC_str_reasons[] = {
 
 # endif
 
-int err_load_EC_strings_int(void)
+int ossl_err_load_EC_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(EC_str_reasons[0].error) == NULL)

diff --git a/crypto/encode_decode/decoder_err.c b/crypto/encode_decode/decoder_err.c
index c948d826980b1f7adb8e198f2d48a8b3441482a7..88324a1d50788db2bd8bd0aac02c9ede9731a702 100644 (file)
--- a/crypto/encode_decode/decoder_err.c
+++ b/crypto/encode_decode/decoder_err.c
@@ -26,7 +26,7 @@ static const ERR_STRING_DATA OSSL_DECODER_str_reasons[] = {
 
 #endif
 
-int err_load_OSSL_DECODER_strings_int(void)
+int ossl_err_load_OSSL_DECODER_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OSSL_DECODER_str_reasons[0].error) == NULL)

diff --git a/crypto/encode_decode/encoder_err.c b/crypto/encode_decode/encoder_err.c
index 0b5028769d4290987a8db049f7b4fea4c4c09e63..7f5f2b3a9a7db2b2dbe877d687e22cae1211b705 100644 (file)
--- a/crypto/encode_decode/encoder_err.c
+++ b/crypto/encode_decode/encoder_err.c
@@ -26,7 +26,7 @@ static const ERR_STRING_DATA OSSL_ENCODER_str_reasons[] = {
 
 #endif
 
-int err_load_OSSL_ENCODER_strings_int(void)
+int ossl_err_load_OSSL_ENCODER_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OSSL_ENCODER_str_reasons[0].error) == NULL)

diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index 1cea06be08cebad0612c1618009125ebd936c5ce..917ecb5ae493b2475d9f7c114a5672cce5f39aab 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[] = {
 
 # endif
 
-int err_load_ENGINE_strings_int(void)
+int ossl_err_load_ENGINE_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(ENGINE_str_reasons[0].error) == NULL)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 046bfcfe16395da865c7e68be075fc6a1f07d420..c77c1920a20ad37ec6d078485f36c68711511e00 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -248,7 +248,7 @@ static int err_load_strings(const ERR_STRING_DATA *str)
     return 1;
 }
 
-int err_load_ERR_strings_int(void)
+int ossl_err_load_ERR_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (!RUN_ONCE(&err_string_init, do_err_strings_init))
@@ -262,7 +262,7 @@ int err_load_ERR_strings_int(void)
 
 int ERR_load_strings(int lib, ERR_STRING_DATA *str)
 {
-    if (err_load_ERR_strings_int() == 0)
+    if (ossl_err_load_ERR_strings() == 0)
         return 0;
 
     err_patch(lib, str);
@@ -272,7 +272,7 @@ int ERR_load_strings(int lib, ERR_STRING_DATA *str)
 
 int ERR_load_strings_const(const ERR_STRING_DATA *str)
 {
-    if (err_load_ERR_strings_int() == 0)
+    if (ossl_err_load_ERR_strings() == 0)
         return 0;
     err_load_strings(str);
     return 1;

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index d5b3b5dbc676aec70f347bc957dc01ac1bff50cd..55aa2b8dbd56855d6316756383ebbd7550519931 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -45,66 +45,66 @@
 #include "internal/propertyerr.h"
 #include "prov/proverr.h"
 
-int err_load_crypto_strings_int(void)
+int ossl_err_load_crypto_strings(void)
 {
     if (0
 #ifndef OPENSSL_NO_ERR
-        || err_load_ERR_strings_int() == 0 /* include error strings for SYSerr */
-        || err_load_BN_strings_int() == 0
-        || err_load_RSA_strings_int() == 0
+        || ossl_err_load_ERR_strings() == 0 /* include error strings for SYSerr */
+        || ossl_err_load_BN_strings() == 0
+        || ossl_err_load_RSA_strings() == 0
 # ifndef OPENSSL_NO_DH
-        || err_load_DH_strings_int() == 0
+        || ossl_err_load_DH_strings() == 0
 # endif
-        || err_load_EVP_strings_int() == 0
-        || err_load_BUF_strings_int() == 0
-        || err_load_OBJ_strings_int() == 0
-        || err_load_PEM_strings_int() == 0
+        || ossl_err_load_EVP_strings() == 0
+        || ossl_err_load_BUF_strings() == 0
+        || ossl_err_load_OBJ_strings() == 0
+        || ossl_err_load_PEM_strings() == 0
 # ifndef OPENSSL_NO_DSA
-        || err_load_DSA_strings_int() == 0
+        || ossl_err_load_DSA_strings() == 0
 # endif
-        || err_load_X509_strings_int() == 0
-        || err_load_ASN1_strings_int() == 0
-        || err_load_CONF_strings_int() == 0
-        || err_load_CRYPTO_strings_int() == 0
+        || ossl_err_load_X509_strings() == 0
+        || ossl_err_load_ASN1_strings() == 0
+        || ossl_err_load_CONF_strings() == 0
+        || ossl_err_load_CRYPTO_strings() == 0
 # ifndef OPENSSL_NO_COMP
-        || err_load_COMP_strings_int() == 0
+        || ossl_err_load_COMP_strings() == 0
 # endif
 # ifndef OPENSSL_NO_EC
-        || err_load_EC_strings_int() == 0
+        || ossl_err_load_EC_strings() == 0
 # endif
-        /* skip err_load_SSL_strings_int() because it is not in this library */
-        || err_load_BIO_strings_int() == 0
-        || err_load_PKCS7_strings_int() == 0
-        || err_load_X509V3_strings_int() == 0
-        || err_load_PKCS12_strings_int() == 0
-        || err_load_RAND_strings_int() == 0
-        || err_load_DSO_strings_int() == 0
+        /* skip ossl_err_load_SSL_strings() because it is not in this library */
+        || ossl_err_load_BIO_strings() == 0
+        || ossl_err_load_PKCS7_strings() == 0
+        || ossl_err_load_X509V3_strings() == 0
+        || ossl_err_load_PKCS12_strings() == 0
+        || ossl_err_load_RAND_strings() == 0
+        || ossl_err_load_DSO_strings() == 0
 # ifndef OPENSSL_NO_TS
-        || err_load_TS_strings_int() == 0
+        || ossl_err_load_TS_strings() == 0
 # endif
 # ifndef OPENSSL_NO_ENGINE
-        || err_load_ENGINE_strings_int() == 0
+        || ossl_err_load_ENGINE_strings() == 0
 # endif
-        || err_load_HTTP_strings_int() == 0
+        || ossl_err_load_HTTP_strings() == 0
 # ifndef OPENSSL_NO_OCSP
-        || err_load_OCSP_strings_int() == 0
+        || ossl_err_load_OCSP_strings() == 0
 # endif
-        || err_load_UI_strings_int() == 0
+        || ossl_err_load_UI_strings() == 0
 # ifndef OPENSSL_NO_CMS
-        || err_load_CMS_strings_int() == 0
+        || ossl_err_load_CMS_strings() == 0
 # endif
 # ifndef OPENSSL_NO_CRMF
-        || err_load_CRMF_strings_int() == 0
-        || err_load_CMP_strings_int() == 0
+        || ossl_err_load_CRMF_strings() == 0
+        || ossl_err_load_CMP_strings() == 0
 # endif
 # ifndef OPENSSL_NO_CT
-        || err_load_CT_strings_int() == 0
+        || ossl_err_load_CT_strings() == 0
 # endif
-        || err_load_ESS_strings_int() == 0
-        || err_load_ASYNC_strings_int() == 0
-        || err_load_OSSL_STORE_strings_int() == 0
-        || err_load_PROP_strings_int() == 0
-        || err_load_PROV_strings_int() == 0
+        || ossl_err_load_ESS_strings() == 0
+        || ossl_err_load_ASYNC_strings() == 0
+        || ossl_err_load_OSSL_STORE_strings() == 0
+        || ossl_err_load_PROP_strings() == 0
+        || ossl_err_load_PROV_strings() == 0
 #endif
         )
         return 0;

diff --git a/crypto/err/err_all_legacy.c b/crypto/err/err_all_legacy.c
index e6cb882b3f5f256c6571c245a25f6f5ca467f16f..970fd5c50007c188c68722f40791e4226733a644 100644 (file)
--- a/crypto/err/err_all_legacy.c
+++ b/crypto/err/err_all_legacy.c
@@ -44,16 +44,16 @@
 # include "crypto/x509v3err.h"
 
 # ifdef OPENSSL_NO_ERR
-#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)         \
+#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)        \
     int ERR_load_##lib##_strings(void)          \
     {                                           \
         return 1;                               \
     }
 # else
-#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)         \
+#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)        \
     int ERR_load_##lib##_strings(void)          \
     {                                           \
-        return err_load_##lib##_strings_int();  \
+        return ossl_err_load_##lib##_strings(); \
     }
 # endif
 

diff --git a/crypto/ess/ess_err.c b/crypto/ess/ess_err.c
index 2ece3443bd67109955ef02a5a07dd81340d6ec3d..eb76dfe7cc8f48f29fdaa0d6a9b98c0e641724cd 100644 (file)
--- a/crypto/ess/ess_err.c
+++ b/crypto/ess/ess_err.c
@@ -38,7 +38,7 @@ static const ERR_STRING_DATA ESS_str_reasons[] = {
 
 #endif
 
-int err_load_ESS_strings_int(void)
+int ossl_err_load_ESS_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(ESS_str_reasons[0].error) == NULL)

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index cd36b09fb5553ee526078027bcec2b5f3e1312e1..c0d92321032fa9ec3724d450cab3331a656f1001 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -198,7 +198,7 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
 
 #endif
 
-int err_load_EVP_strings_int(void)
+int ossl_err_load_EVP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(EVP_str_reasons[0].error) == NULL)

diff --git a/crypto/http/http_err.c b/crypto/http/http_err.c
index 4ac639197e5b0a13df95a1ab1317338a98989d7d..b2f2cfb1879ebf26308e337e2e5757fe150ed6c3 100644 (file)
--- a/crypto/http/http_err.c
+++ b/crypto/http/http_err.c
@@ -71,7 +71,7 @@ static const ERR_STRING_DATA HTTP_str_reasons[] = {
 
 #endif
 
-int err_load_HTTP_strings_int(void)
+int ossl_err_load_HTTP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(HTTP_str_reasons[0].error) == NULL)

diff --git a/crypto/init.c b/crypto/init.c
index 3170c60ac2d601305ebbfaa6d72c3bc120051ab8..49d817c089198fbcdb4d709651cb9374d0ff13eb 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -174,8 +174,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings)
      * pulling in all the error strings during static linking
      */
 #if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT)
-    OSSL_TRACE(INIT, "err_load_crypto_strings_int()\n");
-    ret = err_load_crypto_strings_int();
+    OSSL_TRACE(INIT, "ossl_err_load_crypto_strings()\n");
+    ret = ossl_err_load_crypto_strings();
     load_crypto_strings_inited = 1;
 #endif
     return ret;

diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index ebc46cb44c7fa3853c31d68c81025a2ef09e787a..2c487433bf6cc47a3b568a122cd230e858724853 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[] = {
 
 #endif
 
-int err_load_OBJ_strings_int(void)
+int ossl_err_load_OBJ_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OBJ_str_reasons[0].error) == NULL)

diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index fd0643c7158c77e59a7c6217f0c1f1d6761e3602..f0d4d2601dafd936bb935b9d488cc11683630c3f 100644 (file)
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -62,7 +62,7 @@ static const ERR_STRING_DATA OCSP_str_reasons[] = {
 
 # endif
 
-int err_load_OCSP_strings_int(void)
+int ossl_err_load_OCSP_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OCSP_str_reasons[0].error) == NULL)

diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
index 50f9c2b925139c7f5fe749da196459323c3a15f1..5fa9fc09bec7c9228f91c3b09f6dead2d69ae150 100644 (file)
--- a/crypto/pem/pem_err.c
+++ b/crypto/pem/pem_err.c
@@ -64,7 +64,7 @@ static const ERR_STRING_DATA PEM_str_reasons[] = {
 
 #endif
 
-int err_load_PEM_strings_int(void)
+int ossl_err_load_PEM_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(PEM_str_reasons[0].error) == NULL)

diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index 9899e272c116c93d9d61e91e8a5518e99c847289..bcd950626d0c6cffe9c26b33660be8c08c68bbc0 100644 (file)
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -51,7 +51,7 @@ static const ERR_STRING_DATA PKCS12_str_reasons[] = {
 
 #endif
 
-int err_load_PKCS12_strings_int(void)
+int ossl_err_load_PKCS12_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(PKCS12_str_reasons[0].error) == NULL)

diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index c2c40b48af09a7dc4fa951642b3faaec9a8f695f..e30df047a4fa867089c48cf763d274ec5634ee23 100644 (file)
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -88,7 +88,7 @@ static const ERR_STRING_DATA PKCS7_str_reasons[] = {
 
 #endif
 
-int err_load_PKCS7_strings_int(void)
+int ossl_err_load_PKCS7_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(PKCS7_str_reasons[0].error) == NULL)

diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index a7c722feb5511746691d6e35c5bc89bc8bcb7e3a..d70e458c4726a0ad0ceeceab68c2c107eefdc7ca 100644 (file)
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -36,7 +36,7 @@ static const ERR_STRING_DATA PROP_str_reasons[] = {
 
 #endif
 
-int err_load_PROP_strings_int(void)
+int ossl_err_load_PROP_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(PROP_str_reasons[0].error) == NULL)

diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index 32c4c6cbcbd224546fe87266c743c28e9b881e21..694b120b78143b8bd640613f67b404b5301989b5 100644 (file)
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -99,7 +99,7 @@ static const ERR_STRING_DATA RAND_str_reasons[] = {
 
 #endif
 
-int err_load_RAND_strings_int(void)
+int ossl_err_load_RAND_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(RAND_str_reasons[0].error) == NULL)

diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 8008092b13f56d776ef53bc19d68b3b09c985318..1e3c81ff5e1a761e7f67a101271bbb3beeea1928 100644 (file)
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -153,7 +153,7 @@ static const ERR_STRING_DATA RSA_str_reasons[] = {
 
 #endif
 
-int err_load_RSA_strings_int(void)
+int ossl_err_load_RSA_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(RSA_str_reasons[0].error) == NULL)

diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index f548aba539accb459ffff10efd7fc0b6af269ae6..d420d4e597d19407cd159b47dfa0c0dfd3429e4d 100644 (file)
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -37,7 +37,7 @@ static const ERR_STRING_DATA SM2_str_reasons[] = {
 
 # endif
 
-int err_load_SM2_strings_int(void)
+int ossl_err_load_SM2_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(SM2_str_reasons[0].error) == NULL)

diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c
index 8aa34446932afb95ce99a7b3c65d44751796ed97..ec62b358c589b697f646055c5ab19ce84eab5dce 100644 (file)
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -65,7 +65,7 @@ static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = {
 
 #endif
 
-int err_load_OSSL_STORE_strings_int(void)
+int ossl_err_load_OSSL_STORE_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OSSL_STORE_str_reasons[0].error) == NULL)

diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c
index 3a682c694f44a277d7f9b9c018c6b0f7066019ec..9027ef1939150ec8d3b62a0d05b5a868ca9a2ec8 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[] = {
 
 # endif
 
-int err_load_TS_strings_int(void)
+int ossl_err_load_TS_strings(void)
 {
 # ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(TS_str_reasons[0].error) == NULL)

diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
index 83ea371997d2b2dca05fc79d7854cf83564058be..6ba4857a3b966f9a920c3dadbcc1aa8e556a5911 100644 (file)
--- a/crypto/ui/ui_err.c
+++ b/crypto/ui/ui_err.c
@@ -37,7 +37,7 @@ static const ERR_STRING_DATA UI_str_reasons[] = {
 
 #endif
 
-int err_load_UI_strings_int(void)
+int ossl_err_load_UI_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(UI_str_reasons[0].error) == NULL)

diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c
index 18eb9917cb98db0d759c41fce692711cdc3617dd..985d7be7dc2cd91869cc7e5c3bc5c64e3ff7d984 100644 (file)
--- a/crypto/x509/v3err.c
+++ b/crypto/x509/v3err.c
@@ -137,7 +137,7 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
 
 #endif
 
-int err_load_X509V3_strings_int(void)
+int ossl_err_load_X509V3_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(X509V3_str_reasons[0].error) == NULL)

diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 76d57e869cb8f4048abc35636e5ac603a5a79a20..c2f3ae0f5f60b85a8bd190326d8a531d58b06491 100644 (file)
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -84,7 +84,7 @@ static const ERR_STRING_DATA X509_str_reasons[] = {
 
 #endif
 
-int err_load_X509_strings_int(void)
+int ossl_err_load_X509_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(X509_str_reasons[0].error) == NULL)

diff --git a/include/crypto/asn1err.h b/include/crypto/asn1err.h
index 9b623555f8382e57caa0ef1bfa1209fb31e3b972..6441386bbc4a7806826deace66a0496dcfb10f8a 100644 (file)
--- a/include/crypto/asn1err.h
+++ b/include/crypto/asn1err.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_ASN1_strings_int(void);
+int ossl_err_load_ASN1_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/asyncerr.h b/include/crypto/asyncerr.h
index f597e1b41ec74e46d1c15567d1ce862da3fc8bc7..b1f91370658c9613422a0c6bb6979cb4927d47f6 100644 (file)
--- a/include/crypto/asyncerr.h
+++ b/include/crypto/asyncerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_ASYNC_strings_int(void);
+int ossl_err_load_ASYNC_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/bioerr.h b/include/crypto/bioerr.h
index 1a2398f5dad57b72a201fadf050f03865ffbe5c7..ba47066536408515e32e43dc9c35b8a077831350 100644 (file)
--- a/include/crypto/bioerr.h
+++ b/include/crypto/bioerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_BIO_strings_int(void);
+int ossl_err_load_BIO_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/bnerr.h b/include/crypto/bnerr.h
index ee490aee96f88f5338b17dc140ff8a2a28382965..e2e7f45eb4dfc5d49a2092e93d6a8cb2e5754364 100644 (file)
--- a/include/crypto/bnerr.h
+++ b/include/crypto/bnerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_BN_strings_int(void);
+int ossl_err_load_BN_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/buffererr.h b/include/crypto/buffererr.h
index 87e13a89b31238c5e9d2a5dabd1b0d3ded1304ad..0da96695f0f9dd7134ae49a3895072118e5b4f8f 100644 (file)
--- a/include/crypto/buffererr.h
+++ b/include/crypto/buffererr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_BUF_strings_int(void);
+int ossl_err_load_BUF_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/cmperr.h b/include/crypto/cmperr.h
index 5db81abf26f76e749dcd317b61b1756154dc7f1b..894d3393db71ebf5b9570679537795be7f7f842b 100644 (file)
--- a/include/crypto/cmperr.h
+++ b/include/crypto/cmperr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_CMP
 
-int err_load_CMP_strings_int(void);
+int ossl_err_load_CMP_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/cmserr.h b/include/crypto/cmserr.h
index 86c9eb0a002e921ca66ddf3da3a1ebf2b41eefe0..39b2c7ca7c16e166e4121ed342841e212ff5d9af 100644 (file)
--- a/include/crypto/cmserr.h
+++ b/include/crypto/cmserr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_CMS
 
-int err_load_CMS_strings_int(void);
+int ossl_err_load_CMS_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/comperr.h b/include/crypto/comperr.h
index e3dbffed2618991830b77455b421af94a524e88c..9f157623c7dbbbdc9993292eb23357e1eb800dbb 100644 (file)
--- a/include/crypto/comperr.h
+++ b/include/crypto/comperr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_COMP
 
-int err_load_COMP_strings_int(void);
+int ossl_err_load_COMP_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/conferr.h b/include/crypto/conferr.h
index 0e7a02a1e0786b6fedfd1f41cc93b0556da3af49..cb367e4f32a04d6a3c2d42fed9b939e283faca67 100644 (file)
--- a/include/crypto/conferr.h
+++ b/include/crypto/conferr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_CONF_strings_int(void);
+int ossl_err_load_CONF_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/crmferr.h b/include/crypto/crmferr.h
index 6c190a75a36c328ac252ba65aac8eab281e1b5e7..8eb98d69ce30d55bfbb03c9cc9a708a3a1e84e45 100644 (file)
--- a/include/crypto/crmferr.h
+++ b/include/crypto/crmferr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_CRMF
 
-int err_load_CRMF_strings_int(void);
+int ossl_err_load_CRMF_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/cryptoerr.h b/include/crypto/cryptoerr.h
index 419ca1aac10f3947a119d27909d0c704a00b68bb..9c0380b5acf64a818c7b990dcda080ba2c801ae6 100644 (file)
--- a/include/crypto/cryptoerr.h
+++ b/include/crypto/cryptoerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_CRYPTO_strings_int(void);
+int ossl_err_load_CRYPTO_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/cterr.h b/include/crypto/cterr.h
index f16f47692d29dfe28a672b5e5b6d8ee9f9f17b44..19bcaa054fe82938e868735fbfa6ea9e87be1656 100644 (file)
--- a/include/crypto/cterr.h
+++ b/include/crypto/cterr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_CT
 
-int err_load_CT_strings_int(void);
+int ossl_err_load_CT_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/decodererr.h b/include/crypto/decodererr.h
index edf826798ddf3b68e1dc13da0c718db4f54af4b9..d7badc43793c0f0ef947dd23ee0eb6b37bbf59be 100644 (file)
--- a/include/crypto/decodererr.h
+++ b/include/crypto/decodererr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_OSSL_DECODER_strings_int(void);
+int ossl_err_load_OSSL_DECODER_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/dherr.h b/include/crypto/dherr.h
index 351d7da01b1d96c08f355c58e509bdc78a61b2d4..bb24d131eb8873257fc1105904529b88108b6056 100644 (file)
--- a/include/crypto/dherr.h
+++ b/include/crypto/dherr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_DH
 
-int err_load_DH_strings_int(void);
+int ossl_err_load_DH_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/dsaerr.h b/include/crypto/dsaerr.h
index 2cb75bb1cb94822fded12f741d4b814eb8e663d5..ed4b4fec6ce44ad646fd98211f607b279a5d87e5 100644 (file)
--- a/include/crypto/dsaerr.h
+++ b/include/crypto/dsaerr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_DSA
 
-int err_load_DSA_strings_int(void);
+int ossl_err_load_DSA_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/ecerr.h b/include/crypto/ecerr.h
index 9110797b4b5d7ccb75c14f17d64b488231ba580c..e08a4dba975b65f48cb2f1309cc1de5411793fb0 100644 (file)
--- a/include/crypto/ecerr.h
+++ b/include/crypto/ecerr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_EC
 
-int err_load_EC_strings_int(void);
+int ossl_err_load_EC_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/encodererr.h b/include/crypto/encodererr.h
index 836094b3cb79732296c30d2a074ee238f28b6b56..ce5879d8b7a01b3ce0ad86a91f6472665cc2eebf 100644 (file)
--- a/include/crypto/encodererr.h
+++ b/include/crypto/encodererr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_OSSL_ENCODER_strings_int(void);
+int ossl_err_load_OSSL_ENCODER_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/engineerr.h b/include/crypto/engineerr.h
index 16780166c87053e70a942153f0d57ae7f3d725da..d7d148f3db2b99977c1dc45c3aef78ce92ada06f 100644 (file)
--- a/include/crypto/engineerr.h
+++ b/include/crypto/engineerr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_ENGINE
 
-int err_load_ENGINE_strings_int(void);
+int ossl_err_load_ENGINE_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/err.h b/include/crypto/err.h
index 711027609738429333a057c2021a0986f7c17ea0..15ec6fd0390a97f6f275a49669f9775988d608ce 100644 (file)
--- a/include/crypto/err.h
+++ b/include/crypto/err.h
@@ -11,8 +11,8 @@
 # define OSSL_CRYPTO_ERR_H
 # pragma once
 
-int err_load_ERR_strings_int(void);
-int err_load_crypto_strings_int(void);
+int ossl_err_load_ERR_strings(void);
+int ossl_err_load_crypto_strings(void);
 void err_cleanup(void);
 int err_shelve_state(void **);
 void err_unshelve_state(void *);

diff --git a/include/crypto/esserr.h b/include/crypto/esserr.h
index a87d4fabceae70e7dd2e5c6bd544f1106049755a..8df2df11ededbd40db9d4d46715a86e34c6ed2c3 100644 (file)
--- a/include/crypto/esserr.h
+++ b/include/crypto/esserr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_ESS_strings_int(void);
+int ossl_err_load_ESS_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/evperr.h b/include/crypto/evperr.h
index 9af2e903f3d6847cc0b05c81565f412e9e5a47e8..d90ba83f8b9f365573a3593d5daaff64c92dc260 100644 (file)
--- a/include/crypto/evperr.h
+++ b/include/crypto/evperr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_EVP_strings_int(void);
+int ossl_err_load_EVP_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/httperr.h b/include/crypto/httperr.h
index c68ca3b0c42b087628b293c7c32a989c7e7ade8d..969df17b832beb496a287120c3406ecb104b5638 100644 (file)
--- a/include/crypto/httperr.h
+++ b/include/crypto/httperr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_HTTP_strings_int(void);
+int ossl_err_load_HTTP_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/objectserr.h b/include/crypto/objectserr.h
index 98b3d74599806ce4bdc63067007605908a80c31d..a55c80c979a6647c8e42319072ab58da52521fc6 100644 (file)
--- a/include/crypto/objectserr.h
+++ b/include/crypto/objectserr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_OBJ_strings_int(void);
+int ossl_err_load_OBJ_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/ocsperr.h b/include/crypto/ocsperr.h
index 15a9ccb983a9bf20953b5fa1ee0e33f0f43b27b9..51eb347b840c1b3f9218225e113d21a8a51fffb5 100644 (file)
--- a/include/crypto/ocsperr.h
+++ b/include/crypto/ocsperr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_OCSP
 
-int err_load_OCSP_strings_int(void);
+int ossl_err_load_OCSP_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/pemerr.h b/include/crypto/pemerr.h
index 24c4d0c585175b8210a25c4007b726ddcf4e2d51..b255ff5c6488e6526648b04f471fc67a04864abc 100644 (file)
--- a/include/crypto/pemerr.h
+++ b/include/crypto/pemerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_PEM_strings_int(void);
+int ossl_err_load_PEM_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/pkcs12err.h b/include/crypto/pkcs12err.h
index e3bf35cf680d45df1288378aa3aa0ec0dfb1d43b..b258905ed83c7c8f28304f5831680a27093c4145 100644 (file)
--- a/include/crypto/pkcs12err.h
+++ b/include/crypto/pkcs12err.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_PKCS12_strings_int(void);
+int ossl_err_load_PKCS12_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/pkcs7err.h b/include/crypto/pkcs7err.h
index 4cbe074b3eede49b953b39e95f9a69de8855385e..39eb5b0494832fad6e3492efb03987517b00a613 100644 (file)
--- a/include/crypto/pkcs7err.h
+++ b/include/crypto/pkcs7err.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_PKCS7_strings_int(void);
+int ossl_err_load_PKCS7_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/randerr.h b/include/crypto/randerr.h
index ce2b4d517579041047830ab5247eb6f2ff083faa..ff11d21878d28a311033eba766a1bea8961631b1 100644 (file)
--- a/include/crypto/randerr.h
+++ b/include/crypto/randerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_RAND_strings_int(void);
+int ossl_err_load_RAND_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/rsaerr.h b/include/crypto/rsaerr.h
index 63435822d609c8f94bc8af00657fe87bca0e7d86..43541b7faf88fb88ed32d76cf422d7f9dbee7367 100644 (file)
--- a/include/crypto/rsaerr.h
+++ b/include/crypto/rsaerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_RSA_strings_int(void);
+int ossl_err_load_RSA_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h
index d24ff32a7e8479fd7911b6ddaf83fc7f73527634..706f4d69dec287955a8df162999f310d8f2fa614 100644 (file)
--- a/include/crypto/sm2err.h
+++ b/include/crypto/sm2err.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_SM2
 
-int err_load_SM2_strings_int(void);
+int ossl_err_load_SM2_strings(void);
 
 /*
  * SM2 reason codes.

diff --git a/include/crypto/storeerr.h b/include/crypto/storeerr.h
index ed4a21950983c89abaf9258dd0eb03bd57f4c667..c46d845f8e417cad83c3df40d10035be517de23d 100644 (file)
--- a/include/crypto/storeerr.h
+++ b/include/crypto/storeerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_OSSL_STORE_strings_int(void);
+int ossl_err_load_OSSL_STORE_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/tserr.h b/include/crypto/tserr.h
index 802430c412b76f908afcaccbf5213ae54a7a039b..43c76961507de18d7fdd6d3cdf24eb1d7379fc59 100644 (file)
--- a/include/crypto/tserr.h
+++ b/include/crypto/tserr.h
@@ -21,7 +21,7 @@ extern "C" {
 
 # ifndef OPENSSL_NO_TS
 
-int err_load_TS_strings_int(void);
+int ossl_err_load_TS_strings(void);
 # endif
 
 # ifdef  __cplusplus

diff --git a/include/crypto/uierr.h b/include/crypto/uierr.h
index 83a6df1a2696651679f9604c3fffb10782a7ac8a..07744f9c320cdee5de18b72a3a5e19943a459e58 100644 (file)
--- a/include/crypto/uierr.h
+++ b/include/crypto/uierr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_UI_strings_int(void);
+int ossl_err_load_UI_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/x509err.h b/include/crypto/x509err.h
index 9b267ed5f797d5504672f318716bd620b735c2c7..4c5f3d6c3e033179768dd00e14cecb5cdab3b1df 100644 (file)
--- a/include/crypto/x509err.h
+++ b/include/crypto/x509err.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_X509_strings_int(void);
+int ossl_err_load_X509_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/crypto/x509v3err.h b/include/crypto/x509v3err.h
index bf8143391223dcc2f14c54d1141472d8ebe6a543..653ca6c6317d1639287223d15b5f3e7f99ce5ac8 100644 (file)
--- a/include/crypto/x509v3err.h
+++ b/include/crypto/x509v3err.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_X509V3_strings_int(void);
+int ossl_err_load_X509V3_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index 43f83d9ad8b91e4abe9844e5021c7fcfc79ddc97..b1719e8377f406e0d58ce31479d5d38b06e2b013 100644 (file)
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_DSO_strings_int(void);
+int ossl_err_load_DSO_strings(void);
 
 /*
  * DSO reason codes.

diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h
index d73532ed6a556ae733e0d08da56dc3974abad5e3..fbee53f11e840e88422d903b784f2611aa3d572a 100644 (file)
--- a/include/internal/propertyerr.h
+++ b/include/internal/propertyerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_PROP_strings_int(void);
+int ossl_err_load_PROP_strings(void);
 
 /*
  * PROP reason codes.

diff --git a/providers/common/include/prov/proverr.h b/providers/common/include/prov/proverr.h
index d9744d06b844ffe6e167c67435fc06d402b7c3dd..5084af201e058019919bf7a07f43c703d00be12c 100644 (file)
--- a/providers/common/include/prov/proverr.h
+++ b/providers/common/include/prov/proverr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_PROV_strings_int(void);
+int ossl_err_load_PROV_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index eff523b579271efc9e1da13f4b489ec15c19a100..d08192e64bb4989006de283a753079e5d7a06355 100644 (file)
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -217,7 +217,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
 
 #endif
 
-int err_load_PROV_strings_int(void)
+int ossl_err_load_PROV_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(PROV_str_reasons[0].error) == NULL)

diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 595e9f5ed0a543b78eeef930e487745de2f6e03f..014eda06b177d1c9984b1db3f7e7f1b29c310e34 100644 (file)
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -559,7 +559,7 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
 
 #endif
 
-int err_load_SSL_strings_int(void)
+int ossl_err_load_SSL_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(SSL_str_reasons[0].error) == NULL)

diff --git a/ssl/ssl_err_legacy.c b/ssl/ssl_err_legacy.c
index d1f27c964e6a90ea8eac6e608b08efdcc82cebce..747e47afb424cf19b2c48eeb4a6566be8c25ff73 100644 (file)
--- a/ssl/ssl_err_legacy.c
+++ b/ssl/ssl_err_legacy.c
@@ -14,7 +14,7 @@
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int ERR_load_SSL_strings(void)
 {
-    return err_load_SSL_strings_int();
+    return ossl_err_load_SSL_strings();
 }
 #else
 NON_EMPTY_TRANSLATION_UNIT

diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 772dc2b474e99dcc59c4580b808e89813e4fe392..989a732a36ece6715a32134ea4a083ec0ea863c9 100644 (file)
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -54,8 +54,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings)
      * pulling in all the error strings during static linking
      */
 #if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT)
-    OSSL_TRACE(INIT, "ossl_init_load_ssl_strings: err_load_SSL_strings_int()\n");
-    err_load_SSL_strings_int();
+    OSSL_TRACE(INIT, "ossl_init_load_ssl_strings: ossl_err_load_SSL_strings()\n");
+    ossl_err_load_SSL_strings();
     ssl_strings_inited = 1;
 #endif
     return 1;

diff --git a/ssl/sslerr.h b/ssl/sslerr.h
index 3ad54e4dcc2a22dfa576193d7c7416e1b1a8a328..5c5b760e38214c5e4cce9064e145cc1442a2eaed 100644 (file)
--- a/ssl/sslerr.h
+++ b/ssl/sslerr.h
@@ -19,7 +19,7 @@
 extern "C" {
 # endif
 
-int err_load_SSL_strings_int(void);
+int ossl_err_load_SSL_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/util/mkerr.pl b/util/mkerr.pl
index e297797b6a88fc1efa0e4b78d649c06726791cf2..ab25b8fc96ae142cd60e2a3c582073ea487ae105 100755 (executable)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -358,7 +358,7 @@ EOF
             $indent = "  ";
         }
         print OUT <<"EOF";
-int err_load_${lib}_strings_int(void);
+int ossl_err_load_${lib}_strings(void);
 EOF
 
         # If this library doesn't have a public header file, we write all
@@ -581,7 +581,7 @@ EOF
         if ( $internal ) {
             print OUT <<"EOF";
 
-int err_load_${lib}_strings_int(void)
+int ossl_err_load_${lib}_strings(void)
 {
 #${indent}ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(${lib}_str_reasons[0].error) == NULL)