commit d9f073575fdb07b486cd1b38974cd177687ccc1e
author Dr. David von Oheimb <David.von.Oheimb@siemens.com> Fri Aug 27 15:33:18 2021 +0200
committer Dr. David von Oheimb <dev@ddvo.net> Tue Dec 07 15:26:40 2021 +0100
tree d0e8bf2bb5f98e59ae5fb06a07f4115ab5468516
parent b0be101326f369f0dd547556d2f3eb3ef5ed0e33

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)

apps/genpkey.c

diff --git a/apps/genpkey.c b/apps/genpkey.c
index d00754e..7f70a6b 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -139,8 +139,7 @@
     }
 
     /* No extra arguments. */
-    argc = opt_num_rest();
-    if (argc != 0)
+    if (!opt_check_rest_arg(NULL))
         goto opthelp;
 
     /* Fetch cipher, etc. */
@@ -163,9 +162,12 @@
             goto end;
         }
     }
-    if (ciphername != NULL)
-        if (!opt_cipher(ciphername, &cipher) || do_param == 1)
-            goto opthelp;
+    if (!opt_cipher(ciphername, &cipher))
+        goto opthelp;
+    if (ciphername != NULL && do_param == 1) {
+        BIO_printf(bio_err, "Cannot use cipher with -genparam option\n");
+        goto opthelp;
+    }
 
     private = do_param ? 0 : 1;