root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

openssl verify: only display the command usage on usage errors 

All other errors should only display the error message.

RT#1866

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Richard Levitte 2016-05-20 16:57:35 +02:00
parent a531944796
commit d384bf39b1
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/verify.c
View File

@ -115,43 +115,43 @@ int MAIN(int argc, char **argv)
if (argc >= 1) { if (argc >= 1) {
if (strcmp(*argv, "-CApath") == 0) { if (strcmp(*argv, "-CApath") == 0) {
if (argc-- < 1) if (argc-- < 1)
goto end; goto usage;
CApath = *(++argv); CApath = *(++argv);
} else if (strcmp(*argv, "-CAfile") == 0) { } else if (strcmp(*argv, "-CAfile") == 0) {
if (argc-- < 1) if (argc-- < 1)
goto end; goto usage;
CAfile = *(++argv); CAfile = *(++argv);
} else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) { } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {
if (badarg) if (badarg)
goto end; goto usage;
continue; continue;
} else if (strcmp(*argv, "-untrusted") == 0) { } else if (strcmp(*argv, "-untrusted") == 0) {
if (argc-- < 1) if (argc-- < 1)
goto end; goto usage;
untfile = *(++argv); untfile = *(++argv);
} else if (strcmp(*argv, "-trusted") == 0) { } else if (strcmp(*argv, "-trusted") == 0) {
if (argc-- < 1) if (argc-- < 1)
goto end; goto usage;
trustfile = *(++argv); trustfile = *(++argv);
} else if (strcmp(*argv, "-CRLfile") == 0) { } else if (strcmp(*argv, "-CRLfile") == 0) {
if (argc-- < 1) if (argc-- < 1)
goto end; goto usage;
crlfile = *(++argv); crlfile = *(++argv);
} else if (strcmp(*argv, "-crl_download") == 0) } else if (strcmp(*argv, "-crl_download") == 0)
crl_download = 1; crl_download = 1;
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
else if (strcmp(*argv, "-engine") == 0) { else if (strcmp(*argv, "-engine") == 0) {
if (--argc < 1) if (--argc < 1)
goto end; goto usage;
engine = *(++argv); engine = *(++argv);
} }
#endif #endif
else if (strcmp(*argv, "-help") == 0) else if (strcmp(*argv, "-help") == 0)
goto end; goto usage;
else if (strcmp(*argv, "-verbose") == 0) else if (strcmp(*argv, "-verbose") == 0)
v_verbose = 1; v_verbose = 1;
else if (argv[0][0] == '-') else if (argv[0][0] == '-')
goto end; goto usage;
else else
break; break;
argc--; argc--;
@ -228,7 +228,7 @@ int MAIN(int argc, char **argv)
ret = -1; ret = -1;
} }
end: usage:
if (ret == 1) { if (ret == 1) {
BIO_printf(bio_err, BIO_printf(bio_err,
"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]"); "usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
@ -247,6 +247,7 @@ int MAIN(int argc, char **argv)
X509_PURPOSE_get0_name(ptmp)); X509_PURPOSE_get0_name(ptmp));
} }
} }
end:
if (vpm) if (vpm)
X509_VERIFY_PARAM_free(vpm); X509_VERIFY_PARAM_free(vpm);
if (cert_ctx != NULL) if (cert_ctx != NULL)