diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/net/third_party/nss/ssl/sslenum.c | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/net/third_party/nss/ssl/sslenum.c')
| -rw-r--r-- | chromium/net/third_party/nss/ssl/sslenum.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chromium/net/third_party/nss/ssl/sslenum.c b/chromium/net/third_party/nss/ssl/sslenum.c index 597ec072399..b460f2631dc 100644 --- a/chromium/net/third_party/nss/ssl/sslenum.c +++ b/chromium/net/third_party/nss/ssl/sslenum.c @@ -29,14 +29,6 @@ * Finally, update the ssl_V3_SUITES_IMPLEMENTED macro in sslimpl.h. */ const PRUint16 SSL_ImplementedCiphers[] = { - /* AES-GCM */ -#ifdef NSS_ENABLE_ECC - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, -#endif /* NSS_ENABLE_ECC */ - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, - TLS_RSA_WITH_AES_128_GCM_SHA256, - /* 256-bit */ #ifdef NSS_ENABLE_ECC TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, |