| Index: net/third_party/nss/ssl/sslenum.c
|
| ===================================================================
|
| --- net/third_party/nss/ssl/sslenum.c (revision 203497)
|
| +++ net/third_party/nss/ssl/sslenum.c (working copy)
|
| @@ -26,6 +26,8 @@
|
| *
|
| * If new ECC cipher suites are added, also update the ssl3CipherSuite arrays
|
| * in ssl3ecc.c.
|
| + *
|
| + * Finally, update the ssl_V3_SUITES_IMPLEMENTED macro in sslimpl.h.
|
| */
|
| const PRUint16 SSL_ImplementedCiphers[] = {
|
| /* 256-bit */
|
| @@ -35,6 +37,7 @@
|
| #endif /* NSS_ENABLE_ECC */
|
| TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
| TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
|
| + TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
|
| TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
|
| TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
|
| #ifdef NSS_ENABLE_ECC
|
| @@ -42,18 +45,22 @@
|
| TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
|
| #endif /* NSS_ENABLE_ECC */
|
| TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
| + TLS_RSA_WITH_AES_256_CBC_SHA256,
|
| TLS_RSA_WITH_AES_256_CBC_SHA,
|
|
|
| /* 128-bit */
|
| #ifdef NSS_ENABLE_ECC
|
| TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
|
| + TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
|
| TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_RC4_128_SHA,
|
| + TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
|
| TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
| #endif /* NSS_ENABLE_ECC */
|
| TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
| TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
|
| TLS_DHE_DSS_WITH_RC4_128_SHA,
|
| + TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
|
| TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
|
| TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
|
| #ifdef NSS_ENABLE_ECC
|
| @@ -66,6 +73,7 @@
|
| TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
| SSL_RSA_WITH_RC4_128_SHA,
|
| SSL_RSA_WITH_RC4_128_MD5,
|
| + TLS_RSA_WITH_AES_128_CBC_SHA256,
|
| TLS_RSA_WITH_AES_128_CBC_SHA,
|
|
|
| /* 112-bit 3DES */
|
| @@ -103,6 +111,7 @@
|
| TLS_ECDH_RSA_WITH_NULL_SHA,
|
| TLS_ECDH_ECDSA_WITH_NULL_SHA,
|
| #endif /* NSS_ENABLE_ECC */
|
| + TLS_RSA_WITH_NULL_SHA256,
|
| SSL_RSA_WITH_NULL_SHA,
|
| SSL_RSA_WITH_NULL_MD5,
|
|
|
|
|