In apps_startup(), call OPENSSL_init_ssl() rather than OPENSSL_init_crypto()
authorRichard Levitte <levitte@openssl.org>
Sat, 25 Nov 2017 11:08:47 +0000 (12:08 +0100)
committerRichard Levitte <levitte@openssl.org>
Fri, 8 Dec 2017 15:08:39 +0000 (16:08 +0100)
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)

apps/openssl.c

index 1c8682759fcf0ffdb2961bf533841129413c868b..2cb49cbb3551e77da9c8ddb78761b9cbfb3f2bdc 100644 (file)
@@ -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();