diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-08-27 15:33:18 +0200 |
---|---|---|
committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-12-07 15:26:40 +0100 |
commit | d9f073575fdb07b486cd1b38974cd177687ccc1e (patch) | |
tree | d0e8bf2bb5f98e59ae5fb06a07f4115ab5468516 /apps/gendsa.c | |
parent | b0be101326f369f0dd547556d2f3eb3ef5ed0e33 (diff) |
APPS: Improve diagnostics on missing/extra args and unknown cipher/digest
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16450)
Diffstat (limited to 'apps/gendsa.c')
-rw-r--r-- | apps/gendsa.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/gendsa.c b/apps/gendsa.c index e5c9bc22ad..b9bc2f502b 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -101,19 +101,16 @@ int gendsa_main(int argc, char **argv) } /* One argument, the params file. */ - argc = opt_num_rest(); - argv = opt_rest(); - if (argc != 1) + if (!opt_check_rest_arg("params file")) goto opthelp; + argv = opt_rest(); dsaparams = argv[0]; if (!app_RAND_load()) goto end; - if (ciphername != NULL) { - if (!opt_cipher(ciphername, &enc)) - goto end; - } + if (!opt_cipher(ciphername, &enc)) + goto end; private = 1; if (!app_passwd(NULL, passoutarg, NULL, &passout)) { |