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/pkey.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/pkey.c')
| -rw-r--r-- | apps/pkey.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/pkey.c b/apps/pkey.c index 3597be0ee6..716d6d01e8 100644 --- a/apps/pkey.c +++ b/apps/pkey.c @@ -97,7 +97,7 @@ int pkey_main(int argc, char **argv) EVP_PKEY *pkey = NULL; const EVP_CIPHER *cipher = NULL; char *infile = NULL, *outfile = NULL, *passin = NULL, *passout = NULL; - char *passinarg = NULL, *passoutarg = NULL, *prog, *engine = NULL; + char *passinarg = NULL, *passoutarg = NULL, *prog; OPTION_CHOICE o; int informat = FORMAT_PEM, outformat = FORMAT_PEM; int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0, ret = 1; @@ -129,7 +129,7 @@ int pkey_main(int argc, char **argv) passoutarg = opt_arg(); break; case OPT_ENGINE: - engine = opt_arg(); + e = setup_engine(opt_arg(), 0); break; case OPT_IN: infile = opt_arg(); @@ -160,10 +160,6 @@ int pkey_main(int argc, char **argv) argc = opt_num_rest(); argv = opt_rest(); -#ifndef OPENSSL_NO_ENGINE - e = setup_engine(engine, 0); -#endif - if (!app_passwd(passinarg, passoutarg, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); goto end; |