From 8067bfd61e7219c648a6bd4bfe6aa23a66758a00 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 6 Nov 2016 14:44:35 +0000
Subject: Remove pointless check - without fixed ECDH, there is only one way to
 reach this code path.

ok beck@ bcook@
---
 src/lib/libssl/s3_srvr.c | 9 +--------
 1 file changed, 1 insertion(+), 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 9daed0b52a..f364955716 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.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)) {
-- 
cgit v1.2.3-55-g6feb