[Pkg-openssl-changes] r409 - in openssl/branches/lenny: debian ssl

[Kurt Roeckx]

Author: kroeckx
Date: 2009-06-08 17:46:18 +0000 (Mon, 08 Jun 2009)
New Revision: 409

Modified:
   openssl/branches/lenny/debian/changelog
   openssl/branches/lenny/ssl/d1_both.c
Log:
Fix CVE-2009-1387


Modified: openssl/branches/lenny/debian/changelog
===================================================================
--- openssl/branches/lenny/debian/changelog	2009-06-08 17:45:22 UTC (rev 408)
+++ openssl/branches/lenny/debian/changelog	2009-06-08 17:46:18 UTC (rev 409)
@@ -2,6 +2,7 @@
 
   * Fix DoS via a DTLS ChangeCipherSpec packet that occurs before ClientHello
     (CVE-2009-1386)
+  * Fix DoS via an out-of-sequence DTLS handshake message (CVE-2009-1387)
 
  -- Kurt Roeckx <kurt at roeckx.be>  Mon, 08 Jun 2009 19:40:22 +0200
 

Modified: openssl/branches/lenny/ssl/d1_both.c
===================================================================
--- openssl/branches/lenny/ssl/d1_both.c	2009-06-08 17:45:22 UTC (rev 408)
+++ openssl/branches/lenny/ssl/d1_both.c	2009-06-08 17:46:18 UTC (rev 409)
@@ -585,30 +585,31 @@
 			}
 		}
 
-	frag = dtls1_hm_fragment_new(frag_len);
-	if ( frag == NULL)
-		goto err;
+	if (frag_len)
+	{
+		frag = dtls1_hm_fragment_new(frag_len);
+		if ( frag == NULL)
+			goto err;
 
-	memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
+		memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
 
-	if (frag_len)
-		{
-		/* read the body of the fragment (header has already been read */
+		/* read the body of the fragment (header has already been read) */
 		i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
 			frag->fragment,frag_len,0);
 		if (i<=0 || (unsigned long)i!=frag_len)
 			goto err;
-		}
 
-	pq_64bit_init(&seq64);
-	pq_64bit_assign_word(&seq64, msg_hdr->seq);
+		pq_64bit_init(&seq64);
+		pq_64bit_assign_word(&seq64, msg_hdr->seq);
 
-	item = pitem_new(seq64, frag);
-	pq_64bit_free(&seq64);
-	if ( item == NULL)
-		goto err;
+		item = pitem_new(seq64, frag);
+		pq_64bit_free(&seq64);
+		if ( item == NULL)
+			goto err;
 
-	pqueue_insert(s->d1->buffered_messages, item);
+		pqueue_insert(s->d1->buffered_messages, item);
+	}
+
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err: