projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update FAQ
[openssl.git]
/
apps
/
verify.c
diff --git
a/apps/verify.c
b/apps/verify.c
index bcca114efe4557675b6b4ed5c5b0cc483a5070ce..b03085bf87678c7f1aa4eabdbb9e52b22fb6d4cd 100644
(file)
--- a/
apps/verify.c
+++ b/
apps/verify.c
@@
-228,11
+228,19
@@
int MAIN(int argc, char **argv)
if (crl_download)
store_setup_crl_download(cert_ctx);
if (crl_download)
store_setup_crl_download(cert_ctx);
- if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e);
+ ret=0;
+ if (argc < 1)
+ {
+ if (1 != check(cert_ctx, NULL, untrusted, trusted, crls, e))
+ ret=-1;
+ }
else
else
+ {
for (i=0; i<argc; i++)
for (i=0; i<argc; i++)
- check(cert_ctx,argv[i], untrusted, trusted, crls, e);
- ret=0;
+ if (1 != check(cert_ctx,argv[i], untrusted, trusted, crls, e))
+ ret=-1;
+ }
+
end:
if (ret == 1) {
BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
end:
if (ret == 1) {
BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
@@
-267,7
+275,7
@@
end:
sk_X509_pop_free(trusted, X509_free);
sk_X509_CRL_pop_free(crls, X509_CRL_free);
apps_shutdown();
sk_X509_pop_free(trusted, X509_free);
sk_X509_CRL_pop_free(crls, X509_CRL_free);
apps_shutdown();
- OPENSSL_EXIT(ret);
+ OPENSSL_EXIT(ret
< 0 ? 2 : ret
);
}
static int check(X509_STORE *ctx, char *file,
}
static int check(X509_STORE *ctx, char *file,