From: Matt Caswell Date: Thu, 23 Jun 2016 18:54:06 +0000 (+0100) Subject: Fix ASN1_STRING_to_UTF8 could not convert NumericString X-Git-Tag: OpenSSL_1_1_0-pre6~354 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d6079a87db58ad17550b5d00a74512464e6a029e;p=oweals%2Fopenssl.git Fix ASN1_STRING_to_UTF8 could not convert NumericString tag2nbyte had -1 at 18th position, but underlying ASN1_mbstring_copy supports NumericString. tag2nbyte is also used in do_print_ex which will not be broken by setting 1 at 18th position of tag2nbyte Reviewed-by: Stephen Henson --- diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 59d51210c3..d419e9d2ce 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -282,7 +282,7 @@ static const signed char tag2nbyte[] = { -1, -1, -1, -1, -1, /* 5-9 */ -1, -1, 0, -1, /* 10-13 */ -1, -1, -1, -1, /* 15-17 */ - -1, 1, 1, /* 18-20 */ + 1, 1, 1, /* 18-20 */ -1, 1, 1, 1, /* 21-24 */ -1, 1, -1, /* 25-27 */ 4, -1, 2 /* 28-30 */