diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-25 21:41:29 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-25 21:41:29 +0200 |
| commit | 333b070ec06d7a67538ee9d5312656a19e802dc1 (patch) | |
| tree | aa630fe4f89d2333f82e2aeeba61f66e86e1349c /apps/spkac.c | |
| parent | Add missing BIO_flush() calls (diff) | |
| download | openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.tar.xz openssl-333b070ec06d7a67538ee9d5312656a19e802dc1.zip | |
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/spkac.c')
| -rw-r--r-- | apps/spkac.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/spkac.c b/apps/spkac.c index ee2e5969f0..7ceff9feca 100644 --- a/apps/spkac.c +++ b/apps/spkac.c @@ -100,7 +100,7 @@ int spkac_main(int argc, char **argv) ENGINE *e = NULL; EVP_PKEY *pkey = NULL; NETSCAPE_SPKI *spki = NULL; - char *challenge = NULL, *keyfile = NULL, *engine = NULL; + char *challenge = NULL, *keyfile = NULL; char *infile = NULL, *outfile = NULL, *passinarg = NULL, *passin = NULL; char *spkstr = NULL, *prog; const char *spkac = "SPKAC", *spksect = "default"; @@ -149,9 +149,8 @@ int spkac_main(int argc, char **argv) spksect = opt_arg(); break; case OPT_ENGINE: - engine = opt_arg(); + e = setup_engine(opt_arg(), 0); break; - } } argc = opt_num_rest(); @@ -161,9 +160,6 @@ int spkac_main(int argc, char **argv) BIO_printf(bio_err, "Error getting password\n"); goto end; } -#ifndef OPENSSL_NO_ENGINE - e = setup_engine(engine, 0); -#endif if (keyfile) { pkey = load_key(strcmp(keyfile, "-") ? keyfile : NULL, @@ -194,7 +190,6 @@ int spkac_main(int argc, char **argv) conf = NCONF_new(NULL); i = NCONF_load_bio(conf, in, NULL); - if (!i) { BIO_printf(bio_err, "Error parsing config file\n"); ERR_print_errors(bio_err); |