diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 22:07:07 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 22:07:07 +0000 |
| commit | fd2722b12ba5d27d85fd2deec4dd41249f2ec9e6 (patch) | |
| tree | 707c5c92e3e61b022331e0c94fc5b06b22d31025 /net/socket | |
| parent | 18b466b9ae1beed3b6c960a8152046f7571a853b (diff) | |
| download | chromium_src-fd2722b12ba5d27d85fd2deec4dd41249f2ec9e6.zip chromium_src-fd2722b12ba5d27d85fd2deec4dd41249f2ec9e6.tar.gz chromium_src-fd2722b12ba5d27d85fd2deec4dd41249f2ec9e6.tar.bz2 | |
net: enable ChaCha20 based cipher suites.
Soon the patch to boost AES-GCM cipher suites when AES-NI is supported will
land. Also, Google frontend servers will be configured with an equal
preference for ChaCha20 and AES-GCM, meaning that they will respect the
client's preference between those two families of ciphers.
Thus this change enables ChaCha20. Initially these cipher suites will be used
for all HTTPS connections to Google until the equal preference is configured.
At that point they'll only be used when hardware AES-GCM support isn't enabled.
BUG=310768
Review URL: https://codereview.chromium.org/92703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/nss_ssl_util.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index 9ed8b2f..38718b5 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -121,11 +121,6 @@ class NSSSSLInitSingleton { enabled = false; } - // We also disable ChaCha20 based cipher suites for now because we - // aren't quite ready to use them in M32. - if (info.symCipher == ssl_calg_chacha20) - enabled = false; - if (ssl_ciphers[i] == TLS_DHE_DSS_WITH_AES_128_CBC_SHA) { // Enabled to allow servers with only a DSA certificate to function. enabled = true; |