crypto/tls: support AES-128-CBC cipher suites with SHA-256.

These were new with TLS 1.2 and, reportedly, some servers require it.
Since it's easy, this change adds suport for three flavours of
AES-128-CBC with SHA-256 MACs.

Other testdata/ files have to be updated because this changes the list
of cipher suites offered by default by the client.

Fixes #15487.

Change-Id: I1b14330c31eeda20185409a37072343552c3464f
Reviewed-on: https://go-review.googlesource.com/27315
Run-TryBot: Adam Langley <agl@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Jonathan Rudenberg <jonathan@titanous.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

1 files changed, 23 insertions, 23 deletions

diff --git a/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
index 71ad4cdacb..30824c6206 100644
--- a/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
+++ b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
@@ -1,19 +1,19 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 85 01 00 00  81 03 03 00 00 00 00 00  |................|
+00000000  16 03 01 00 8b 01 00 00  87 03 03 00 00 00 00 00  |................|
 00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00000020  00 00 00 00 00 00 00 00  00 00 00 00 00 22 c0 2f  |............."./|
-00000030  c0 2b c0 30 c0 2c c0 11  c0 07 c0 13 c0 09 c0 14  |.+.0.,..........|
-00000040  c0 0a 00 9c 00 9d 00 05  00 2f 00 35 c0 12 00 0a  |........./.5....|
-00000050  01 00 00 36 00 05 00 05  01 00 00 00 00 00 0a 00  |...6............|
-00000060  08 00 06 00 17 00 18 00  19 00 0b 00 02 01 00 00  |................|
-00000070  0d 00 0e 00 0c 04 01 04  03 05 01 05 03 02 01 02  |................|
-00000080  03 ff 01 00 01 00 00 12  00 00                    |..........|
+00000020  00 00 00 00 00 00 00 00  00 00 00 00 00 28 c0 2f  |.............(./|
+00000030  c0 2b c0 30 c0 2c c0 27  c0 13 c0 23 c0 09 c0 14  |.+.0.,.'...#....|
+00000040  c0 0a 00 9c 00 9d 00 3c  00 2f 00 35 c0 12 00 0a  |.......<./.5....|
+00000050  00 05 c0 11 c0 07 01 00  00 36 00 05 00 05 01 00  |.........6......|
+00000060  00 00 00 00 0a 00 08 00  06 00 17 00 18 00 19 00  |................|
+00000070  0b 00 02 01 00 00 0d 00  0e 00 0c 04 01 04 03 05  |................|
+00000080  01 05 03 02 01 02 03 ff  01 00 01 00 00 12 00 00  |................|
 >>> Flow 2 (server to client)
-00000000  16 03 02 00 51 02 00 00  4d 03 02 ae 75 14 49 89  |....Q...M...u.I.|
-00000010  d8 40 5b 20 0a 72 b9 6f  f7 90 a7 84 cd 86 f8 03  |.@[ .r.o........|
-00000020  a3 9b 65 24 78 7a b0 b5  1f 8c 8f 20 00 13 31 5c  |..e$xz..... ..1\|
-00000030  a7 b6 46 db cf d0 6d 0b  25 17 93 1f 6c 51 de 8d  |..F...m.%...lQ..|
-00000040  f3 c1 86 c3 ad 81 a0 9a  22 8b bf b1 00 05 00 00  |........".......|
+00000000  16 03 02 00 51 02 00 00  4d 03 02 79 51 85 f7 61  |....Q...M..yQ..a|
+00000010  76 b1 6e a0 f4 f5 07 01  86 38 bd 08 f6 97 fe 36  |v.n......8.....6|
+00000020  80 f0 b0 a8 e5 d6 1b a9  30 56 82 20 1e 9f 1b 39  |........0V. ...9|
+00000030  8c b6 64 a9 94 6a 78 15  02 0d ce 83 57 7e 27 e1  |..d..jx.....W~'.|
+00000040  35 c6 3b 77 c6 21 88 e2  90 0b bc 07 00 05 00 00  |5.;w.!..........|
 00000050  05 ff 01 00 01 00 16 03  02 02 59 0b 00 02 55 00  |..........Y...U.|
 00000060  02 52 00 02 4f 30 82 02  4b 30 82 01 b4 a0 03 02  |.R..O0..K0......|
 00000070  01 02 02 09 00 e8 f0 9d  3f e2 5b ea a6 30 0d 06  |........?.[..0..|
@@ -63,15 +63,15 @@
 00000060  c5 70 0f 08 83 48 e9 48  ef 6e 50 8b 05 7e e5 84  |.p...H.H.nP..~..|
 00000070  25 fa 55 c7 ae 31 02 27  00 ef 3f 98 86 20 12 89  |%.U..1.'..?.. ..|
 00000080  91 59 28 b4 f7 d7 af d2  69 61 35 14 03 02 00 01  |.Y(.....ia5.....|
-00000090  01 16 03 02 00 24 7f 34  df 4a 9e 2f f4 57 95 15  |.....$.4.J./.W..|
-000000a0  54 01 5d e4 78 e1 48 bb  d8 09 09 1b a4 eb a8 6a  |T.].x.H........j|
-000000b0  94 4c 7e 9d 5c 10 92 e3  81 54                    |.L~.\....T|
+00000090  01 16 03 02 00 24 72 27  a5 3c 05 94 3e 33 89 f3  |.....$r'.<..>3..|
+000000a0  8f 76 29 e6 18 b3 51 a9  72 e5 88 0c 6c 6f 81 08  |.v)...Q.r...lo..|
+000000b0  7b 80 4b 35 00 1d e2 57  2a cb                    |{.K5...W*.|
 >>> Flow 4 (server to client)
-00000000  14 03 02 00 01 01 16 03  02 00 24 56 7f 65 57 7a  |..........$V.eWz|
-00000010  44 51 c8 82 ec 49 9f c5  d9 f7 68 59 a6 85 7f 40  |DQ...I....hY...@|
-00000020  e1 17 21 bc 33 7e 2f b3  3c 92 0d fb 13 36 bf     |..!.3~/.<....6.|
+00000000  14 03 02 00 01 01 16 03  02 00 24 eb 2c 34 2f 7e  |..........$.,4/~|
+00000010  f1 6c 7a 74 a8 78 f3 f6  31 e6 e8 47 c4 a8 22 b7  |.lzt.x..1..G..".|
+00000020  45 54 12 35 fa 1c 49 c3  e4 98 68 57 3b f7 9e     |ET.5..I...hW;..|
 >>> Flow 5 (client to server)
-00000000  17 03 02 00 1a f8 15 d3  49 06 f4 2b d7 6f cb 39  |........I..+.o.9|
-00000010  ec 32 43 9e 94 5b 1c 21  9c 96 77 1b 4b cf 9c 15  |.2C..[.!..w.K...|
-00000020  03 02 00 16 62 09 0c 99  a4 ac 4c a4 0b 53 e6 d1  |....b.....L..S..|
-00000030  cf ad ca 9b 75 fd 3a 41  cb e7                    |....u.:A..|
+00000000  17 03 02 00 1a 0a 0c 4d  74 f8 72 f8 b5 c4 08 94  |.......Mt.r.....|
+00000010  5b 59 b3 c0 49 9d a6 2d  b0 d0 eb a2 b3 d9 ec 15  |[Y..I..-........|
+00000020  03 02 00 16 f5 1e d1 1f  cf 58 33 a6 78 48 5b c1  |.........X3.xH[.|
+00000030  15 4d e5 fb 20 d0 c5 75  fc c0                    |.M.. ..u..|