Bug 305835: Remove NSS_ENABLE_ECC ifdefs in libssl. r=wtc,nelsonb
authorwtchang%redhat.com
Tue, 16 May 2006 01:14:43 +0000
changeset 7059 cf7521a6661bcc008bdd3bf1704a805d955ab60d
parent 7055 b4fdd7dfac22da8d287e0383e508482eccf150aa
child 7060 b78d5a23982433d7e9b031708b1c0db87e627f00
push idunknown
push userunknown
push dateunknown
reviewerswtc, nelsonb
bugs305835
Bug 305835: Remove NSS_ENABLE_ECC ifdefs in libssl. r=wtc,nelsonb
security/nss/lib/ssl/sslproto.h
--- a/security/nss/lib/ssl/sslproto.h
+++ b/security/nss/lib/ssl/sslproto.h
@@ -160,17 +160,16 @@
 
 #define TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA     0x0062
 #define TLS_RSA_EXPORT1024_WITH_RC4_56_SHA      0x0064
 
 #define TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x0063
 #define TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA  0x0065
 #define TLS_DHE_DSS_WITH_RC4_128_SHA            0x0066
 
-#ifdef NSS_ENABLE_ECC
 #define TLS_ECDH_ECDSA_WITH_NULL_SHA            0xC001
 #define TLS_ECDH_ECDSA_WITH_RC4_128_SHA         0xC002
 #define TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    0xC003
 #define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     0xC004
 #define TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA     0xC005
 
 #define TLS_ECDHE_ECDSA_WITH_NULL_SHA           0xC006
 #define TLS_ECDHE_ECDSA_WITH_RC4_128_SHA        0xC007
@@ -190,17 +189,16 @@
 #define TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA      0xC013
 #define TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA      0xC014
 
 #define TLS_ECDH_anon_WITH_NULL_SHA             0xC015
 #define TLS_ECDH_anon_WITH_RC4_128_SHA          0xC016
 #define TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA     0xC017
 #define TLS_ECDH_anon_WITH_AES_128_CBC_SHA      0xC018
 #define TLS_ECDH_anon_WITH_AES_256_CBC_SHA      0xC019
-#endif /* NSS_ENABLE_ECC */
 
 /* Netscape "experimental" cipher suites. */
 #define SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA	0xffe0
 #define SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA	0xffe1
 
 /* New non-experimental openly spec'ed versions of those cipher suites. */
 #define SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA 	0xfeff
 #define SSL_RSA_FIPS_WITH_DES_CBC_SHA      	0xfefe