oops, revert unrelated change

diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c
index a8b75d7c968e99df4bc6e7a57a616d7916d68d24..becbab91c219617452c9bacda251dadaf93331ee 100644 (file)
--- 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 3f13934acbaafba26ebf656ce6a2d665eb423bd2..201ca9ad6de20299a52870bf85257357fb1ae43b 100644 (file)
--- 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;