summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authordoug <>2015-07-18 01:42:26 +0000
committerdoug <>2015-07-18 01:42:26 +0000
commitdd1a8feef3ef54128aab53a720a711d669b98c21 (patch)
tree1a2eafb2edfce20682d1b9504fb22e3bee4c0ab0 /src/lib/libssl/s3_srvr.c
parentba11ff67815e3454d26b4f7a06aea5dd1293acf2 (diff)
downloadopenbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.tar.gz
openbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.tar.bz2
openbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.zip
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@
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c12
1 files changed, 4 insertions, 8 deletions
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 @@
1/* $OpenBSD: s3_srvr.c,v 1.110 2015/07/14 05:16:47 doug Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.111 2015/07/18 01:42:26 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 *
@@ -1708,13 +1708,9 @@ ssl3_get_client_key_exchange(SSL *s)
1708 goto truncated; 1708 goto truncated;
1709 n2s(p, i); 1709 n2s(p, i);
1710 if (n != i + 2) { 1710 if (n != i + 2) {
1711 if (!(s->options & SSL_OP_TLS_D5_BUG)) { 1711 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
1712 SSLerr( 1712 SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
1713 SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, 1713 goto err;
1714 SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
1715 goto err;
1716 } else
1717 p -= 2;
1718 } else 1714 } else
1719 n = i; 1715 n = i;
1720 } 1716 }