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 /ssl/ssl_init.c | |
| parent | ERR: Modify util/mkerr.pl to produce internal err string loaders (diff) | |
| download | openssl-f5a46ed7fe66520c6f1016eb96e96cb241ba229f.tar.xz openssl-f5a46ed7fe66520c6f1016eb96e96cb241ba229f.zip | |
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 'ssl/ssl_init.c')
| -rw-r--r-- | ssl/ssl_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 73b0ce2b4d..772dc2b474 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -14,6 +14,7 @@ #include <openssl/evp.h> #include <openssl/trace.h> #include "ssl_local.h" +#include "sslerr.h" #include "internal/thread_once.h" static int stopped; @@ -53,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()\n"); - ERR_load_SSL_strings(); + OSSL_TRACE(INIT, "ossl_init_load_ssl_strings: err_load_SSL_strings_int()\n"); + err_load_SSL_strings_int(); ssl_strings_inited = 1; #endif return 1; |