From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sat, 31 Mar 2018 22:46:49 +0000 (+0200)
Subject: Improve diagnostics for invalid arguments in asn1parse -strparse
X-Git-Tag: OpenSSL_1_1_1-pre5~81
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b998745a4596c05f673ed8acdcaedcb4c5e208ad;p=oweals%2Fopenssl.git

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)
---

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 89069439a8..38ffb22d48 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -39,7 +39,7 @@ const 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"},
@@ -227,7 +227,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;
             }