generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error message when loading engines from config

Browse Source 
When using command line applications errors occur when trying to
load engines specified in a config file. Introduced by commit
a0a82324f9

RT#4093

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dmitry Belyavsky 2015-10-16 10:07:57 +01:00 committed by Matt Caswell
parent 8b7080b0b7
commit 1f08d945a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openssl.c
View File

@ -175,6 +175,10 @@ static int apps_startup()
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ERR_load_SSL_strings(); ERR_load_SSL_strings();
OPENSSL_load_builtin_modules();
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines();
#endif
if (!app_load_modules(NULL)) { if (!app_load_modules(NULL)) {
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
BIO_printf(bio_err, "Error loading default configuration\n"); BIO_printf(bio_err, "Error loading default configuration\n");
@ -183,12 +187,8 @@ static int apps_startup()
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
OpenSSL_add_ssl_algorithms(); OpenSSL_add_ssl_algorithms();
OPENSSL_load_builtin_modules();
setup_ui_method(); setup_ui_method();
/*SSL_library_init();*/ /*SSL_library_init();*/
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines();
#endif
return 1; return 1;
} }