Clarify the error messages in 08f6ae5b28
authorMatt Caswell <matt@openssl.org>
Wed, 24 Aug 2016 12:36:07 +0000 (13:36 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 24 Aug 2016 13:49:40 +0000 (14:49 +0100)
Ensure it is clear to the user why there has been an error.

Reviewed-by: Rich Salz <rsalz@openssl.org>
apps/cms.c
apps/req.c
apps/x509.c

index 9c41a97ec52f9a8bad1ddc45d90cfea47487669e..b9eec2432a5f16a03294a5522580fd38f9d5ef9f 100644 (file)
@@ -413,8 +413,8 @@ int cms_main(int argc, char **argv)
             break;
         case OPT_SECRETKEY:
             if (secret_key != NULL) {
             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);
                 goto opthelp;
             }
             secret_key = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -426,8 +426,8 @@ int cms_main(int argc, char **argv)
             break;
         case OPT_SECRETKEYID:
             if (secret_keyid != NULL) {
             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);
                 goto opthelp;
             }
             secret_keyid = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -442,8 +442,8 @@ int cms_main(int argc, char **argv)
             break;
         case OPT_ECONTENT_TYPE:
             if (econtent_type != NULL) {
             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);
                 goto opthelp;
             }
             econtent_type = OBJ_txt2obj(opt_arg(), 0);
index fb37f7dfecbfa377bf4c7d27095707053dff9637..8ebe1eca6d4589d3f2f2f949105d268472ef1cb8 100644 (file)
@@ -296,7 +296,7 @@ int req_main(int argc, char **argv)
             break;
         case OPT_SET_SERIAL:
             if (serial != NULL) {
             break;
         case OPT_SET_SERIAL:
             if (serial != NULL) {
-                /* Cannot be supplied twice */
+                BIO_printf(bio_err, "Serial number supplied twice\n");
                 goto opthelp;
             }
             serial = s2i_ASN1_INTEGER(NULL, opt_arg());
                 goto opthelp;
             }
             serial = s2i_ASN1_INTEGER(NULL, opt_arg());
index 9e5101259f158bf67920e3bced7b77d407641e64..20db458d10427879dd93361355e44888eaf2ffab 100644 (file)
@@ -262,7 +262,7 @@ int x509_main(int argc, char **argv)
             break;
         case OPT_SET_SERIAL:
             if (sno != NULL) {
             break;
         case OPT_SET_SERIAL:
             if (sno != NULL) {
-                /* Cannot be supplied twice */
+                BIO_printf(bio_err, "Serial number supplied twice\n");
                 goto opthelp;
             }
             if ((sno = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL)
                 goto opthelp;
             }
             if ((sno = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL)