Disable the HMAC-SHA256 cipher suites for SSLClientSocketOpenSSL.

Disable the HMAC-SHA256 and AES_256_GCM cipher suites for
SSLClientSocketOpenSSL.

R=rsleevi@chromium.org
BUG=255241
TEST=none

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

[wtc, 2013-08-20 00:56:57]

Please review.

This CL results in the following change to the cipher suite
list in the ClientHello when OpenSSL is used. Note that the
AES_256_GCM cipher suites are still enabled. I don't know how
to disable them.

$ diff -u20 temp1 temp2
--- temp1	2013-08-19 17:43:50.063286548 -0700
+++ temp2	2013-08-19 17:45:02.114394510 -0700
@@ -1,40 +1,32 @@
-            cipher_suites[38] = {
+            cipher_suites[30] = {
                 (0xc030) TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
                 (0xc02c) TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
                 (0xc014) TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
                 (0xc00a) TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
                 (0x00a3) TLS_DHE_DSS_WITH_AES_256_GCM_SHA384
                 (0x009f) TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
-                (0x006b) TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
-                (0x006a) TLS_DHE_DSS_WITH_AES_256_CBC_SHA256
                 (0x0039) TLS_DHE_RSA_WITH_AES_256_CBC_SHA
                 (0x0038) TLS_DHE_DSS_WITH_AES_256_CBC_SHA
                 (0x009d) TLS_RSA_WITH_AES_256_GCM_SHA384
-                (0x003d) TLS_RSA_WITH_AES_256_CBC_SHA256
                 (0x0035) TLS_RSA_WITH_AES_256_CBC_SHA
                 (0xc012) TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
                 (0xc008) TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
                 (0x0016) SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA
                 (0x0013) SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA
                 (0x000a) SSL_RSA_WITH_3DES_EDE_CBC_SHA
                 (0xc02f) TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
                 (0xc02b) TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-                (0xc027) TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
-                (0xc023) TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
                 (0xc013) TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
                 (0xc009) TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
                 (0x00a2) TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
                 (0x009e) TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
-                (0x0067) TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
-                (0x0040) TLS_DHE_DSS_WITH_AES_128_CBC_SHA256
                 (0x0033) TLS_DHE_RSA_WITH_AES_128_CBC_SHA
                 (0x0032) TLS_DHE_DSS_WITH_AES_128_CBC_SHA
                 (0x009c) TLS_RSA_WITH_AES_128_GCM_SHA256
-                (0x003c) TLS_RSA_WITH_AES_128_CBC_SHA256
                 (0x002f) TLS_RSA_WITH_AES_128_CBC_SHA
                 (0xc011) TLS_ECDHE_RSA_WITH_RC4_128_SHA
                 (0xc007) TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
                 (0x0005) SSL_RSA_WITH_RC4_128_SHA
                 (0x0004) SSL_RSA_WITH_RC4_128_MD5
                 (0x00ff) TLS_EMPTY_RENEGOTIATION_INFO_SCSV
             }

[Ryan Sleevi, 2013-08-20 01:18:48]

There's no default string alias for this in OpenSSL. That is, SSL_TXT_AES_GCM
("AESGCM") disables both AES128GCM and AES256GCM, and SSL_TXT_AES256 ("AES256")
disables both AES256 and AES256GCM

However, you should be able to use the logical or to combine

!AESGCM+AES256 should disable the logical intersection of the AESGCM and AES256
aliases - aka AES256GCM.

[wtc, 2013-08-20 18:25:50]

Thank you for the suggestion. Please review patch set 2.

Now the cipher suite list in ClientHello is reduced as follows:

$ diff -u10 temp1 temp2
--- temp1	2013-08-19 17:43:50.063286548 -0700
+++ temp2	2013-08-20 11:15:49.112656177 -0700
@@ -1,40 +1,27 @@
-            cipher_suites[38] = {
-                (0xc030) TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-                (0xc02c) TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+            cipher_suites[25] = {
                 (0xc014) TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
                 (0xc00a) TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
-                (0x00a3) TLS_DHE_DSS_WITH_AES_256_GCM_SHA384
-                (0x009f) TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
-                (0x006b) TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
-                (0x006a) TLS_DHE_DSS_WITH_AES_256_CBC_SHA256
                 (0x0039) TLS_DHE_RSA_WITH_AES_256_CBC_SHA
                 (0x0038) TLS_DHE_DSS_WITH_AES_256_CBC_SHA
-                (0x009d) TLS_RSA_WITH_AES_256_GCM_SHA384
-                (0x003d) TLS_RSA_WITH_AES_256_CBC_SHA256
                 (0x0035) TLS_RSA_WITH_AES_256_CBC_SHA
                 (0xc012) TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
                 (0xc008) TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
                 (0x0016) SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA
                 (0x0013) SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA
                 (0x000a) SSL_RSA_WITH_3DES_EDE_CBC_SHA
                 (0xc02f) TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
                 (0xc02b) TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-                (0xc027) TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
-                (0xc023) TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
                 (0xc013) TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
                 (0xc009) TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
                 (0x00a2) TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
                 (0x009e) TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
-                (0x0067) TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
-                (0x0040) TLS_DHE_DSS_WITH_AES_128_CBC_SHA256
                 (0x0033) TLS_DHE_RSA_WITH_AES_128_CBC_SHA
                 (0x0032) TLS_DHE_DSS_WITH_AES_128_CBC_SHA
                 (0x009c) TLS_RSA_WITH_AES_128_GCM_SHA256
-                (0x003c) TLS_RSA_WITH_AES_128_CBC_SHA256
                 (0x002f) TLS_RSA_WITH_AES_128_CBC_SHA
                 (0xc011) TLS_ECDHE_RSA_WITH_RC4_128_SHA
                 (0xc007) TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
                 (0x0005) SSL_RSA_WITH_RC4_128_SHA
                 (0x0004) SSL_RSA_WITH_RC4_128_MD5
                 (0x00ff) TLS_EMPTY_RENEGOTIATION_INFO_SCSV
             }

[Ryan Sleevi, 2013-08-20 18:27:30]

lgtm

[commit-bot: I haz the power, 2013-08-20 18:27:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/23038011/5001

[commit-bot: I haz the power, 2013-08-20 22:59:14]

Change committed as 218564