| 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 b8aa8cc65e8f048266a5544e28571392ebad3501..196ed305a99a195705ed261fef7aad1af8988114 100644
|
| --- a/net/third_party/nss/ssl/sslenum.c
|
| +++ b/net/third_party/nss/ssl/sslenum.c
|
| @@ -74,6 +74,9 @@ const PRUint16 SSL_ImplementedCiphers[] = {
|
| #endif /* NSS_ENABLE_ECC */
|
| TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
| TLS_RSA_WITH_AES_256_CBC_SHA,
|
| + TLS_SRP_SHA_WITH_AES_256_CBC_SHA,
|
| + TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
|
| + TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
|
|
|
| /* 128-bit */
|
| #ifdef NSS_ENABLE_ECC
|
| @@ -98,12 +101,16 @@ const PRUint16 SSL_ImplementedCiphers[] = {
|
| SSL_RSA_WITH_RC4_128_MD5,
|
| SSL_RSA_WITH_RC4_128_SHA,
|
| TLS_RSA_WITH_AES_128_CBC_SHA,
|
| + TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
|
| + TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
|
| + TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
|
|
|
| /* 112-bit 3DES */
|
| #ifdef NSS_ENABLE_ECC
|
| TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
| #endif /* NSS_ENABLE_ECC */
|
| + TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
|
| SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
| SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
|
| #ifdef NSS_ENABLE_ECC
|
| @@ -112,6 +119,8 @@ const PRUint16 SSL_ImplementedCiphers[] = {
|
| #endif /* NSS_ENABLE_ECC */
|
| SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA,
|
| SSL_RSA_WITH_3DES_EDE_CBC_SHA,
|
| + TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
|
| + TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
|
|
|
| /* 56-bit DES "domestic" cipher suites */
|
| SSL_DHE_RSA_WITH_DES_CBC_SHA,
|
|
|