diff options
| author | Dmitry Belyavsky <beldmit@gmail.com> | 2015-10-16 10:07:57 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-10-16 10:11:46 +0100 |
| commit | 1f08d945a79ad79c98fb84167c613934ee96d8e1 (patch) | |
| tree | 84287bd867202a8129b15c26ca01d5b217409c83 /apps/openssl.c | |
| parent | 8b7080b0b7f30669c0784d8aa73388f95bbd056b (diff) | |
Fix error message when loading engines from config
When using command line applications errors occur when trying to
load engines specified in a config file. Introduced by commit
a0a82324f96
RT#4093
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 565903f9f7..2b0425bf0a 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -175,6 +175,10 @@ static int apps_startup() ERR_load_crypto_strings(); ERR_load_SSL_strings(); + OPENSSL_load_builtin_modules(); +#ifndef OPENSSL_NO_ENGINE + ENGINE_load_builtin_engines(); +#endif if (!app_load_modules(NULL)) { ERR_print_errors(bio_err); BIO_printf(bio_err, "Error loading default configuration\n"); @@ -183,12 +187,8 @@ static int apps_startup() OpenSSL_add_all_algorithms(); OpenSSL_add_ssl_algorithms(); - OPENSSL_load_builtin_modules(); setup_ui_method(); /*SSL_library_init();*/ -#ifndef OPENSSL_NO_ENGINE - ENGINE_load_builtin_engines(); -#endif return 1; } |