| Index: net/third_party/nss/ssl/ssl3ecc.c
|
| ===================================================================
|
| --- net/third_party/nss/ssl/ssl3ecc.c (revision 215189)
|
| +++ net/third_party/nss/ssl/ssl3ecc.c (working copy)
|
| @@ -911,6 +911,7 @@
|
| TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
|
| + TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
| TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_NULL_SHA,
|
| TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
|
| @@ -921,6 +922,7 @@
|
| TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
|
| + TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
| TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_NULL_SHA,
|
| TLS_ECDHE_RSA_WITH_RC4_128_SHA,
|
| @@ -932,12 +934,14 @@
|
| TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
|
| + TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
| TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
| TLS_ECDHE_ECDSA_WITH_NULL_SHA,
|
| TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
|
| TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
|
| + TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
| TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
| TLS_ECDHE_RSA_WITH_NULL_SHA,
|
| TLS_ECDHE_RSA_WITH_RC4_128_SHA,
|
|
|