diff options
author | Rich Salz <rsalz@openssl.org> | 2015-04-25 15:41:29 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-04-25 15:41:29 -0400 |
commit | 333b070ec06d7a67538ee9d5312656a19e802dc1 (patch) | |
tree | aa630fe4f89d2333f82e2aeeba61f66e86e1349c /apps/pkeyparam.c | |
parent | c54cc2b15d96944fcf13ccd24baca79f9593cbf0 (diff) | |
download | openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.tar.gz |
fewer NO_ENGINE #ifdef's
Make setup_engine be a dummy if NO_ENGINE is enabled.
The option is not enabled if NO_ENGINE is enabled, so the one "wasted"
variable just sits there. Removes some variables and code.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/pkeyparam.c')
-rw-r--r-- | apps/pkeyparam.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c index 5a5caf56bd..fbd19a78cd 100644 --- a/apps/pkeyparam.c +++ b/apps/pkeyparam.c @@ -85,7 +85,7 @@ int pkeyparam_main(int argc, char **argv) EVP_PKEY *pkey = NULL; int text = 0, noout = 0, ret = 1; OPTION_CHOICE o; - char *infile = NULL, *outfile = NULL, *prog, *engine = NULL; + char *infile = NULL, *outfile = NULL, *prog; prog = opt_init(argc, argv, pkeyparam_options); while ((o = opt_next()) != OPT_EOF) { @@ -105,7 +105,7 @@ int pkeyparam_main(int argc, char **argv) outfile = opt_arg(); break; case OPT_ENGINE: - engine = opt_arg(); + (void)setup_engine(opt_arg(), 0); break; case OPT_TEXT: text = 1; @@ -118,10 +118,6 @@ int pkeyparam_main(int argc, char **argv) argc = opt_num_rest(); argv = opt_rest(); -#ifndef OPENSSL_NO_ENGINE - setup_engine(engine, 0); -#endif - in = bio_open_default(infile, "r"); if (in == NULL) goto end; |