From: Pauli <pauli@openssl.org>
Date: Tue, 25 May 2021 02:04:22 +0000 (+1000)
Subject: err: rename err_load_xxx_strings_int functions
X-Git-Tag: openssl-3.0.0-beta1~382
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b93f6c2db94f736b497ff31a793c1e6766eaf209;p=thirdparty%2Fopenssl.git

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 af706e638eb..a7b32e3a6e1 100644
--- 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 285a0f22905..925d1eb5342 100644
--- 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 d70bb084362..7a36c61148a 100644
--- 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 e4ac23e1b6d..6b25d1b503a 100644
--- 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 7eee54f3218..ffe6f7b854f 100644
--- 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 93aed38f9a4..09acdee9867 100644
--- 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 33186a5ca91..1fba9d85024 100644
--- 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 972e75cdaf0..c0bfeb865bd 100644
--- 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 a06f55b104d..68ee90b9705 100644
--- 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 a56cb2c8040..79c1a905957 100644
--- 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 bc7e8558f95..8cb3682c440 100644
--- 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 d067b713c1a..810b3f50706 100644
--- 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 3652e89b3d4..4152397426c 100644
--- 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 888c043d89d..5685d5e83eb 100644
--- 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 c018a16464e..f3f5002b778 100644
--- 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 108df5695b3..9e21968499f 100644
--- 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 c948d826980..88324a1d507 100644
--- 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 0b5028769d4..7f5f2b3a9a7 100644
--- 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 1cea06be08c..917ecb5ae49 100644
--- 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 046bfcfe163..c77c1920a20 100644
--- 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 d5b3b5dbc67..55aa2b8dbd5 100644
--- 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 e6cb882b3f5..970fd5c5000 100644
--- 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 2ece3443bd6..eb76dfe7cc8 100644
--- 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 cd36b09fb55..c0d92321032 100644
--- 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 4ac639197e5..b2f2cfb1879 100644
--- 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 3170c60ac2d..49d817c0891 100644
--- 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 ebc46cb44c7..2c487433bf6 100644
--- 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 fd0643c7158..f0d4d2601da 100644
--- 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 50f9c2b9251..5fa9fc09bec 100644
--- 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 9899e272c11..bcd950626d0 100644
--- 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 c2c40b48af0..e30df047a4f 100644
--- 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 a7c722feb55..d70e458c472 100644
--- 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 32c4c6cbcbd..694b120b781 100644
--- 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 8008092b13f..1e3c81ff5e1 100644
--- 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 f548aba539a..d420d4e597d 100644
--- 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 8aa34446932..ec62b358c58 100644
--- 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 3a682c694f4..9027ef19391 100644
--- 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 83ea371997d..6ba4857a3b9 100644
--- 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 18eb9917cb9..985d7be7dc2 100644
--- 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 76d57e869cb..c2f3ae0f5f6 100644
--- 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 9b623555f83..6441386bbc4 100644
--- 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 f597e1b41ec..b1f91370658 100644
--- 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 1a2398f5dad..ba470665364 100644
--- 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 ee490aee96f..e2e7f45eb4d 100644
--- 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 87e13a89b31..0da96695f0f 100644
--- 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 5db81abf26f..894d3393db7 100644
--- 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 86c9eb0a002..39b2c7ca7c1 100644
--- 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 e3dbffed261..9f157623c7d 100644
--- 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 0e7a02a1e07..cb367e4f32a 100644
--- 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 6c190a75a36..8eb98d69ce3 100644
--- 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 419ca1aac10..9c0380b5acf 100644
--- 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 f16f47692d2..19bcaa054fe 100644
--- 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 edf826798dd..d7badc43793 100644
--- 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 351d7da01b1..bb24d131eb8 100644
--- 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 2cb75bb1cb9..ed4b4fec6ce 100644
--- 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 9110797b4b5..e08a4dba975 100644
--- 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 836094b3cb7..ce5879d8b7a 100644
--- 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 16780166c87..d7d148f3db2 100644
--- 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 71102760973..15ec6fd0390 100644
--- 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 a87d4fabcea..8df2df11ede 100644
--- 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 9af2e903f3d..d90ba83f8b9 100644
--- 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 c68ca3b0c42..969df17b832 100644
--- 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 98b3d745998..a55c80c979a 100644
--- 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 15a9ccb983a..51eb347b840 100644
--- 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 24c4d0c5851..b255ff5c648 100644
--- 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 e3bf35cf680..b258905ed83 100644
--- 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 4cbe074b3ee..39eb5b04948 100644
--- 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 ce2b4d51757..ff11d21878d 100644
--- 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 63435822d60..43541b7faf8 100644
--- 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 d24ff32a7e8..706f4d69dec 100644
--- 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 ed4a2195098..c46d845f8e4 100644
--- 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 802430c412b..43c76961507 100644
--- 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 83a6df1a269..07744f9c320 100644
--- 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 9b267ed5f79..4c5f3d6c3e0 100644
--- 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 bf814339122..653ca6c6317 100644
--- 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 43f83d9ad8b..b1719e8377f 100644
--- 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 d73532ed6a5..fbee53f11e8 100644
--- 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 d9744d06b84..5084af201e0 100644
--- 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 eff523b5792..d08192e64bb 100644
--- 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 595e9f5ed0a..014eda06b17 100644
--- 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 d1f27c964e6..747e47afb42 100644
--- 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 772dc2b474e..989a732a36e 100644
--- 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 3ad54e4dcc2..5c5b760e382 100644
--- 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 e297797b6a8..ab25b8fc96a 100755
--- 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)