leviathan
/
openssl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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)
master
Pauli 2021-05-25 12:04:22 +10:00
parent 9080ed2175
commit b93f6c2db9
84 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/asn1/asn1_err.c
View File

@ -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)

2
crypto/async/async_err.c
View File

@ -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)

2
crypto/bio/bio_err.c
View File

@ -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)

2
crypto/bn/bn_err.c
View File

@ -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)

2
crypto/buffer/buf_err.c
View File

@ -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)

2
crypto/cmp/cmp_err.c
View File

@ -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)

2
crypto/cms/cms_err.c
View File

@ -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)

2
crypto/comp/comp_err.c
View File

@ -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)

2
crypto/conf/conf_err.c
View File

@ -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)

2
crypto/cpt_err.c
View File

@ -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)

2
crypto/crmf/crmf_err.c
View File

@ -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)

2
crypto/ct/ct_err.c
View File

@ -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)

2
crypto/dh/dh_err.c
View File

@ -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)

2
crypto/dsa/dsa_err.c
View File

@ -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)

2
crypto/dso/dso_err.c
View File

@ -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)

2
crypto/ec/ec_err.c
View File

@ -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)

2
crypto/encode_decode/decoder_err.c
View File

@ -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)

2
crypto/encode_decode/encoder_err.c
View File

@ -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)

2
crypto/engine/eng_err.c
View File

@ -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)

6
crypto/err/err.c
View File

@ -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;

74
crypto/err/err_all.c
View File

@ -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;

6
crypto/err/err_all_legacy.c
View File

@ -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

2
crypto/ess/ess_err.c
View File

@ -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)

2
crypto/evp/evp_err.c
View File

@ -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)

2
crypto/http/http_err.c
View File

@ -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)

4
crypto/init.c
View File

@ -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;

2
crypto/objects/obj_err.c
View File

@ -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)

2
crypto/ocsp/ocsp_err.c
View File

@ -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)

2
crypto/pem/pem_err.c
View File

@ -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)

2
crypto/pkcs12/pk12err.c
View File

@ -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)

2
crypto/pkcs7/pkcs7err.c
View File

@ -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)

2
crypto/property/property_err.c
View File

@ -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)

2
crypto/rand/rand_err.c
View File

@ -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)

2
crypto/rsa/rsa_err.c
View File

@ -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)

2
crypto/sm2/sm2_err.c
View File

@ -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)

2
crypto/store/store_err.c
View File

@ -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)

2
crypto/ts/ts_err.c
View File

@ -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)

2
crypto/ui/ui_err.c
View File

@ -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)

2
crypto/x509/v3err.c
View File

@ -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)

2
crypto/x509/x509_err.c
View File

@ -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)

2
include/crypto/asn1err.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_ASN1_strings_int(void);
int ossl_err_load_ASN1_strings(void);
# ifdef __cplusplus
}

2
include/crypto/asyncerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_ASYNC_strings_int(void);
int ossl_err_load_ASYNC_strings(void);
# ifdef __cplusplus
}

2
include/crypto/bioerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_BIO_strings_int(void);
int ossl_err_load_BIO_strings(void);
# ifdef __cplusplus
}

2
include/crypto/bnerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_BN_strings_int(void);
int ossl_err_load_BN_strings(void);
# ifdef __cplusplus
}

2
include/crypto/buffererr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_BUF_strings_int(void);
int ossl_err_load_BUF_strings(void);
# ifdef __cplusplus
}

2
include/crypto/cmperr.h
View File

@ -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

2
include/crypto/cmserr.h
View File

@ -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

2
include/crypto/comperr.h
View File

@ -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

2
include/crypto/conferr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_CONF_strings_int(void);
int ossl_err_load_CONF_strings(void);
# ifdef __cplusplus
}

2
include/crypto/crmferr.h
View File

@ -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

2
include/crypto/cryptoerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_CRYPTO_strings_int(void);
int ossl_err_load_CRYPTO_strings(void);
# ifdef __cplusplus
}

2
include/crypto/cterr.h
View File

@ -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

2
include/crypto/decodererr.h
View File

@ -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
}

2
include/crypto/dherr.h
View File

@ -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

2
include/crypto/dsaerr.h
View File

@ -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

2
include/crypto/ecerr.h
View File

@ -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

2
include/crypto/encodererr.h
View File

@ -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
}

2
include/crypto/engineerr.h
View File

@ -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

4
include/crypto/err.h
View File

@ -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 *);

2
include/crypto/esserr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_ESS_strings_int(void);
int ossl_err_load_ESS_strings(void);
# ifdef __cplusplus
}

2
include/crypto/evperr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_EVP_strings_int(void);
int ossl_err_load_EVP_strings(void);
# ifdef __cplusplus
}

2
include/crypto/httperr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_HTTP_strings_int(void);
int ossl_err_load_HTTP_strings(void);
# ifdef __cplusplus
}

2
include/crypto/objectserr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_OBJ_strings_int(void);
int ossl_err_load_OBJ_strings(void);
# ifdef __cplusplus
}

2
include/crypto/ocsperr.h
View File

@ -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

2
include/crypto/pemerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_PEM_strings_int(void);
int ossl_err_load_PEM_strings(void);
# ifdef __cplusplus
}

2
include/crypto/pkcs12err.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_PKCS12_strings_int(void);
int ossl_err_load_PKCS12_strings(void);
# ifdef __cplusplus
}

2
include/crypto/pkcs7err.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_PKCS7_strings_int(void);
int ossl_err_load_PKCS7_strings(void);
# ifdef __cplusplus
}

2
include/crypto/randerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_RAND_strings_int(void);
int ossl_err_load_RAND_strings(void);
# ifdef __cplusplus
}

2
include/crypto/rsaerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_RSA_strings_int(void);
int ossl_err_load_RSA_strings(void);
# ifdef __cplusplus
}

2
include/crypto/sm2err.h
View File

@ -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.

2
include/crypto/storeerr.h
View File

@ -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
}

2
include/crypto/tserr.h
View File

@ -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

2
include/crypto/uierr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_UI_strings_int(void);
int ossl_err_load_UI_strings(void);
# ifdef __cplusplus
}

2
include/crypto/x509err.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_X509_strings_int(void);
int ossl_err_load_X509_strings(void);
# ifdef __cplusplus
}

2
include/crypto/x509v3err.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_X509V3_strings_int(void);
int ossl_err_load_X509V3_strings(void);
# ifdef __cplusplus
}

2
include/internal/dsoerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_DSO_strings_int(void);
int ossl_err_load_DSO_strings(void);
/*
* DSO reason codes.

2
include/internal/propertyerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_PROP_strings_int(void);
int ossl_err_load_PROP_strings(void);
/*
* PROP reason codes.

2
providers/common/include/prov/proverr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_PROV_strings_int(void);
int ossl_err_load_PROV_strings(void);
# ifdef __cplusplus
}

2
providers/common/provider_err.c
View File

@ -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)

2
ssl/ssl_err.c
View File

@ -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)

2
ssl/ssl_err_legacy.c
View File

@ -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

4
ssl/ssl_init.c
View File

@ -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;

2
ssl/sslerr.h
View File

@ -19,7 +19,7 @@
extern "C" {
# endif
int err_load_SSL_strings_int(void);
int ossl_err_load_SSL_strings(void);
# ifdef __cplusplus
}

4
util/mkerr.pl
View File