The correct name for EDH is DHE, likewise EECDH should be ECDHE.

Based on changes to OpenSSL trunk.

ok beck@ miod@

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 004fd6e04f..552667f6c1 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.30 2014/07/12 13:11:53 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.31 2014/07/12 22:33:39 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -984,7 +984,7 @@ dtls1_send_client_key_exchange(SSL *s)
                             s->session->master_key,
                             tmp_buf, sizeof tmp_buf);
                         OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
-                } else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                } else if (alg_k & (SSL_kDHE|SSL_kDHr|SSL_kDHd)) {
                         DH *dh_srvr, *dh_clnt;
 
                         if (s->session->sess_cert->peer_dh_tmp != NULL)
@@ -1037,7 +1037,7 @@ dtls1_send_client_key_exchange(SSL *s)
                         DH_free(dh_clnt);
 
                         /* perhaps clean things up a bit EAY EAY EAY EAY*/
-                } else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) {
+                } else if (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) {
                         const EC_GROUP *srvr_group = NULL;
                         EC_KEY *tkey;
                         int ecdh_clnt_cert = 0;