From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 4 May 2016 15:09:06 +0000 (+0100)
Subject: Fix name length limit check.
X-Git-Tag: OpenSSL_1_1_0-pre6~929
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e0d184ac1dde845ba9574872e2ae5c903c81dff;p=oweals%2Fopenssl.git

Fix name length limit check.

The name length limit check in x509_name_ex_d2i() includes
the containing structure as well as the actual X509_NAME. This will
cause large CRLs to be rejected.

Fix by limiting the length passed to ASN1_item_ex_d2i() which will
then return an error if the passed X509_NAME exceeds the length.

RT#4531

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 72682fed70..662de64ef0 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -194,10 +194,8 @@ static int x509_name_ex_d2i(ASN1_VALUE **val,
     int i, j, ret;
     STACK_OF(X509_NAME_ENTRY) *entries;
     X509_NAME_ENTRY *entry;
-    if (len > X509_NAME_MAX) {
-        ASN1err(ASN1_F_X509_NAME_EX_D2I, ASN1_R_TOO_LONG);
-        return 0;
-    }
+    if (len > X509_NAME_MAX)
+        len = X509_NAME_MAX;
     q = p;
 
     /* Get internal representation of Name */