From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 23 Sep 2006 17:29:49 +0000 (+0000)
Subject: Submitted by: Brad Spencer <spencer@jacknife.org>
X-Git-Tag: OpenSSL_0_9_8k^2~1126
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=89c9c6673688e7b954a1c3ef71f129c857a7db19

Submitted by: Brad Spencer <spencer@jacknife.org>
Reviewed by: steve
---

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 5c7fcd124e..0b099325e1 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -837,8 +837,14 @@ start:
 			dest = s->d1->alert_fragment;
 			dest_len = &s->d1->alert_fragment_len;
 			}
-		else	/* else it's a CCS message */
-			OPENSSL_assert(rr->type == SSL3_RT_CHANGE_CIPHER_SPEC);
+                /* else it's a CCS message, or it's wrong */
+                else if (rr->type != SSL3_RT_CHANGE_CIPHER_SPEC)
+                        {
+                          /* Not certain if this is the right error handling */
+                          al=SSL_AD_UNEXPECTED_MESSAGE;
+                          SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
+                          goto f_err;
+                        }
 
 
 		if (dest_maxlen > 0)