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/kdf.c | |
parent | c678f68a19638c1e2bbfee6a7a1d8d728976ce66 (diff) | |
download | openssl-021410ea3fc3876538830839d16b67e610d12785.tar.gz |
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/kdf.c')
-rw-r--r-- | apps/kdf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/kdf.c b/apps/kdf.c index ba14cfdc76..4bbb88a5ae 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -89,13 +89,12 @@ opthelp: break; } } + + /* One argument, the KDF name. */ argc = opt_num_rest(); argv = opt_rest(); - - if (argc != 1) { - BIO_printf(bio_err, "Invalid number of extra arguments\n"); + if (argc != 1) goto opthelp; - } if ((kdf = EVP_KDF_fetch(NULL, argv[0], NULL)) == NULL) { BIO_printf(bio_err, "Invalid KDF name %s\n", argv[0]); |