From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 5 Aug 2016 16:59:32 +0000 (+0100)
Subject: Sanity check input length in OPENSSL_uni2asc().
X-Git-Tag: OpenSSL_1_0_1u~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7a4979815b3ce7d280ed30b3b1df2a23481c2331;p=oweals%2Fopenssl.git

Sanity check input length in OPENSSL_uni2asc().

Thanks to Hanno Böck for reporting this bug.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 39a43280316f1b9c45be5ac5b04f4f5c3f923686)

Conflicts:
	crypto/pkcs12/p12_utl.c
---

diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index a0b992eab6..e466f762ff 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -91,6 +91,10 @@ char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
 {
     int asclen, i;
     char *asctmp;
+
+    /* string must contain an even number of bytes */
+    if (unilen & 1)
+        return NULL;
     asclen = unilen / 2;
     /* If no terminating zero allow for one */
     if (!unilen || uni[unilen - 1])