diff options
| author | Pauli <pauli@openssl.org> | 2021-05-25 12:04:22 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-26 13:01:47 +1000 |
| commit | b93f6c2db94f736b497ff31a793c1e6766eaf209 (patch) | |
| tree | 769caa7724a0e67758b80f01350701365f396a56 /crypto/err | |
| parent | 9080ed2175532df8ecee4a2de9979037133d2601 (diff) | |
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)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 6 | ||||
| -rw-r--r-- | crypto/err/err_all.c | 74 | ||||
| -rw-r--r-- | crypto/err/err_all_legacy.c | 6 |
3 files changed, 43 insertions, 43 deletions
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 |