From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 26 Mar 2013 14:46:18 +0000 (+0000)
Subject: Remove versions test from dtls1_buffer_message
X-Git-Tag: master-post-reformat~1372
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=9cf0f187542f080031f83c5e538d3e1872ac09d1;ds=sidebyside

Remove versions test from dtls1_buffer_message

Since this is always called from DTLS code it is safe to assume the header
length should be the DTLS value. This avoids the need to check the version
number and should work with any version of DTLS (not just 1.0).
---

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index ee945cbd3a..262299b154 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1037,7 +1037,7 @@ dtls1_buffer_message(SSL *s, int is_ccs)
 	if ( is_ccs)
 		{
 		OPENSSL_assert(s->d1->w_msg_hdr.msg_len + 
-			       ((s->version==DTLS1_VERSION)?DTLS1_CCS_HEADER_LENGTH:3) == (unsigned int)s->init_num);
+			       DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);
 		}
 	else
 		{