aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-06-23 19:54:06 +0100
committerMatt Caswell <matt@openssl.org>2016-06-23 20:51:28 +0100
commitbd598cc405e981de259a07558e600b5a9ef64bd6 (patch)
tree1b7d7aa8bdf7e43b8f6135baef4be4ad33549f45
parentecb044db58b85c2329cfc1c1e196cc1b8302ca53 (diff)
downloadopenssl-bd598cc405e981de259a07558e600b5a9ef64bd6.tar.gz
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 <steve@openssl.org> (cherry picked from commit d6079a87db58ad17550b5d00a74512464e6a029e)
-rw-r--r--crypto/asn1/a_strex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 35fd44cd22..2d562f9345 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -337,7 +337,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 */