summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2016-11-06 14:44:35 +0000
committerjsing <>2016-11-06 14:44:35 +0000
commit8067bfd61e7219c648a6bd4bfe6aa23a66758a00 (patch)
tree2fe861aa8b5f852099acb1afbfc18adf4aae6fe1
parent64259e1bf6d8c774d05e4e74b84a7bb104919a81 (diff)
downloadopenbsd-8067bfd61e7219c648a6bd4bfe6aa23a66758a00.tar.gz
openbsd-8067bfd61e7219c648a6bd4bfe6aa23a66758a00.tar.bz2
openbsd-8067bfd61e7219c648a6bd4bfe6aa23a66758a00.zip
Remove pointless check - without fixed ECDH, there is only one way to reach
this code path. ok beck@ bcook@
-rw-r--r--src/lib/libssl/s3_srvr.c9
1 files changed, 1 insertions, 8 deletions
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 @@
1/* $OpenBSD: s3_srvr.c,v 1.130 2016/11/06 13:35:32 jsing Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.131 2016/11/06 14:44:35 jsing 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 *
@@ -1836,13 +1836,6 @@ ssl3_get_client_key_exchange(SSL *s)
1836 1836
1837 if (n == 0L) { 1837 if (n == 0L) {
1838 /* Client Publickey was in Client Certificate */ 1838 /* Client Publickey was in Client Certificate */
1839
1840 if (alg_k & SSL_kECDHE) {
1841 al = SSL_AD_HANDSHAKE_FAILURE;
1842 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
1843 SSL_R_MISSING_TMP_ECDH_KEY);
1844 goto f_err;
1845 }
1846 if (((clnt_pub_pkey = X509_get_pubkey( 1839 if (((clnt_pub_pkey = X509_get_pubkey(
1847 s->session->peer)) == NULL) || 1840 s->session->peer)) == NULL) ||
1848 (clnt_pub_pkey->type != EVP_PKEY_EC)) { 1841 (clnt_pub_pkey->type != EVP_PKEY_EC)) {