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, 33 insertions, 33 deletions

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
index ad3760f45b..3e39677018 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
@@ -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 03 00 51 02 00 00  4d 03 03 9c bd 81 7b 20  |....Q...M.....{ |
-00000010  24 33 0e 28 7c 02 ba db  93 c1 e8 f3 5f 1b 3e bf  |$3.(|......._.>.|
-00000020  41 83 eb e9 db a9 e2 4a  7b de 93 20 0d 11 f1 bb  |A......J{.. ....|
-00000030  0d 1b f2 2b c5 32 14 0e  54 c9 16 5f c9 96 d4 95  |...+.2..T.._....|
-00000040  f8 a7 12 37 57 29 bb b8  65 15 cd 7a 00 05 00 00  |...7W)..e..z....|
+00000000  16 03 03 00 51 02 00 00  4d 03 03 cd c3 57 e1 fc  |....Q...M....W..|
+00000010  74 7d c1 3e 26 f7 84 d1  47 10 b0 02 45 7a 79 bd  |t}.>&...G...Ezy.|
+00000020  7d 82 e4 70 39 94 1d 06  45 7a 22 20 9a 44 3c 7b  |}..p9...Ez" .D<{|
+00000030  fe 35 02 fb eb a2 14 2b  2e 26 14 04 e2 ea 8a d9  |.5.....+.&......|
+00000040  93 d3 50 be 29 45 13 05  39 54 ee ed 00 05 00 00  |..P.)E..9T......|
 00000050  05 ff 01 00 01 00 16 03  03 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..|
@@ -99,25 +99,25 @@
 00000270  70 0f 08 83 48 e9 48 ef  6e 50 8b 05 7e e5 84 25  |p...H.H.nP..~..%|
 00000280  fa 55 c7 ae 31 02 27 00  ef 3f 98 86 20 12 89 91  |.U..1.'..?.. ...|
 00000290  59 28 b4 f7 d7 af d2 69  61 35 16 03 03 00 93 0f  |Y(.....ia5......|
-000002a0  00 00 8f 05 03 00 8b 30  81 88 02 42 01 81 f3 33  |.......0...B...3|
-000002b0  33 ca e1 04 e2 65 b9 26  79 86 d9 f6 16 25 ac a6  |3....e.&y....%..|
-000002c0  9d e8 4a bb 25 91 56 9e  57 6d 07 98 dd 1a fa b3  |..J.%.V.Wm......|
-000002d0  8f a9 46 dc 18 00 fc 1d  4f 38 36 18 77 b0 68 9e  |..F.....O86.w.h.|
-000002e0  a0 04 72 27 4e 75 95 0e  b8 94 4a 9f c0 06 02 42  |..r'Nu....J....B|
-000002f0  01 5b bc 75 9b 38 2f 5d  29 0c 5c fe bd 1c 98 a7  |.[.u.8/]).\.....|
-00000300  75 7a af 68 25 6b db ad  b9 9d d4 4f 49 00 1f cd  |uz.h%k.....OI...|
-00000310  4c 35 d9 c2 33 83 ba eb  7d f4 4a 7a f6 4d 9d 7c  |L5..3...}.Jz.M.||
-00000320  40 34 e9 8b 75 7f 83 0b  e6 ca c6 1f 3e af 58 9e  |@4..u.......>.X.|
-00000330  17 74 14 03 03 00 01 01  16 03 03 00 24 d2 bb 27  |.t..........$..'|
-00000340  fa a9 dd 14 f8 e2 5a 79  b6 9e 77 66 45 6a e5 d4  |......Zy..wfEj..|
-00000350  4d 59 e7 51 fa a4 25 09  ca 9a 89 72 38 6d 68 05  |MY.Q..%....r8mh.|
-00000360  34                                                |4|
+000002a0  00 00 8f 05 03 00 8b 30  81 88 02 42 01 82 0d cf  |.......0...B....|
+000002b0  87 7a 81 ab 4c 36 a9 3d  b0 5f 03 30 4f c8 7b 1c  |.z..L6.=._.0O.{.|
+000002c0  10 d3 8d 2b b0 62 f6 f8  4d b3 82 86 76 b9 51 3c  |...+.b..M...v.Q<|
+000002d0  d2 d4 de 5b 22 17 31 7a  52 b6 8a aa 44 47 cf 63  |...[".1zR...DG.c|
+000002e0  9c d0 38 57 81 9b 44 5c  97 5e bb 85 a6 4c 02 42  |..8W..D\.^...L.B|
+000002f0  01 ff 26 48 a8 37 85 a5  b7 97 8c c2 10 1e 09 cc  |..&H.7..........|
+00000300  0f 9b 93 8d ef dc b0 0d  87 fa 77 8d 72 9e 1e 24  |..........w.r..$|
+00000310  69 ea 85 4e 83 f1 3e 8f  c4 57 8d 10 b2 26 63 97  |i..N..>..W...&c.|
+00000320  63 10 ea ef fc e8 ef 38  27 a7 b2 a9 ac c0 bb 37  |c......8'......7|
+00000330  bc bd 14 03 03 00 01 01  16 03 03 00 24 78 d8 56  |............$x.V|
+00000340  f6 78 ea 0a 29 8c 48 7c  9b 3a 79 05 2f c1 70 0d  |.x..).H|.:y./.p.|
+00000350  c4 16 2f 70 7c 1a 08 f4  37 03 44 4f e4 6d 90 d6  |../p|...7.DO.m..|
+00000360  6c                                                |l|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 24 c7 4b ed 21 0c  |..........$.K.!.|
-00000010  60 57 15 a0 e3 67 ab 84  83 05 49 ac 56 36 1d c7  |`W...g....I.V6..|
-00000020  de 0c 78 77 1b f9 2d 47  91 43 c8 1e 82 25 90     |..xw..-G.C...%.|
+00000000  14 03 03 00 01 01 16 03  03 00 24 ef 41 03 0c ee  |..........$.A...|
+00000010  86 32 06 48 fa 45 ad 13  65 01 2c c2 91 7a d9 9b  |.2.H.E..e.,..z..|
+00000020  4b 00 8d f0 dd 28 e4 9b  38 47 89 c0 56 7f 07     |K....(..8G..V..|
 >>> Flow 5 (client to server)
-00000000  17 03 03 00 1a f1 9c 2e  ba 22 8c 25 5b 5b 04 88  |.........".%[[..|
-00000010  0c 1a a2 70 62 ac bf 40  dd b1 89 15 25 5a 6b 15  |...pb..@....%Zk.|
-00000020  03 03 00 16 31 21 30 b3  c7 d3 c6 f7 88 14 74 12  |....1!0.......t.|
-00000030  b8 47 8b 71 74 39 ab c9  df 40                    |.G.qt9...@|
+00000000  17 03 03 00 1a 0e bf 71  d4 f1 32 2f b6 55 f8 2a  |.......q..2/.U.*|
+00000010  ab 41 57 7e 08 0e 13 f7  2b 13 87 61 61 59 3d 15  |.AW~....+..aaY=.|
+00000020  03 03 00 16 57 04 50 52  d9 41 4a 6b c6 e7 ec 4a  |....W.PR.AJk...J|
+00000030  57 13 07 e7 24 42 67 7a  d1 15                    |W...$Bgz..|