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/ts.c

diff --git a/apps/ts.c b/apps/ts.c
index e65d223..8e58ef0 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -204,8 +204,10 @@
         case OPT_QUERY:
         case OPT_REPLY:
         case OPT_VERIFY:
-            if (mode != OPT_ERR)
+            if (mode != OPT_ERR) {
+                BIO_printf(bio_err, "%s: Must give only one of -query, -reply, or -verify\n", prog);
                 goto opthelp;
+            }
             mode = o;
             break;
         case OPT_DATA:
@@ -288,17 +290,18 @@
     }
 
     /* No extra arguments. */
-    argc = opt_num_rest();
-    if (argc != 0 || mode == OPT_ERR)
+    if (!opt_check_rest_arg(NULL))
         goto opthelp;
+    if (mode == OPT_ERR) {
+        BIO_printf(bio_err, "%s: Must give one of -query, -reply, or -verify\n", prog);
+        goto opthelp;
+    }
 
     if (!app_RAND_load())
         goto end;
 
-    if (digestname != NULL) {
-        if (!opt_md(digestname, &md))
-            goto opthelp;
-    }
+    if (!opt_md(digestname, &md))
+        goto opthelp;
     if (mode == OPT_REPLY && passin &&
         !app_passwd(passin, NULL, &password, NULL)) {
         BIO_printf(bio_err, "Error getting password.\n");