From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 12 Feb 2013 15:09:44 +0000 (+0000)
Subject: Check DTLS_BAD_VER for version number.
X-Git-Tag: OpenSSL_0_9_8za~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8655eb21a7f9a313db18daa6ccaed928fb6027c;p=thirdparty%2Fopenssl.git

Check DTLS_BAD_VER for version number.

Need to check DTLS_BAD_VER as well as DTLS1_VERSION.
PR:2984
(cherry picked from commit 6a14feb048c0b7ad4da341fca364171e273da325)
---

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 6b9b11bd50e..9f57fc9a622 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s,
 	unsigned padding_length, good, to_check, i;
 	const unsigned overhead = 1 /* padding length byte */ + mac_size;
 	/* Check if version requires explicit IV */
-	if (s->version == DTLS1_VERSION)
+	if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER)
 		{
 		/* These lengths are all public so we can test them in
 		 * non-constant time.