summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_server.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/usr.bin/openssl/s_server.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/usr.bin/openssl/s_server.c')
-rw-r--r--src/usr.bin/openssl/s_server.c6
1 files changed, 1 insertions, 5 deletions
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 @@
1/* $OpenBSD: s_server.c,v 1.11 2015/06/15 05:16:56 doug Exp $ */ 1/* $OpenBSD: s_server.c,v 1.12 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 *
@@ -1692,10 +1692,6 @@ init_ssl_connection(SSL * con)
1692#endif 1692#endif
1693 if (SSL_cache_hit(con)) 1693 if (SSL_cache_hit(con))
1694 BIO_printf(bio_s_out, "Reused session-id\n"); 1694 BIO_printf(bio_s_out, "Reused session-id\n");
1695 if (SSL_ctrl(con, SSL_CTRL_GET_FLAGS, 0, NULL) &
1696 TLS1_FLAGS_TLS_PADDING_BUG)
1697 BIO_printf(bio_s_out,
1698 "Peer has incorrect TLSv1 block padding\n");
1699 BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n", 1695 BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",
1700 SSL_get_secure_renegotiation_support(con) ? "" : " NOT"); 1696 SSL_get_secure_renegotiation_support(con) ? "" : " NOT");
1701 if (keymatexportlabel != NULL) { 1697 if (keymatexportlabel != NULL) {