From 0fed0b531b893a421795b86e91da5c89afa84e40 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 7 Sep 2014 12:16:23 +0000
Subject: Remove SSL_kDHr, SSL_kDHd and SSL_aDH. No supported ciphersuites use
 them, nor do we plan on supporting them.

ok guenther@
---
 src/lib/libssl/d1_srvr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/libssl/d1_srvr.c')

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 4532a07da5..051d1e1ccf 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.37 2014/08/24 14:36:45 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.38 2014/09/07 12:16:23 jsing Exp $ */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
@@ -462,8 +462,7 @@ dtls1_accept(SSL *s)
 			/* only send if a DH key exchange or
 			 * RSA but we have a sign only certificate */
 			if (s->s3->tmp.use_rsa_tmp
-			|| (alg_k & (SSL_kDHE|SSL_kDHr|SSL_kDHd))
-			|| (alg_k & SSL_kECDHE)
+			|| (alg_k & (SSL_kDHE|SSL_kECDHE))
 			|| ((alg_k & SSL_kRSA)
 			&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
 			)
-- 
cgit v1.2.3-55-g6feb