Commit 889f39c7 authored by Daniel Kahn Gillmor's avatar Daniel Kahn Gillmor Committed by Dr. Stephen Henson
Browse files

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.
parent 0b30fc90

ssl/s3_lib.c

+6 −6
Original line number Diff line number Diff line
@@ -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,

ssl/ssl3.h

+12 −6
Original line number Diff line number Diff line
@@ -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