From 489dbb57ee3abd9d28ef0c63007d420b6a34b1f4 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Fri, 17 Jul 2015 07:04:41 +0000
Subject: 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@
---
 src/usr.bin/openssl/s_server.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/usr.bin/openssl/s_server.c')

diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 61b70a5569..066588f01b 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.11 2015/06/15 05:16:56 doug Exp $ */
+/* $OpenBSD: s_server.c,v 1.12 2015/07/17 07:04:41 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1692,10 +1692,6 @@ init_ssl_connection(SSL * con)
 #endif
 	if (SSL_cache_hit(con))
 		BIO_printf(bio_s_out, "Reused session-id\n");
-	if (SSL_ctrl(con, SSL_CTRL_GET_FLAGS, 0, NULL) &
-	    TLS1_FLAGS_TLS_PADDING_BUG)
-		BIO_printf(bio_s_out,
-		    "Peer has incorrect TLSv1 block padding\n");
 	BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",
 	    SSL_get_secure_renegotiation_support(con) ? "" : " NOT");
 	if (keymatexportlabel != NULL) {
-- 
cgit v1.2.3-55-g6feb