diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-19 19:46:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-10-20 09:04:00 +0200 |
| commit | 0df1caa77b793d055714f4d78d9aac7a985babb8 (patch) | |
| tree | 87eb3caf0026693522b38c28043f1beb3b37b888 /apps/dhparam.c | |
| parent | aa01b82c69eeb0cfd255174111fc34a7ed5f8429 (diff) | |
apps: make setup_engine() and release_engine() available always
This removes some #ifndef clutter.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1644)
Diffstat (limited to 'apps/dhparam.c')
| -rw-r--r-- | apps/dhparam.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index 0ab16e8d2f..1210adb104 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -159,10 +159,8 @@ int MAIN(int argc, char **argv) int informat, outformat, check = 0, noout = 0, C = 0, ret = 1; char *infile, *outfile, *prog; char *inrand = NULL; -# ifndef OPENSSL_NO_ENGINE char *engine = NULL; ENGINE *e = NULL; -# endif int num = 0, g = 0; apps_startup(); @@ -271,9 +269,7 @@ int MAIN(int argc, char **argv) ERR_load_crypto_strings(); -# ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine, 0); -# endif if (g && !num) num = DEFBITS; @@ -513,10 +509,7 @@ int MAIN(int argc, char **argv) BIO_free_all(out); if (dh != NULL) DH_free(dh); -# ifndef OPENSSL_NO_ENGINE - if (e != NULL) - release_engine(e); -# endif + release_engine(e); apps_shutdown(); OPENSSL_EXIT(ret); } |