diff options
author | Richard Levitte <levitte@openssl.org> | 2016-10-19 19:49:22 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-10-19 19:49:22 +0200 |
commit | 907c6c86331243897b80f37895a14de1e7957541 (patch) | |
tree | 241c80b60e53020db5e6700edb7490e4558d8ffa | |
parent | dd1abd4462e4e4fa84b8f8de2ec70375f9b0e191 (diff) |
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)
-rw-r--r-- | apps/apps.c | 4 | ||||
-rw-r--r-- | apps/apps.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/apps.c b/apps/apps.c index 05e1c2d009..dd6fb08c94 100644 --- 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 da4cc36384..9dc473767e 100644 --- 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, |