diff options
| author |   doug <doug@openbsd.org> | 2015-07-17 07:04:40 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-07-17 07:04:40 +0000 |
| commit | 4314af3e2aeeba04584bc9d3db28b8832a21028b (patch) | |
| tree | 8ddce1b1326e4a006ba05ab304b9f030690c404e /lib/libssl/t1_enc.c | |
| parent | Initialize client fd to -1 as well, from Bobby Powers. (diff) | |
| download | wireguard-openbsd-4314af3e2aeeba04584bc9d3db28b8832a21028b.tar.xz wireguard-openbsd-4314af3e2aeeba04584bc9d3db28b8832a21028b.zip | |
Remove workaround for TLS padding bug from SSLeay days.
OpenSSL doesn't remember which clients were impacted and the
functionality has been broken in their stable releases for 2 years.
Based on OpenSSL commit a8e4ac6a2fe67c19672ecf0c6aeafa15801ce3a5.
ok jsing@
Diffstat (limited to 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index b48e248b239..5cd1688a37f 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.79 2015/07/17 07:04:41 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -875,10 +875,6 @@ tls1_enc(SSL *s, int send) /* we need to add 'i' padding bytes of value j */ j = i - 1; - if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) { - if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG) - j++; - } for (k = (int)l; k < (int)(l + i); k++) rec->input[k] = j; l += i; |