[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1f08d945a79ad79c98fb84167c613934ee96d8e1 (commit)
      from  8b7080b0b7f30669c0784d8aa73388f95bbd056b (commit)


- Log -----------------------------------------------------------------
commit 1f08d945a79ad79c98fb84167c613934ee96d8e1
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Fri Oct 16 10:07:57 2015 +0100

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/openssl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 565903f..2b0425b 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;
 }