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/srp.c | |
| parent | c54cc2b15d96944fcf13ccd24baca79f9593cbf0 (diff) | |
| download | openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.zip openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.tar.gz openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.tar.bz2 | |
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/srp.c')
| -rw-r--r-- | apps/srp.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -272,7 +272,7 @@ int srp_main(int argc, char **argv) int mode = OPT_ERR; char *user = NULL, *passinarg = NULL, *passoutarg = NULL; char *passin = NULL, *passout = NULL, *gN = NULL, *userinfo = NULL; - char *randfile = NULL, *engine = NULL, *tofree = NULL, *section = NULL; + char *randfile = NULL, *tofree = NULL, *section = NULL; char **gNrow = NULL, *configfile = NULL, *dbfile = NULL, **pp, *prog; long errorline = -1; OPTION_CHOICE o; @@ -332,7 +332,7 @@ int srp_main(int argc, char **argv) passoutarg = opt_arg(); break; case OPT_ENGINE: - engine = opt_arg(); + (void)setup_engine(opt_arg(), 0); break; } } @@ -359,9 +359,6 @@ int srp_main(int argc, char **argv) "-passin, -passout arguments only valid with one user.\n"); goto opthelp; } -# ifndef OPENSSL_NO_ENGINE - setup_engine(engine, 0); -# endif if (!app_passwd(passinarg, passoutarg, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); |