Commit 6984d166 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

oops, revert unrelated change

parent 5b9d0995

ssl/d1_enc.c

+1 −7
Original line number Diff line number Diff line
@@ -208,12 +208,6 @@ int dtls1_enc(SSL *s, int send) 
				rec->input[k]=j;

			l+=i;

			rec->length+=i;

if (rec->type == SSL3_RT_APPLICATION_DATA)

	{

	memset(rec->input, 63, 64);

	rec->length = 64;

	l = 64;

	}

			}



#ifdef KSSL_DEBUG
@@ -266,7 +260,7 @@ if (rec->type == SSL3_RT_APPLICATION_DATA) 
				}

			/* TLS 1.0 does not bound the number of padding bytes by the block size.

			 * All of them must have value 'padding_length'. */

			if (i + bs > (int)rec->length)

			if (i > (int)rec->length)

				{

				/* Incorrect padding. SSLerr() and ssl3_alert are done

				 * by caller: we don't want to reveal whether this is

ssl/t1_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -793,12 +793,6 @@ int tls1_enc(SSL *s, int send) 
				rec->input[k]=j;

			l+=i;

			rec->length+=i;

if (rec->type == SSL3_RT_APPLICATION_DATA)

	{

	memset(rec->input, 63, 64);

	rec->length = 64;

	l = 64;

	}

			}



#ifdef KSSL_DEBUG
@@ -895,8 +889,6 @@ if (rec->type == SSL3_RT_APPLICATION_DATA) 
			if (s->version >= TLS1_1_VERSION

				&& EVP_CIPHER_CTX_mode(ds) == EVP_CIPH_CBC_MODE)

				{

				if (bs > (int)rec->length)

					return -1;

				rec->data += bs;    /* skip the explicit IV */

				rec->input += bs;

				rec->length -= bs;