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/fipsinstall.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/fipsinstall.c')
| -rw-r--r-- | apps/fipsinstall.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c index d1cda24941..4a1b89d92c 100644 --- a/apps/fipsinstall.c +++ b/apps/fipsinstall.c @@ -373,7 +373,11 @@ opthelp: break; } } + + /* No extra arguments. */ argc = opt_num_rest(); + if (argc != 0) + goto opthelp; if (parent_config != NULL) { /* Test that a parent config can load the module */ @@ -386,9 +390,8 @@ opthelp: goto end; } if (module_fname == NULL - || (verify && in_fname == NULL) - || (!verify && out_fname == NULL) - || argc != 0) + || (verify && in_fname == NULL) + || (!verify && out_fname == NULL)) goto opthelp; tail = opt_path_end(module_fname); |