Commit d384bf39 authored by Richard Levitte's avatar Richard Levitte
Browse files

openssl verify: only display the command usage on usage errors 



All other errors should only display the error message.

RT#1866

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent a5319447

apps/verify.c

+11 −10
Original line number Diff line number Diff line
@@ -115,43 +115,43 @@ int MAIN(int argc, char **argv) 
        if (argc >= 1) {

            if (strcmp(*argv, "-CApath") == 0) {

                if (argc-- < 1)

                    goto end;

                    goto usage;

                CApath = *(++argv);

            } else if (strcmp(*argv, "-CAfile") == 0) {

                if (argc-- < 1)

                    goto end;

                    goto usage;

                CAfile = *(++argv);

            } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {

                if (badarg)

                    goto end;

                    goto usage;

                continue;

            } else if (strcmp(*argv, "-untrusted") == 0) {

                if (argc-- < 1)

                    goto end;

                    goto usage;

                untfile = *(++argv);

            } else if (strcmp(*argv, "-trusted") == 0) {

                if (argc-- < 1)

                    goto end;

                    goto usage;

                trustfile = *(++argv);

            } else if (strcmp(*argv, "-CRLfile") == 0) {

                if (argc-- < 1)

                    goto end;

                    goto usage;

                crlfile = *(++argv);

            } else if (strcmp(*argv, "-crl_download") == 0)

                crl_download = 1;

#ifndef OPENSSL_NO_ENGINE

            else if (strcmp(*argv, "-engine") == 0) {

                if (--argc < 1)

                    goto end;

                    goto usage;

                engine = *(++argv);

            }

#endif

            else if (strcmp(*argv, "-help") == 0)

                goto end;

                goto usage;

            else if (strcmp(*argv, "-verbose") == 0)

                v_verbose = 1;

            else if (argv[0][0] == '-')

                goto end;

                goto usage;

            else

                break;

            argc--;
@@ -228,7 +228,7 @@ int MAIN(int argc, char **argv) 
                ret = -1;

    }



 end:

 usage:

    if (ret == 1) {

        BIO_printf(bio_err,

                   "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));

        }

    }

 end:

    if (vpm)

        X509_VERIFY_PARAM_free(vpm);

    if (cert_ctx != NULL)