svn commit: r254107 - head/crypto/openssl/ssl

[Xin LI]

Author: delphij
Date: Thu Aug  8 22:29:35 2013
New Revision: 254107
URL: http://svnweb.freebsd.org/changeset/base/254107

Log:
  MFV r254106 (OpenSSL bugfix for RT #2984):
  
  Check DTLS_BAD_VER for version number.
  
  The version check for DTLS1_VERSION was redundant as
  DTLS1_VERSION > TLS1_1_VERSION, however we do need to
  check for DTLS1_BAD_VER for compatibility.
  
  Requested by:	zi
  Approved by:	benl

Modified:
  head/crypto/openssl/ssl/s3_cbc.c
Directory Properties:
  head/crypto/openssl/   (props changed)

Modified: head/crypto/openssl/ssl/s3_cbc.c
==============================================================================
--- head/crypto/openssl/ssl/s3_cbc.c	Thu Aug  8 22:26:03 2013	(r254106)
+++ head/crypto/openssl/ssl/s3_cbc.c	Thu Aug  8 22:29:35 2013	(r254107)
@@ -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 >= TLS1_1_VERSION || s->version == DTLS1_VERSION)
+	if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER)
 		{
 		/* These lengths are all public so we can test them in
 		 * non-constant time.