diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-12 09:19:24 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-24 15:21:44 +0100 |
| commit | f5a46ed7fe66520c6f1016eb96e96cb241ba229f (patch) | |
| tree | aad7f22a6fbca9e545fa6f3af18b73c97059c6e1 /crypto/err/err.c | |
| parent | 9343d3fe3bc5a4a2d6461c640d34a96e950177ad (diff) | |
Modify the ERR init functions to use the internal ERR string loaders
This deprecates all the ERR_load_ functions, and moves their definition to
separate C source files that can easily be removed when those functions are
finally removed.
This also reduces include/openssl/kdferr.h to include cryptoerr_legacy.h,
moves the declaration of ERR_load_ERR_strings() from include/openssl/err.h
to include/openssl/cryptoerr_legacy.h, and finally removes the declaration
of ERR_load_DSO_strings(), which was entirely internal anyway.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13390)
Diffstat (limited to 'crypto/err/err.c')
| -rw-r--r-- | crypto/err/err.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index a66ea63adf..8500fe7988 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -237,7 +237,7 @@ static int err_load_strings(const ERR_STRING_DATA *str) return 1; } -int ERR_load_ERR_strings(void) +int err_load_ERR_strings_int(void) { #ifndef OPENSSL_NO_ERR if (!RUN_ONCE(&err_string_init, do_err_strings_init)) @@ -251,7 +251,7 @@ int ERR_load_ERR_strings(void) int ERR_load_strings(int lib, ERR_STRING_DATA *str) { - if (ERR_load_ERR_strings() == 0) + if (err_load_ERR_strings_int() == 0) return 0; err_patch(lib, str); @@ -261,7 +261,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() == 0) + if (err_load_ERR_strings_int() == 0) return 0; err_load_strings(str); return 1; |