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/gendsa.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/gendsa.c')
| -rw-r--r-- | apps/gendsa.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/gendsa.c b/apps/gendsa.c index c9cc9c40d2..31510e6123 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -85,10 +85,8 @@ int MAIN(int argc, char **argv) char *passargout = NULL, *passout = NULL; BIO *out = NULL, *in = NULL; const EVP_CIPHER *enc = NULL; -# ifndef OPENSSL_NO_ENGINE char *engine = NULL; ENGINE *e = NULL; -# endif apps_startup(); @@ -207,9 +205,7 @@ int MAIN(int argc, char **argv) " - a DSA parameter file as generated by the dsaparam command\n"); goto end; } -# ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine, 0); -# endif if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) { BIO_printf(bio_err, "Error getting password\n"); @@ -274,10 +270,7 @@ int MAIN(int argc, char **argv) BIO_free_all(out); if (dsa != NULL) DSA_free(dsa); -# ifndef OPENSSL_NO_ENGINE - if (e != NULL) - release_engine(e); -# endif + release_engine(e); if (passout) OPENSSL_free(passout); apps_shutdown(); |