diff options
| author | David Benjamin <davidben@chromium.org> | 2014-06-25 02:43:57 +0400 |
|---|---|---|
| committer | David Benjamin <davidben@chromium.org> | 2014-06-25 02:43:57 +0400 |
| commit | 3f6fa3db62c781768b567c6f02814c0d6d27fe7f (patch) | |
| tree | 32e82a650bdd525b80a05ca001c6e95f2a0c1b4e /ssl/s3_cbc.c | |
| parent | 54cdd120aa654b5eb0647e44bdcd94d2275f8761 (diff) | |
Remove more remnants of compression.
Change-Id: I721914594fc92a66d95c7ec2088f13b68e964103
Diffstat (limited to 'ssl/s3_cbc.c')
| -rw-r--r-- | ssl/s3_cbc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 6e2902a2..e37c4e76 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -166,12 +166,7 @@ int tls1_cbc_remove_padding(const SSL* s, padding_length = rec->data[rec->length-1]; - /* NB: if compression is in operation the first packet may not be of - * even length so the padding bug check cannot be performed. This bug - * workaround has been around since SSLeay so hopefully it is either - * fixed now or no buggy implementation supports compression [steve] - */ - if ( (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG) && !s->expand) + if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) { /* First packet is even in size, so check */ if ((memcmp(s->s3->read_sequence, "\0\0\0\0\0\0\0\0",8) == 0) && |