net: disable ChaCha20 based cipher suites.

net: disable ChaCha20 based cipher suites.

We're not ready for this in M32:
  * The Windows compiler doesn't support vector code so we're using generic
    code there.
  * We don't have promotion for AES-GCM ciphersuites when AES-NI is supported.

This change is designed to be reverted on trunk once M32 has branched.

BUG=315791
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=233470

[agl, 2013-11-05 23:18:00]

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc
File net/socket/nss_ssl_util.cc (right):

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc#ne...
net/socket/nss_ssl_util.cc:75: if (ssl_ciphers[i] == 0xcc13 || ssl_ciphers[i] ==
0xcc14)
We may be compiling on systems where the headers don't have calg_chacha20 so I
used the raw cipher suite numbers.

[wtc, 2013-11-05 23:38:36]

Patch set 1 LGTM.

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc
File net/socket/nss_ssl_util.cc (right):

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc#ne...
net/socket/nss_ssl_util.cc:75: if (ssl_ciphers[i] == 0xcc13 || ssl_ciphers[i] ==
0xcc14)
On 2013/11/05 23:18:01, agl wrote:
> We may be compiling on systems where the headers don't have calg_chacha20 so I
> used the raw cipher suite numbers.

I think we use our own SSL headers in net/third_party/nss/ssl, unless we run
into include directory search order problem.

Also, it would be nice to disable the third ChaCha20 cipher suite as well. (It's
probably not yet implemented.)

[agl, 2013-11-06 19:11:23]

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc
File net/socket/nss_ssl_util.cc (right):

https://codereview.chromium.org/60353005/diff/1/net/socket/nss_ssl_util.cc#ne...
net/socket/nss_ssl_util.cc:75: if (ssl_ciphers[i] == 0xcc13 || ssl_ciphers[i] ==
0xcc14)
On 2013/11/05 23:38:37, wtc wrote:> I think we use our own SSL headers in
net/third_party/nss/ssl, unless we run
> into include directory search order problem.

Ah, great. Have switched to match symCipher against ssl_calg_chacha20 then.

[wtc, 2013-11-06 19:18:40]

Patch set 2 LGTM.

https://codereview.chromium.org/60353005/diff/60001/net/socket/nss_ssl_util.cc
File net/socket/nss_ssl_util.cc (right):

https://codereview.chromium.org/60353005/diff/60001/net/socket/nss_ssl_util.c...
net/socket/nss_ssl_util.cc:64: info.symCipher == ssl_calg_seed ||

We can also move the info.symCipher == ssl_calg_chacha20 check here, unless you
want to make it easier to revert this change.

[commit-bot: I haz the power, 2013-11-06 19:18:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agl@chromium.org/60353005/60001

[commit-bot: I haz the power, 2013-11-06 19:45:08]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-06 20:45:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agl@chromium.org/60353005/60001

[commit-bot: I haz the power, 2013-11-07 01:41:47]

Change committed as 233470