commit efba7787cd0036d667943070265ca8aef59e9d00
author Matt Caswell <matt@openssl.org> Wed Aug 24 13:36:07 2016 +0100
committer Matt Caswell <matt@openssl.org> Wed Aug 24 14:49:40 2016 +0100
tree a2f56a2e3a56013af291686edbfa7759737cd4c0
parent 0a307450bfdd570a09235a7ba16d6c8243bbe275

Clarify the error messages in 08f6ae5b28

Ensure it is clear to the user why there has been an error.

Reviewed-by: Rich Salz <rsalz@openssl.org>

apps/cms.c

diff --git a/apps/cms.c b/apps/cms.c
index 9c41a97..b9eec24 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -413,8 +413,8 @@
             break;
         case OPT_SECRETKEY:
             if (secret_key != NULL) {
-                /* Cannot be supplied twice */
-                BIO_printf(bio_err, "Invalid key %s\n", opt_arg());
+                BIO_printf(bio_err, "Invalid key (supplied twice) %s\n",
+                           opt_arg());
                 goto opthelp;
             }
             secret_key = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -426,8 +426,8 @@
             break;
         case OPT_SECRETKEYID:
             if (secret_keyid != NULL) {
-                /* Cannot be supplied twice */
-                BIO_printf(bio_err, "Invalid id %s\n", opt_arg());
+                BIO_printf(bio_err, "Invalid id (supplied twice) %s\n",
+                           opt_arg());
                 goto opthelp;
             }
             secret_keyid = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -442,8 +442,8 @@
             break;
         case OPT_ECONTENT_TYPE:
             if (econtent_type != NULL) {
-                /* Cannot be supplied twice */
-                BIO_printf(bio_err, "Invalid OID %s\n", opt_arg());
+                BIO_printf(bio_err, "Invalid OID (supplied twice) %s\n",
+                           opt_arg());
                 goto opthelp;
             }
             econtent_type = OBJ_txt2obj(opt_arg(), 0);