[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d6079a87db58ad17550b5d00a74512464e6a029e (commit)
      from  51a3b763c31afcf294af73d32f7451c9dee7cd76 (commit)


- Log -----------------------------------------------------------------
commit d6079a87db58ad17550b5d00a74512464e6a029e
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 23 19:54:06 2016 +0100

    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 at openssl.org>

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

Summary of changes:
 crypto/asn1/a_strex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 59d5121..d419e9d 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 */