Index: net/third_party/nss/ssl/sslenum.c |
diff --git a/net/third_party/nss/ssl/sslenum.c b/net/third_party/nss/ssl/sslenum.c |
index d601207f789c1fac6e24d1fe4f006af3a8b8bafa..a036627f9ed8e1e0f95a1a74a80c5fb5e0ecef21 100644 |
--- a/net/third_party/nss/ssl/sslenum.c |
+++ b/net/third_party/nss/ssl/sslenum.c |
@@ -49,7 +49,7 @@ |
* the fifth one. |
*/ |
const PRUint16 SSL_ImplementedCiphers[] = { |
-#ifdef NSS_ENABLE_ECC |
+#ifndef NSS_DISABLE_ECC |
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, |
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, |
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, |
@@ -67,7 +67,7 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, |
TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, |
TLS_ECDHE_RSA_WITH_RC4_128_SHA, |
-#endif /* NSS_ENABLE_ECC */ |
+#endif /* NSS_DISABLE_ECC */ |
TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, |
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, |
@@ -80,11 +80,11 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, |
TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, |
TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, |
- SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, |
- SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, |
+ TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, |
+ TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA, |
TLS_DHE_DSS_WITH_RC4_128_SHA, |
-#ifdef NSS_ENABLE_ECC |
+#ifndef NSS_DISABLE_ECC |
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, |
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, |
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, |
@@ -93,7 +93,7 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, |
TLS_ECDH_ECDSA_WITH_RC4_128_SHA, |
TLS_ECDH_RSA_WITH_RC4_128_SHA, |
-#endif /* NSS_ENABLE_ECC */ |
+#endif /* NSS_DISABLE_ECC */ |
TLS_RSA_WITH_AES_128_GCM_SHA256, |
TLS_RSA_WITH_AES_128_CBC_SHA, |
@@ -104,34 +104,34 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
TLS_RSA_WITH_CAMELLIA_256_CBC_SHA, |
TLS_RSA_WITH_SEED_CBC_SHA, |
SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA, |
- SSL_RSA_WITH_3DES_EDE_CBC_SHA, |
- SSL_RSA_WITH_RC4_128_SHA, |
- SSL_RSA_WITH_RC4_128_MD5, |
+ TLS_RSA_WITH_3DES_EDE_CBC_SHA, |
+ TLS_RSA_WITH_RC4_128_SHA, |
+ TLS_RSA_WITH_RC4_128_MD5, |
/* 56-bit DES "domestic" cipher suites */ |
- SSL_DHE_RSA_WITH_DES_CBC_SHA, |
- SSL_DHE_DSS_WITH_DES_CBC_SHA, |
+ TLS_DHE_RSA_WITH_DES_CBC_SHA, |
+ TLS_DHE_DSS_WITH_DES_CBC_SHA, |
SSL_RSA_FIPS_WITH_DES_CBC_SHA, |
- SSL_RSA_WITH_DES_CBC_SHA, |
+ TLS_RSA_WITH_DES_CBC_SHA, |
/* export ciphersuites with 1024-bit public key exchange keys */ |
TLS_RSA_EXPORT1024_WITH_RC4_56_SHA, |
TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA, |
/* export ciphersuites with 512-bit public key exchange keys */ |
- SSL_RSA_EXPORT_WITH_RC4_40_MD5, |
- SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5, |
+ TLS_RSA_EXPORT_WITH_RC4_40_MD5, |
+ TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5, |
/* ciphersuites with no encryption */ |
-#ifdef NSS_ENABLE_ECC |
+#ifndef NSS_DISABLE_ECC |
TLS_ECDHE_ECDSA_WITH_NULL_SHA, |
TLS_ECDHE_RSA_WITH_NULL_SHA, |
TLS_ECDH_RSA_WITH_NULL_SHA, |
TLS_ECDH_ECDSA_WITH_NULL_SHA, |
-#endif /* NSS_ENABLE_ECC */ |
- SSL_RSA_WITH_NULL_SHA, |
+#endif /* NSS_DISABLE_ECC */ |
+ TLS_RSA_WITH_NULL_SHA, |
TLS_RSA_WITH_NULL_SHA256, |
- SSL_RSA_WITH_NULL_MD5, |
+ TLS_RSA_WITH_NULL_MD5, |
/* SSL2 cipher suites. */ |
SSL_EN_RC4_128_WITH_MD5, |