Fix ASN.1 parsing of certain invalid structures that can result
authorMark J. Cox <mark@openssl.org>
Thu, 28 Sep 2006 13:20:44 +0000 (13:20 +0000)
committerMark J. Cox <mark@openssl.org>
Thu, 28 Sep 2006 13:20:44 +0000 (13:20 +0000)
in a denial of service.  (CVE-2006-2937)  [Steve Henson]

CHANGES
crypto/asn1/tasn_dec.c

diff --git a/CHANGES b/CHANGES
index 11988ef..6b26b19 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8d and 0.9.9  [xx XXX xxxx]
 
+  *) Fix ASN.1 parsing of certain invalid structures that can result
+     in a denial of service.  (CVE-2006-2937)  [Steve Henson]
+
   *) Fix buffer overflow in SSL_get_shared_ciphers() function.
      (CVE-2006-3738) [Tavis Ormandy and Will Drewry, Google Security Team]
 
index fe1bfd0..c32510f 100644 (file)
@@ -832,6 +832,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
                }
        else if (ret == -1)
                return -1;
+        ret = 0;
        /* SEQUENCE, SET and "OTHER" are left in encoded form */
        if ((utype == V_ASN1_SEQUENCE)
                || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER))