summaryrefslogtreecommitdiffstats
path: root/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2015-06-15 03:32:59 +0000
committerdoug <doug@openbsd.org>2015-06-15 03:32:59 +0000
commite30748dd3c2511101efea0cdecd95af3bcc0efcb (patch)
treef9a7ca3ed2756f398ac88962a87d1f3da3df98de /lib/libssl/s3_srvr.c
parentUpdate SSL_OP_* to remove ancient hacks that are no longer enabled. (diff)
downloadwireguard-openbsd-e30748dd3c2511101efea0cdecd95af3bcc0efcb.tar.xz
wireguard-openbsd-e30748dd3c2511101efea0cdecd95af3bcc0efcb.zip
Remove 1997's compat hack SSL_OP_SSLEAY_080_CLIENT_DH_BUG.
This is a hack for an old version of SSLeay which predates OpenSSL.
Diffstat (limited to 'lib/libssl/s3_srvr.c')
-rw-r--r--lib/libssl/s3_srvr.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c
index 921d7797809..7f6a5a0bbde 100644
--- a/lib/libssl/s3_srvr.c
+++ b/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.103 2015/05/15 11:00:14 jsg Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.104 2015/06/15 03:32:59 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1867,14 +1867,9 @@ ssl3_get_client_key_exchange(SSL *s)
goto truncated;
n2s(p, i);
if (n != i + 2) {
- if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) {
- SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
- SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
- goto err;
- } else {
- p -= 2;
- i = (int)n;
- }
+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+ SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
+ goto err;
}
if (n == 0L) {