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/ecparam.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/ecparam.c')
| -rw-r--r-- | apps/ecparam.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/ecparam.c b/apps/ecparam.c index 4d57ca4446..a9bf489cdd 100644 --- a/apps/ecparam.c +++ b/apps/ecparam.c @@ -131,9 +131,7 @@ int MAIN(int argc, char **argv) BIO *in = NULL, *out = NULL; int informat, outformat, noout = 0, C = 0, ret = 1; char *engine = NULL; -# ifndef OPENSSL_NO_ENGINE ENGINE *e = NULL; -# endif BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL, *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL; @@ -314,9 +312,7 @@ int MAIN(int argc, char **argv) } } -# ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine, 0); -# endif if (list_curves) { EC_builtin_curve *curves = NULL; @@ -625,10 +621,7 @@ int MAIN(int argc, char **argv) OPENSSL_free(buffer); if (group != NULL) EC_GROUP_free(group); -# ifndef OPENSSL_NO_ENGINE - if (e != NULL) - release_engine(e); -# endif + release_engine(e); if (in != NULL) BIO_free(in); if (out != NULL) |