diff options
84 files changed, 128 insertions, 128 deletions
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c index af706e638e..a7b32e3a6e 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 285a0f2290..925d1eb534 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 d70bb08436..7a36c61148 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 e4ac23e1b6..6b25d1b503 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 7eee54f321..ffe6f7b854 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 93aed38f9a..09acdee986 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 33186a5ca9..1fba9d8502 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 972e75cdaf..c0bfeb865b 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 a06f55b104..68ee90b970 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 a56cb2c804..79c1a90595 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 bc7e8558f9..8cb3682c44 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 d067b713c1..810b3f5070 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 3652e89b3d..4152397426 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 888c043d89..5685d5e83e 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 c018a16464..f3f5002b77 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 108df5695b..9e21968499 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 c948d82698..88324a1d50 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 0b5028769d..7f5f2b3a9a 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 1cea06be08..917ecb5ae4 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 046bfcfe16..c77c1920a2 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 d5b3b5dbc6..55aa2b8dbd 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 e6cb882b3f..970fd5c500 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 2ece3443bd..eb76dfe7cc 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 cd36b09fb5..c0d9232103 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 4ac639197e..b2f2cfb187 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 3170c60ac2..49d817c089 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 ebc46cb44c..2c487433bf 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 fd0643c715..f0d4d2601d 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 50f9c2b925..5fa9fc09be 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 9899e272c1..bcd950626d 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 c2c40b48af..e30df047a4 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 a7c722feb5..d70e458c47 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 32c4c6cbcb..694b120b78 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 8008092b13..1e3c81ff5e 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 f548aba539..d420d4e597 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 8aa3444693..ec62b358c5 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 3a682c694f..9027ef1939 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 83ea371997..6ba4857a3b 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 18eb9917cb..985d7be7dc 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 76d57e869c..c2f3ae0f5f 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 9b623555f8..6441386bbc 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 f597e1b41e..b1f9137065 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 1a2398f5da..ba47066536 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 ee490aee96..e2e7f45eb4 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 87e13a89b3..0da96695f0 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 5db81abf26..894d3393db 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 86c9eb0a00..39b2c7ca7c 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 e3dbffed26..9f157623c7 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 0e7a02a1e0..cb367e4f32 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 6c190a75a3..8eb98d69ce 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 419ca1aac1..9c0380b5ac 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 f16f47692d..19bcaa054f 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 edf826798d..d7badc4379 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 351d7da01b..bb24d131eb 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 2cb75bb1cb..ed4b4fec6c 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 9110797b4b..e08a4dba97 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 836094b3cb..ce5879d8b7 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 16780166c8..d7d148f3db 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 7110276097..15ec6fd039 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 a87d4fabce..8df2df11ed 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 9af2e903f3..d90ba83f8b 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 c68ca3b0c4..969df17b83 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 98b3d74599..a55c80c979 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 15a9ccb983..51eb347b84 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 24c4d0c585..b255ff5c64 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 e3bf35cf68..b258905ed8 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 4cbe074b3e..39eb5b0494 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 ce2b4d5175..ff11d21878 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 63435822d6..43541b7faf 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 d24ff32a7e..706f4d69de 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 ed4a219509..c46d845f8e 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 802430c412..43c7696150 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 83a6df1a26..07744f9c32 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 9b267ed5f7..4c5f3d6c3e 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 bf81433912..653ca6c631 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 43f83d9ad8..b1719e8377 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 d73532ed6a..fbee53f11e 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 d9744d06b8..5084af201e 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 eff523b579..d08192e64b 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 595e9f5ed0..014eda06b1 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 d1f27c964e..747e47afb4 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 772dc2b474..989a732a36 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 3ad54e4dcc..5c5b760e38 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 e297797b6a..ab25b8fc96 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) |