diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-11-25 12:08:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-12-08 16:09:31 +0100 |
| commit | ea4e868a3c6872f4944dd5469518f8b10ee3432c (patch) | |
| tree | 1a4fb193334220cc3ecc012fdb3cc2bceab4cc6f | |
| parent | ad74ff046bea5b1f77ff7425598802b91924652d (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)
(cherry picked from commit 0488c0bbbe87eee3a800797b91350c653e9f1711)
| -rw-r--r-- | apps/openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index b99bfa8d48..6e7b02c64d 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -69,8 +69,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; #ifndef OPENSSL_NO_UI |