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/x509.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/x509.c')
-rw-r--r-- | apps/x509.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/apps/x509.c b/apps/x509.c index 903e6b94b9..e1cc3cde1f 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -220,25 +220,20 @@ int x509_main(int argc, char **argv) char *checkhost = NULL, *checkemail = NULL, *checkip = NULL; char *extsect = NULL, *extfile = NULL, *passin = NULL, *passinarg = NULL; char *infile = NULL, *outfile = NULL, *keyfile = NULL, *CAfile = NULL; - char buf[256]; - char *engine = NULL, *prog; - int C = 0, x509req = 0, days = DEF_DAYS, modulus = 0, pubkey = 0, pprint = - 0; - int CAformat = FORMAT_PEM, CAkeyformat = FORMAT_PEM; - int fingerprint = 0, reqfile = 0, need_rand = 0, checkend = - 0, checkoffset = 0; + char buf[256], *prog; + int x509req = 0, days = DEF_DAYS, modulus = 0, pubkey = 0, pprint = 0; + int C = 0, CAformat = FORMAT_PEM, CAkeyformat = FORMAT_PEM; + int fingerprint = 0, reqfile = 0, need_rand = 0, checkend = 0; int informat = FORMAT_PEM, outformat = FORMAT_PEM, keyformat = FORMAT_PEM; int next_serial = 0, subject_hash = 0, issuer_hash = 0, ocspid = 0; int noout = 0, sign_flag = 0, CA_flag = 0, CA_createserial = 0, email = 0; int ocsp_uri = 0, trustout = 0, clrtrust = 0, clrreject = 0, aliasout = 0; int ret = 1, i, num = 0, badsig = 0, clrext = 0, nocert = 0; - int text = 0, serial = 0, subject = 0, issuer = 0, startdate = - 0, enddate = 0; + int text = 0, serial = 0, subject = 0, issuer = 0, startdate = 0; + int checkoffset = 0, enddate = 0; unsigned long nmflag = 0, certflag = 0; OPTION_CHOICE o; -#ifndef OPENSSL_NO_ENGINE ENGINE *e = NULL; -#endif #ifndef OPENSSL_NO_MD5 int subject_hash_old = 0, issuer_hash_old = 0; #endif @@ -374,7 +369,7 @@ int x509_main(int argc, char **argv) goto opthelp; break; case OPT_ENGINE: - engine = opt_arg(); + e = setup_engine(opt_arg(), 0); break; case OPT_C: C = ++num; @@ -498,10 +493,6 @@ int x509_main(int argc, char **argv) if (out == NULL) goto end; -#ifndef OPENSSL_NO_ENGINE - e = setup_engine(engine, 0); -#endif - if (need_rand) app_RAND_load_file(NULL, 0); |