mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-14 04:24:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve diagnostics for invalid arguments in asn1parse -strparse

Browse Source 
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)
This commit is contained in:
Bernd Edlinger 2018-04-01 00:46:49 +02:00
parent 752837e066
commit b998745a45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/asn1pars.c
View File

@ -39,7 +39,7 @@ const OPTIONS asn1parse_options[] = {
{"dump", OPT_DUMP, 0, "unknown data in hex form"}, {"dump", OPT_DUMP, 0, "unknown data in hex form"},
{"dlimit", OPT_DLIMIT, 'p', {"dlimit", OPT_DLIMIT, 'p',
"dump the first arg bytes of unknown data in hex form"}, "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'"}, "offset; a series of these can be used to 'dig'"},
{OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"}, {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
{"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
@ -227,7 +227,7 @@ int asn1parse_main(int argc, char **argv)
int typ; int typ;
j = atoi(sk_OPENSSL_STRING_value(osk, i)); j = atoi(sk_OPENSSL_STRING_value(osk, i));
if (j <= 0 || j >= tmplen) { 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)); sk_OPENSSL_STRING_value(osk, i));
continue; continue;
} }