mturk / rpms / openssl

Forked from rpms/openssl 3 years ago
Clone
499412d
openssl/ssl/t1_enc.c     1.35.2.1 -> 1.35.2.2
499412d
499412d
--- openssl/ssl/t1_enc.c 2005/09/30 23:38:20 1.35.2.1
499412d
+++ openssl/ssl/t1_enc.c 2006/05/07 12:27:48 1.35.2.2
499412d
@@ -628,7 +628,15 @@
499412d
 			{
499412d
 			ii=i=rec->data[l-1]; /* padding_length */
499412d
 			i++;
499412d
-			if (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG)
499412d
+			/* NB: if compression is in operation the first packet
499412d
+			 * may not be of even length so the padding bug check
499412d
+			 * cannot be performed. This bug workaround has been
499412d
+			 * around since SSLeay so hopefully it is either fixed
499412d
+			 * now or no buggy implementation supports compression 
499412d
+			 * [steve]
499412d
+			 */
499412d
+			if ( (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG)
499412d
+				&& !s->expand)
499412d
 				{
499412d
 				/* First packet is even in size, so check */
499412d
 				if ((memcmp(s->s3->read_sequence,
499412d