diff options
author | Rich Salz <rsalz@akamai.com> | 2020-11-28 16:12:58 -0500 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-12-15 11:47:17 +0100 |
commit | 021410ea3fc3876538830839d16b67e610d12785 (patch) | |
tree | 7178c87097f1083bc285a77f8ec179ceba343464 /apps/gendsa.c | |
parent | c678f68a19638c1e2bbfee6a7a1d8d728976ce66 (diff) | |
download | openssl-021410ea3fc3876538830839d16b67e610d12785.zip openssl-021410ea3fc3876538830839d16b67e610d12785.tar.gz openssl-021410ea3fc3876538830839d16b67e610d12785.tar.bz2 |
Check non-option arguments
Make sure all commands check to see if there are any "extra" arguments
after the options, and print an error if so.
Made all error messages consistent (which is to say, minimal).
Fixes: #13527
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13563)
Diffstat (limited to 'apps/gendsa.c')
-rw-r--r-- | apps/gendsa.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/gendsa.c b/apps/gendsa.c index f2afa11..d525f70 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -102,13 +102,15 @@ int gendsa_main(int argc, char **argv) break; } } + + /* One argument, the params file. */ argc = opt_num_rest(); argv = opt_rest(); - private = 1; - if (argc != 1) goto opthelp; - dsaparams = *argv; + + dsaparams = argv[0]; + private = 1; if (!app_passwd(NULL, passoutarg, NULL, &passout)) { BIO_printf(bio_err, "Error getting password\n"); |