From 8741504888b8ca77736716926e472e90c0e1f765 Mon Sep 17 00:00:00 2001
From: Adam Langley <agl@golang.org>
Date: Wed, 17 Aug 2016 16:45:47 -0700
Subject: 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>
---
 .../tls/testdata/Client-TLSv12-ClientCert-RSA-RSA  | 64 +++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA')

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
index 55414d8b60..d49bd8d36e 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-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 82 6c 4c a6 8d  |....Q...M...lL..|
-00000010  58 0a 99 13 9d fb 0a a9  a9 e8 25 65 b7 d1 75 63  |X.........%e..uc|
-00000020  29 57 e8 76 e4 9d a1 0a  1b 9a a0 20 3f 7b 1f 3c  |)W.v....... ?{.<|
-00000030  70 ab c5 87 81 ad 54 e2  fd 52 6f 95 64 f6 c6 5b  |p.....T..Ro.d..[|
-00000040  2f 25 2f 12 3b 40 97 43  48 cc f4 3c 00 05 00 00  |/%/.;@.CH..<....|
+00000000  16 03 03 00 51 02 00 00  4d 03 03 02 3f fc 95 c8  |....Q...M...?...|
+00000010  be 73 36 64 bd 28 09 c0  d2 f5 7f 1c a1 77 0d 88  |.s6d.(.......w..|
+00000020  04 2a 53 4c 1e ac 4b cc  f7 ad d1 20 e7 9e a6 08  |.*SL..K.... ....|
+00000030  de d5 9f 4c 02 73 f7 a2  2b b9 b7 64 6d 8a 9f 9d  |...L.s..+..dm...|
+00000040  e0 92 b8 9a dc b8 96 f8  aa 0d 63 23 00 05 00 00  |..........c#....|
 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..|
@@ -98,24 +98,24 @@
 00000260  f1 0f c5 70 0f 08 83 48  e9 48 ef 6e 50 8b 05 7e  |...p...H.H.nP..~|
 00000270  e5 84 25 fa 55 c7 ae 31  02 27 00 ef 3f 98 86 20  |..%.U..1.'..?.. |
 00000280  12 89 91 59 28 b4 f7 d7  af d2 69 61 35 16 03 03  |...Y(.....ia5...|
-00000290  00 88 0f 00 00 84 05 01  00 80 05 51 bf aa ea ad  |...........Q....|
-000002a0  8e a9 6f df 0b b7 0c 69  fc df f4 c3 59 4e 92 25  |..o....i....YN.%|
-000002b0  df 67 c9 81 d2 54 0a 6e  b4 da 6c c3 fa 4f 6e ab  |.g...T.n..l..On.|
-000002c0  5f 2a 70 28 51 9d 55 2b  c5 31 20 a8 90 b3 72 9d  |_*p(Q.U+.1 ...r.|
-000002d0  7f 97 70 36 3a 7e 52 e9  3c 47 a7 d0 84 37 53 a5  |..p6:~R.<G...7S.|
-000002e0  bd 05 c0 5a 10 58 f4 1b  3d 71 ae f4 b8 85 8c 9e  |...Z.X..=q......|
-000002f0  c3 86 28 3b b7 18 ad ae  d9 46 c7 d6 8e 03 44 ba  |..(;.....F....D.|
-00000300  6f e5 c7 15 50 21 d0 b0  7c 4b 46 0e 20 d4 55 6c  |o...P!..|KF. .Ul|
-00000310  41 93 8b 88 c1 a3 44 7a  a0 42 14 03 03 00 01 01  |A.....Dz.B......|
-00000320  16 03 03 00 24 74 1d 1f  99 0b 56 3f 16 83 db 8f  |....$t....V?....|
-00000330  e2 16 3b ae ba 62 c0 57  18 77 e3 56 48 b6 68 ff  |..;..b.W.w.VH.h.|
-00000340  37 43 a4 99 37 81 bc dc  b2                       |7C..7....|
+00000290  00 88 0f 00 00 84 05 01  00 80 86 56 71 68 09 a7  |...........Vqh..|
+000002a0  bc a6 f1 bd fa d5 e8 7d  f5 8f 4b 8a dd 19 9a 88  |.......}..K.....|
+000002b0  6f 4e 5d c1 a5 3c 03 b7  4d f4 30 74 ec b7 82 d9  |oN]..<..M.0t....|
+000002c0  b9 8a aa 2e b9 39 ab db  dc c9 c2 76 d7 fc 67 d8  |.....9.....v..g.|
+000002d0  3c 87 1c 53 f8 d0 28 b1  37 c4 49 c3 6d 73 b9 cc  |<..S..(.7.I.ms..|
+000002e0  81 2e 1b 22 05 5e 71 35  23 b9 94 c7 6a 80 a2 b6  |...".^q5#...j...|
+000002f0  8a eb f4 0e 51 e6 ff ac  ea eb 0c d8 e8 be 45 ab  |....Q.........E.|
+00000300  4f 0f 47 f1 d2 f4 70 ae  a3 16 79 26 82 32 af 7c  |O.G...p...y&.2.||
+00000310  8b 62 5e 15 b6 ab 07 74  6b 3d 14 03 03 00 01 01  |.b^....tk=......|
+00000320  16 03 03 00 24 6b 24 59  3c f0 3d 41 31 45 04 55  |....$k$Y<.=A1E.U|
+00000330  5f 26 14 dd a9 7a 29 02  c1 4a dd 65 84 4e a9 05  |_&...z)..J.e.N..|
+00000340  37 79 b1 ca 50 8e c6 df  6d                       |7y..P...m|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 24 05 24 3c 21 26  |..........$.$<!&|
-00000010  68 27 8e 93 6a d7 cb f6  a1 31 4c 4f 93 0f b4 7a  |h'..j....1LO...z|
-00000020  de 82 2d 80 ad d4 84 59  54 60 f4 70 3b 1d fb     |..-....YT`.p;..|
+00000000  14 03 03 00 01 01 16 03  03 00 24 ff c7 8f 75 44  |..........$...uD|
+00000010  f7 4c 9b 80 c1 c0 59 83  8c c8 fe 7b 21 86 83 d1  |.L....Y....{!...|
+00000020  09 08 48 b0 e9 f0 fe 2f  58 86 25 64 d3 3a a2     |..H..../X.%d.:.|
 >>> Flow 5 (client to server)
-00000000  17 03 03 00 1a c2 c1 b2  36 59 f8 c0 d7 38 e1 61  |........6Y...8.a|
-00000010  c4 96 c1 ea 87 a5 26 16  4d 21 fc 60 b8 c1 4d 15  |......&.M!.`..M.|
-00000020  03 03 00 16 da d4 fb b4  1e d3 3e e0 05 ea 11 c7  |..........>.....|
-00000030  53 34 5e e3 59 33 90 51  9d 9a                    |S4^.Y3.Q..|
+00000000  17 03 03 00 1a 31 4f 85  6d 9e 52 7d 90 67 4f 2c  |.....1O.m.R}.gO,|
+00000010  f1 dc 5e 6b 5d b9 f1 90  2b c1 61 38 5a 45 ed 15  |..^k]...+.a8ZE..|
+00000020  03 03 00 16 3b 54 3d ac  60 28 4b ca 09 f4 44 70  |....;T=.`(K...Dp|
+00000030  a9 0a 73 e4 c1 39 b6 77  57 17                    |..s..9.wW.|
-- 
cgit v1.3