From d1ef05b60b0377a5eac02b3693ea5a0161a51731 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 15 Oct 2014 13:57:21 +0000
Subject: Add cipher aliases for DHE (the correct name for EDH) and ECDHE (the
 correct name for EECDH). The EDH and EECDH aliases remain for backwards
 compatibility.

---
 src/lib/libssl/ssl_ciph.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 35e81e18f1..4bd085310f 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.69 2014/10/03 06:02:38 doug Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.70 2014/10/15 13:57:21 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -326,11 +326,21 @@ static const SSL_CIPHER cipher_aliases[] = {
 	},
 	
 	/* aliases combining key exchange and server authentication */
+	{
+		.name = SSL_TXT_DHE,
+		.algorithm_mkey = SSL_kDHE,
+		.algorithm_auth = ~SSL_aNULL,
+	},
 	{
 		.name = SSL_TXT_EDH,
 		.algorithm_mkey = SSL_kDHE,
 		.algorithm_auth = ~SSL_aNULL,
 	},
+	{
+		.name = SSL_TXT_ECDHE,
+		.algorithm_mkey = SSL_kECDHE,
+		.algorithm_auth = ~SSL_aNULL,
+	},
 	{
 		.name = SSL_TXT_EECDH,
 		.algorithm_mkey = SSL_kECDHE,
-- 
cgit v1.2.3-55-g6feb