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.

4 files changed, 32 insertions, 8 deletions

diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 1e9e846195..2b1ceaf2c7 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.67 2014/10/03 13:58:18 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.68 2014/10/15 13:57:21 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -259,11 +259,13 @@ extern "C" {
 
 #define SSL_TXT_DSS             "DSS"
 #define SSL_TXT_DH              "DH"
-#define SSL_TXT_EDH             "EDH" /* same as "kEDH:-ADH" */
+#define SSL_TXT_DHE             "DHE" /* same as "kDHE:-ADH" */
+#define SSL_TXT_EDH             "EDH" /* previous name for DHE */
 #define SSL_TXT_ADH             "ADH"
 #define SSL_TXT_RSA             "RSA"
 #define SSL_TXT_ECDH            "ECDH"
-#define SSL_TXT_EECDH           "EECDH" /* same as "kEECDH:-AECDH" */
+#define SSL_TXT_ECDHE           "ECDHE" /* same as "kECDHE:-AECDH" */
+#define SSL_TXT_EECDH           "EECDH" /* previous name for ECDHE */
 #define SSL_TXT_AECDH           "AECDH"
 #define SSL_TXT_ECDSA           "ECDSA"
 #define SSL_TXT_KRB5            "KRB5"
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 35e81e18f1..4bd085310f 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/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.
  *
@@ -327,11 +327,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,
                 .algorithm_auth = ~SSL_aNULL,
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 1e9e846195..2b1ceaf2c7 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.67 2014/10/03 13:58:18 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.68 2014/10/15 13:57:21 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -259,11 +259,13 @@ extern "C" {
 
 #define SSL_TXT_DSS             "DSS"
 #define SSL_TXT_DH              "DH"
-#define SSL_TXT_EDH             "EDH" /* same as "kEDH:-ADH" */
+#define SSL_TXT_DHE             "DHE" /* same as "kDHE:-ADH" */
+#define SSL_TXT_EDH             "EDH" /* previous name for DHE */
 #define SSL_TXT_ADH             "ADH"
 #define SSL_TXT_RSA             "RSA"
 #define SSL_TXT_ECDH            "ECDH"
-#define SSL_TXT_EECDH           "EECDH" /* same as "kEECDH:-AECDH" */
+#define SSL_TXT_ECDHE           "ECDHE" /* same as "kECDHE:-AECDH" */
+#define SSL_TXT_EECDH           "EECDH" /* previous name for ECDHE */
 #define SSL_TXT_AECDH           "AECDH"
 #define SSL_TXT_ECDSA           "ECDSA"
 #define SSL_TXT_KRB5            "KRB5"
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.
  *
@@ -327,11 +327,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,
                 .algorithm_auth = ~SSL_aNULL,