[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  47ed1f8161c9888bff10ac26b90845cdff859661 (commit)
      from  ac62a25e2ef8569542a69ac4fb04c59d899581bc (commit)


- Log -----------------------------------------------------------------
commit 47ed1f8161c9888bff10ac26b90845cdff859661
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Apr 1 00:46:49 2018 +0200

    Improve diagnostics for invalid arguments in asn1parse -strparse
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/5826)
    
    (cherry picked from commit b998745a4596c05f673ed8acdcaedcb4c5e208ad)

-----------------------------------------------------------------------

Summary of changes:
 apps/asn1pars.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 39b9f8b..dcd132f 100644
--- 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;
             }