[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  a1b791225f2913ace014071bfb9099790ef468e5 (commit)
      from  8061fdc8d3048220a758ad1304669944810ac386 (commit)


- Log -----------------------------------------------------------------
commit a1b791225f2913ace014071bfb9099790ef468e5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 28 21:28:00 2016 +0200

    apps/apps.c: initialize and de-initialize engine around key loading
    
    Before loading a key from an engine, it may need to be initialized.
    When done loading the key, we must de-initialize the engine.
    (if the engine is already initialized somehow, only the reference
    counter will be incremented then decremented)
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 49e476a5382602d0bad1139d6f1f66ddbc7959d6)

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

Summary of changes:
 apps/apps.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index aa564b8..96184a6 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -692,7 +692,10 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
             BIO_printf(bio_err, "no engine specified\n");
         else {
 #ifndef OPENSSL_NO_ENGINE
-            pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+            if (ENGINE_init(e)) {
+                pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
+                ENGINE_finish(e);
+            }
             if (pkey == NULL) {
                 BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip);
                 ERR_print_errors(bio_err);