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/pkcs12.c | |
| parent | c678f68a19638c1e2bbfee6a7a1d8d728976ce66 (diff) | |
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/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 5c05fddf99..60e12cf932 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -335,7 +335,11 @@ int pkcs12_main(int argc, char **argv) break; } } + + /* No extra arguments. */ argc = opt_num_rest(); + if (argc != 0) + goto opthelp; if (export_pkcs12) { if ((options & INFO) != 0) @@ -421,8 +425,6 @@ int pkcs12_main(int argc, char **argv) enc = EVP_des_ede3_cbc(); } - if (argc != 0) - goto opthelp; private = 1; |