From dd1a8feef3ef54128aab53a720a711d669b98c21 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sat, 18 Jul 2015 01:42:26 +0000
Subject: Remove support for the SSL_OP_TLS_D5_BUG compat hack from SSLeay.

This is a 17 year old workaround from SSLeay 0.9.0b.  It was for
clients that send RSA client key exchange in TLS using SSLv3 format
(no length prefix).

ok jsing@
---
 src/lib/libssl/s3_srvr.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/lib/libssl/s3_srvr.c')

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index e70f8af440..cd5bc2a6cb 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.110 2015/07/14 05:16:47 doug Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.111 2015/07/18 01:42:26 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1708,13 +1708,9 @@ ssl3_get_client_key_exchange(SSL *s)
 				goto truncated;
 			n2s(p, i);
 			if (n != i + 2) {
-				if (!(s->options & SSL_OP_TLS_D5_BUG)) {
-					SSLerr(
-					    SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-					    SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
-					goto err;
-				} else
-					p -= 2;
+				SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+				    SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
+				goto err;
 			} else
 				n = i;
 		}
-- 
cgit v1.2.3-55-g6feb