[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  56e36bdaef442536681bce2a1579385c0279bec8 (commit)
      from  0a72002993b8619fd0642d19af3364bafbd9a06c (commit)


- Log -----------------------------------------------------------------
commit 56e36bdaef442536681bce2a1579385c0279bec8
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 28 14:40:25 2016 -0400

    Revert "Call ENGINE_init() before trying to use keys from engine"
    
    This reverts commit 0a72002993b8619fd0642d19af3364bafbd9a06c.
    This fails to call ENGINE_finish; an alternate fix is forthcoming.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 apps/apps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 9a58f17..b287748 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1269,7 +1269,7 @@ ENGINE *setup_engine(const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
         }
         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-        if (!ENGINE_init(e) || !ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+        if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
             BIO_printf(bio_err, "can't use that engine\n");
             ERR_print_errors(bio_err);
             ENGINE_free(e);