summaryrefslogtreecommitdiffstats
path: root/apps/openssl.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-11-25 12:08:47 +0100
committerRichard Levitte <levitte@openssl.org>2017-12-08 16:08:39 +0100
commit0488c0bbbe87eee3a800797b91350c653e9f1711 (patch)
tree79886073d4210e09110f8af9bed21af750ef7c89 /apps/openssl.c
parent0a90a6831e02e00d9043ada635421cfd3da5ffe2 (diff)
In apps_startup(), call OPENSSL_init_ssl() rather than OPENSSL_init_crypto()
Otherwise, any command that relies on ssl modules may fail, because SSL_add_ssl_module() will be called after the config file has already been loaded. Fixes #4788 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4792)
Diffstat (limited to 'apps/openssl.c')
-rw-r--r--apps/openssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 1c8682759f..2cb49cbb35 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -80,8 +80,8 @@ static int apps_startup()
#endif
/* Set non-default library initialisation settings */
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN
- | OPENSSL_INIT_LOAD_CONFIG, NULL))
+ if (!OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN
+ | OPENSSL_INIT_LOAD_CONFIG, NULL))
return 0;
setup_ui_method();