From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 20 Dec 2013 06:42:03 +0000 (-0500)
Subject: change SSL3_CK_EDH_* to SSL_CK_DHE_* (with backward-compatibility)
X-Git-Tag: master-post-reformat~1009
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=889f39c70ffd2971de9bf076fa0c11bca49aa581;p=oweals%2Fopenssl.git

change SSL3_CK_EDH_* to SSL_CK_DHE_* (with backward-compatibility)

This change normalizes the SSL_CK_DHE_ #defines to use the common term
"DHE", while permitting older code that uses the more uncommon "EDH"
constants to compile properly.
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index ef7a5d7e05..2f822bd6d1 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -429,7 +429,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
-	SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
+	SSL3_CK_DHE_DSS_DES_40_CBC_SHA,
 	SSL_kDHE,
 	SSL_aDSS,
 	SSL_DES,
@@ -445,7 +445,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
-	SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
+	SSL3_CK_DHE_DSS_DES_64_CBC_SHA,
 	SSL_kDHE,
 	SSL_aDSS,
 	SSL_DES,
@@ -461,7 +461,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
-	SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
+	SSL3_CK_DHE_DSS_DES_192_CBC3_SHA,
 	SSL_kDHE,
 	SSL_aDSS,
 	SSL_3DES,
@@ -477,7 +477,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
-	SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
+	SSL3_CK_DHE_RSA_DES_40_CBC_SHA,
 	SSL_kDHE,
 	SSL_aRSA,
 	SSL_DES,
@@ -493,7 +493,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
-	SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
+	SSL3_CK_DHE_RSA_DES_64_CBC_SHA,
 	SSL_kDHE,
 	SSL_aRSA,
 	SSL_DES,
@@ -509,7 +509,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	{
 	1,
 	SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
-	SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
+	SSL3_CK_DHE_RSA_DES_192_CBC3_SHA,
 	SSL_kDHE,
 	SSL_aRSA,
 	SSL_3DES,
diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index 5c5a5e8f4a..17dd50c069 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -149,12 +149,18 @@ extern "C" {
 #define SSL3_CK_DH_RSA_DES_64_CBC_SHA		0x0300000F
 #define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 	0x03000010
 
-#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA		0x03000011
-#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA		0x03000012
-#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA	0x03000013
-#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA		0x03000014
-#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA		0x03000015
-#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA	0x03000016
+#define SSL3_CK_DHE_DSS_DES_40_CBC_SHA		0x03000011
+#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          SSL3_CK_DHE_DSS_DES_40_CBC_SHA
+#define SSL3_CK_DHE_DSS_DES_64_CBC_SHA		0x03000012
+#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA		SSL3_CK_DHE_DSS_DES_64_CBC_SHA
+#define SSL3_CK_DHE_DSS_DES_192_CBC3_SHA	0x03000013
+#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA	SSL3_CK_DHE_DSS_DES_192_CBC3_SHA
+#define SSL3_CK_DHE_RSA_DES_40_CBC_SHA		0x03000014
+#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA		SSL3_CK_DHE_RSA_DES_40_CBC_SHA
+#define SSL3_CK_DHE_RSA_DES_64_CBC_SHA		0x03000015
+#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA		SSL3_CK_DHE_RSA_DES_64_CBC_SHA
+#define SSL3_CK_DHE_RSA_DES_192_CBC3_SHA	0x03000016
+#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA	SSL3_CK_DHE_RSA_DES_192_CBC3_SHA
 
 #define SSL3_CK_ADH_RC4_40_MD5			0x03000017
 #define SSL3_CK_ADH_RC4_128_MD5			0x03000018