summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authordoug <>2015-07-17 07:04:41 +0000
committerdoug <>2015-07-17 07:04:41 +0000
commit489dbb57ee3abd9d28ef0c63007d420b6a34b1f4 (patch)
treea3867fae7dea1b800ba72ab3973817fa74caaaab /src/lib/libssl/t1_enc.c
parent674f02353e7f32c4cbe82e8eaa5b4220714a9bba (diff)
downloadopenbsd-489dbb57ee3abd9d28ef0c63007d420b6a34b1f4.tar.gz
openbsd-489dbb57ee3abd9d28ef0c63007d420b6a34b1f4.tar.bz2
openbsd-489dbb57ee3abd9d28ef0c63007d420b6a34b1f4.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 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index b48e248b23..5cd1688a37 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.79 2015/07/17 07:04:41 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -875,10 +875,6 @@ tls1_enc(SSL *s, int send)
875 875
876 /* we need to add 'i' padding bytes of value j */ 876 /* we need to add 'i' padding bytes of value j */
877 j = i - 1; 877 j = i - 1;
878 if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) {
879 if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
880 j++;
881 }
882 for (k = (int)l; k < (int)(l + i); k++) 878 for (k = (int)l; k < (int)(l + i); k++)
883 rec->input[k] = j; 879 rec->input[k] = j;
884 l += i; 880 l += i;