From: Rich Salz <rsalz@openssl.org>
Date: Wed, 28 Sep 2016 18:39:32 +0000 (-0400)
Subject: Revert "Call ENGINE_init() before trying to use keys from engine"
X-Git-Tag: OpenSSL_1_0_2k~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a269e5f09a6e8f5b7a1f5ab92a90a41e61631e74;p=oweals%2Fopenssl.git

Revert "Call ENGINE_init() before trying to use keys from engine"

This reverts commit 4badd2b3c29c2c6c551c737c07a429a53d9d1a0d.
This fails to call ENGINE_finish; an alternate fix is coming.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
---

diff --git a/apps/apps.c b/apps/apps.c
index 40401c12ef..9fdc3e0097 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1553,7 +1553,7 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, 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(err, "can't use that engine\n");
             ERR_print_errors(err);
             ENGINE_free(e);