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/pkcs7.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/pkcs7.c')
-rw-r--r-- | apps/pkcs7.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/pkcs7.c b/apps/pkcs7.c index ca052730ea..7c62a8658e 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -143,7 +143,7 @@ int pkcs7_main(int argc, char **argv) PKCS7 *p7 = NULL; BIO *in = NULL, *out = NULL; int informat = FORMAT_PEM, outformat = FORMAT_PEM; - char *engine = NULL, *infile = NULL, *outfile = NULL, *prog; + char *infile = NULL, *outfile = NULL, *prog; int i, print_certs = 0, text = 0, noout = 0, p7_print = 0, ret = 1; OPTION_CHOICE o; @@ -186,17 +186,13 @@ int pkcs7_main(int argc, char **argv) print_certs = 1; break; case OPT_ENGINE: - engine = opt_arg(); + (void)setup_engine(opt_arg(), 0); break; } } argc = opt_num_rest(); argv = opt_rest(); -#ifndef OPENSSL_NO_ENGINE - setup_engine(engine, 0); -#endif - in = bio_open_default(infile, RB(informat)); if (in == NULL) goto end; |