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 openssl#15446)
lccxx · May 26, 2021 · b93f6c2 · b93f6c2
1 parent 9080ed2
commit b93f6c2
Show file tree

Hide file tree

Showing 84 changed files with 128 additions and 128 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)