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/enc.c | |
| parent | c678f68a19638c1e2bbfee6a7a1d8d728976ce66 (diff) | |
| download | openssl-new-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/enc.c')
| -rw-r--r-- | apps/enc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/enc.c b/apps/enc.c index 0f4cdae3c2..f97621b1a6 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -295,10 +295,11 @@ int enc_main(int argc, char **argv) break; } } - if (opt_num_rest() != 0) { - BIO_printf(bio_err, "Extra arguments given.\n"); + + /* No extra arguments. */ + argc = opt_num_rest(); + if (argc != 0) goto opthelp; - } if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) { BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog); |