From 6984d16671e831a23261b4f0a67cb000ddee6a7b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 10 May 2012 13:38:18 +0000 Subject: [PATCH] oops, revert unrelated change --- ssl/d1_enc.c | 8 +------- ssl/t1_enc.c | 8 -------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c index a8b75d7c96..becbab91c2 100644 --- a/ssl/d1_enc.c +++ b/ssl/d1_enc.c @@ -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 diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 3f13934acb..201ca9ad6d 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -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; -- 2.25.1