summaryrefslogtreecommitdiff
path: root/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2016-11-06 14:44:36 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2016-11-06 14:44:36 +0000
commit0db379df0e19e7318958d936554bc6d19df08e72 (patch)
treebf464f78f31ffcc7f08c418f2631d57a91b9f80e /lib/libssl/s3_srvr.c
parent8359597b36a3877c0caa28ec30f0a76c3236b297 (diff)
Remove pointless check - without fixed ECDH, there is only one way to reach
this code path. ok beck@ bcook@
Diffstat (limited to 'lib/libssl/s3_srvr.c')
-rw-r--r--lib/libssl/s3_srvr.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c
index 9daed0b52a0..f3649557166 100644
--- a/lib/libssl/s3_srvr.c
+++ b/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.130 2016/11/06 13:35:32 jsing Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.131 2016/11/06 14:44:35 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1836,13 +1836,6 @@ ssl3_get_client_key_exchange(SSL *s)
if (n == 0L) {
/* Client Publickey was in Client Certificate */
-
- if (alg_k & SSL_kECDHE) {
- al = SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
- SSL_R_MISSING_TMP_ECDH_KEY);
- goto f_err;
- }
if (((clnt_pub_pkey = X509_get_pubkey(
s->session->peer)) == NULL) ||
(clnt_pub_pkey->type != EVP_PKEY_EC)) {