apps: instead of varying implementation, make setup_engine a function always

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1643)

diff --git a/apps/apps.c b/apps/apps.c
index 05e1c2d009aeeed7b3117e99a4bc61aa98477da1..dd6fb08c9406ca232535b236b78a78ce757ead5c 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1251,11 +1251,13 @@ static ENGINE *try_load_engine(const char *engine)
     }
     return e;
 }
+#endif
 
 ENGINE *setup_engine(const char *engine, int debug)
 {
     ENGINE *e = NULL;
 
+#ifndef OPENSSL_NO_ENGINE
     if (engine) {
         if (strcmp(engine, "auto") == 0) {
             BIO_printf(bio_err, "enabling auto ENGINE support\n");
@@ -1281,9 +1283,9 @@ ENGINE *setup_engine(const char *engine, int debug)
 
         BIO_printf(bio_err, "engine \"%s\" set.\n", ENGINE_get_id(e));
     }
+#endif
     return e;
 }
-#endif
 
 void release_engine(ENGINE *e)
 {

diff --git a/apps/apps.h b/apps/apps.h
index da4cc363846dd3959a49cda996af2c935fa901f2..9dc473767e13cf91622d1078a34e0500973b5a72 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -430,12 +430,9 @@ __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
 
 #endif
 
-# ifdef OPENSSL_NO_ENGINE
-#  define setup_engine(engine, debug) NULL
-# else
 ENGINE *setup_engine(const char *engine, int debug);
-# endif
 void release_engine(ENGINE *e);
+
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
                                  const char *host, const char *path,