diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-13 22:33:56 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-22 13:39:44 -0500 |
| commit | a773b52a61bb269e75ebbac01cfca9ebcb6c78b9 (patch) | |
| tree | b70a39274abcb667620e2bb8f99570cad672ea65 /apps/verify.c | |
| parent | 5de75fb4fb0a0f724c259a5477603c7d0dfd2235 (diff) | |
Remove unused parameters from internal functions
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/verify.c')
| -rw-r--r-- | apps/verify.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/apps/verify.c b/apps/verify.c index 158504464b..58a48c7f63 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -68,7 +68,7 @@ static int cb(int ok, X509_STORE_CTX *ctx); static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, - STACK_OF(X509_CRL) *crls, ENGINE *e, int show_chain); + STACK_OF(X509_CRL) *crls, int show_chain); static int v_verbose = 0, vflags = 0; typedef enum OPTION_choice { @@ -108,7 +108,6 @@ OPTIONS verify_options[] = { int verify_main(int argc, char **argv) { - ENGINE *e = NULL; STACK_OF(X509) *untrusted = NULL, *trusted = NULL; STACK_OF(X509_CRL) *crls = NULL; X509_STORE *store = NULL; @@ -167,7 +166,7 @@ int verify_main(int argc, char **argv) break; case OPT_UNTRUSTED: /* Zero or more times */ - if (!load_certs(opt_arg(), &untrusted, FORMAT_PEM, NULL, e, + if (!load_certs(opt_arg(), &untrusted, FORMAT_PEM, NULL, "untrusted certificates")) goto end; break; @@ -175,26 +174,28 @@ int verify_main(int argc, char **argv) /* Zero or more times */ noCAfile = 1; noCApath = 1; - if (!load_certs(opt_arg(), &trusted, FORMAT_PEM, NULL, e, + if (!load_certs(opt_arg(), &trusted, FORMAT_PEM, NULL, "trusted certificates")) goto end; break; case OPT_CRLFILE: /* Zero or more times */ - if (!load_crls(opt_arg(), &crls, FORMAT_PEM, NULL, e, + if (!load_crls(opt_arg(), &crls, FORMAT_PEM, NULL, "other CRLs")) goto end; break; case OPT_CRL_DOWNLOAD: crl_download = 1; break; + case OPT_ENGINE: + if (setup_engine(opt_arg(), 0) == NULL) { + /* Failure message already displayed */ + goto end; + } + break; case OPT_SHOW_CHAIN: show_chain = 1; break; - case OPT_ENGINE: - /* Specify *before* -trusted/-untrusted/-CRLfile */ - e = setup_engine(opt_arg(), 0); - break; case OPT_VERBOSE: v_verbose = 1; break; @@ -223,11 +224,11 @@ int verify_main(int argc, char **argv) ret = 0; if (argc < 1) { - if (check(store, NULL, untrusted, trusted, crls, e, show_chain) != 1) + if (check(store, NULL, untrusted, trusted, crls, show_chain) != 1) ret = -1; } else { for (i = 0; i < argc; i++) - if (check(store, argv[i], untrusted, trusted, crls, e, + if (check(store, argv[i], untrusted, trusted, crls, show_chain) != 1) ret = -1; } @@ -243,7 +244,7 @@ int verify_main(int argc, char **argv) static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, - STACK_OF(X509_CRL) *crls, ENGINE *e, int show_chain) + STACK_OF(X509_CRL) *crls, int show_chain) { X509 *x = NULL; int i = 0, ret = 0; @@ -251,7 +252,7 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *chain = NULL; int num_untrusted; - x = load_cert(file, FORMAT_PEM, NULL, e, "certificate file"); + x = load_cert(file, FORMAT_PEM, "certificate file"); if (x == NULL) goto end; |