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/dsaparam.c | |
| parent | c54cc2b15d96944fcf13ccd24baca79f9593cbf0 (diff) | |
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/dsaparam.c')
| -rw-r--r-- | apps/dsaparam.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/dsaparam.c b/apps/dsaparam.c index b314409762..f7365b92d0 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -124,8 +124,7 @@ int dsaparam_main(int argc, char **argv) # ifdef GENCB_TEST int timebomb = 0; # endif - char *infile = NULL, *outfile = NULL, *prog, *inrand = NULL, *engine = - NULL; + char *infile = NULL, *outfile = NULL, *prog, *inrand = NULL; OPTION_CHOICE o; prog = opt_init(argc, argv, dsaparam_options); @@ -155,7 +154,7 @@ int dsaparam_main(int argc, char **argv) outfile = opt_arg(); break; case OPT_ENGINE: - engine = opt_arg(); + (void)setup_engine(opt_arg(), 0); break; case OPT_TIMEBOMB: # ifdef GENCB_TEST @@ -201,10 +200,6 @@ int dsaparam_main(int argc, char **argv) if (out == NULL) goto end; -# ifndef OPENSSL_NO_ENGINE - setup_engine(engine, 0); -# endif - if (need_rand) { app_RAND_load_file(NULL, (inrand != NULL)); if (inrand != NULL) |