diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-19 19:49:22 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-10-20 08:59:53 +0200 |
| commit | a55b3959374161e33c68542d27c0fe93c6b7fe81 (patch) | |
| tree | b461f39f109f528d4aa425df4cc261e57ddd4e7e /apps | |
| parent | 233bcb95dd7299d98ad235d6ba16c1b5726c9276 (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)
(cherry picked from commit 907c6c86331243897b80f37895a14de1e7957541)
Diffstat (limited to 'apps')
| -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 4258b311d8..cc557e565f 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1243,11 +1243,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"); @@ -1273,9 +1275,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 8ff84674b6..926a6d6205 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, |