Improve diagnostics for invalid arguments in asn1parse -strparse

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5826)

(cherry picked from commit b998745a4596c05f673ed8acdcaedcb4c5e208ad)

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 39b9f8b0c89093a97030a37f2ed6aaa3aacf4efa..dcd132fcfaa0a09b8a9e6cb65eef57c952d44e41 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -41,7 +41,7 @@ OPTIONS asn1parse_options[] = {
     {"dump", OPT_DUMP, 0, "unknown data in hex form"},
     {"dlimit", OPT_DLIMIT, 'p',
      "dump the first arg bytes of unknown data in hex form"},
-    {"strparse", OPT_STRPARSE, 's',
+    {"strparse", OPT_STRPARSE, 'p',
      "offset; a series of these can be used to 'dig'"},
     {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
     {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
@@ -213,7 +213,7 @@ int asn1parse_main(int argc, char **argv)
             int typ;
             j = atoi(sk_OPENSSL_STRING_value(osk, i));
             if (j <= 0 || j >= tmplen) {
-                BIO_printf(bio_err, "'%s' is an invalid number\n",
+                BIO_printf(bio_err, "'%s' is out of range\n",
                            sk_OPENSSL_STRING_value(osk, i));
                 continue;
             }