|
 |
1b6f66 |
--- ./nss/lib/ssl/ssl3con.c.delete_duplicates 2016-04-04 10:13:34.310883577 -0700
|
|
|
1b6f66 |
+++ ./nss/lib/ssl/ssl3con.c 2016-04-04 10:18:32.544936462 -0700
|
|
|
1b6f66 |
@@ -426,18 +426,16 @@
|
|
|
1b6f66 |
cipher_rc4_56, mac_sha,kea_rsa_export_1024, 0},
|
|
|
1b6f66 |
|
|
|
1b6f66 |
{SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA, cipher_3des, mac_sha, kea_rsa_fips, 0},
|
|
|
1b6f66 |
{SSL_RSA_FIPS_WITH_DES_CBC_SHA, cipher_des, mac_sha, kea_rsa_fips, 0},
|
|
|
1b6f66 |
|
|
|
1b6f66 |
{TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_dhe_rsa, prf_256},
|
|
|
1b6f66 |
{TLS_RSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_rsa, prf_256},
|
|
|
1b6f66 |
#ifndef NSS_DISABLE_ECC
|
|
|
1b6f66 |
- {TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_ecdhe_rsa},
|
|
|
1b6f66 |
- {TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_ecdhe_ecdsa},
|
|
|
1b6f66 |
{TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_ecdhe_rsa, prf_256},
|
|
|
1b6f66 |
{TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, cipher_aes_128_gcm, mac_aead, kea_ecdhe_ecdsa, prf_256},
|
|
|
1b6f66 |
{TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, cipher_aes_256_gcm, mac_aead, kea_ecdhe_ecdsa, prf_384},
|
|
|
1b6f66 |
{TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, cipher_aes_256_gcm, mac_aead, kea_ecdhe_rsa, prf_384},
|
|
|
1b6f66 |
{TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, cipher_aes_256, hmac_sha384, kea_ecdhe_ecdsa, prf_384},
|
|
|
1b6f66 |
{TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, cipher_aes_256, hmac_sha384, kea_ecdhe_rsa, prf_384},
|
|
|
1b6f66 |
#endif /* NSS_DISABLE_ECC */
|
|
|
1b6f66 |
{TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, cipher_aes_256_gcm, mac_aead, kea_dhe_rsa, prf_384},
|