crypto/tls: enable ChaCha20-Poly1305 cipher suites by default.

This change enables the ChaCha20-Poly1305 cipher suites by default. This
changes the default ClientHello and thus requires updating all the
tests.

Change-Id: I6683a2647caaff4a11f9e932babb6f07912cad94
Reviewed-on: https://go-review.googlesource.com/30958
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

1 files changed, 49 insertions, 49 deletions

diff --git a/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
index cb956e9791..e585894db7 100644
--- a/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
@@ -1,20 +1,20 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 8d 01 00 00  89 03 03 00 00 00 00 00  |................|
+00000000  16 03 01 00 91 01 00 00  8d 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 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 38 00 05 00 05 01 00  |.........8......|
-00000060  00 00 00 00 0a 00 0a 00  08 00 1d 00 17 00 18 00  |................|
-00000070  19 00 0b 00 02 01 00 00  0d 00 0e 00 0c 04 01 04  |................|
-00000080  03 05 01 05 03 02 01 02  03 ff 01 00 01 00 00 12  |................|
-00000090  00 00                                             |..|
+00000020  00 00 00 00 00 00 00 00  00 00 00 00 00 2c cc a8  |.............,..|
+00000030  cc a9 c0 2f c0 2b c0 30  c0 2c c0 27 c0 13 c0 23  |.../.+.0.,.'...#|
+00000040  c0 09 c0 14 c0 0a 00 9c  00 9d 00 3c 00 2f 00 35  |...........<./.5|
+00000050  c0 12 00 0a 00 05 c0 11  c0 07 01 00 00 38 00 05  |.............8..|
+00000060  00 05 01 00 00 00 00 00  0a 00 0a 00 08 00 1d 00  |................|
+00000070  17 00 18 00 19 00 0b 00  02 01 00 00 0d 00 0e 00  |................|
+00000080  0c 04 01 04 03 05 01 05  03 02 01 02 03 ff 01 00  |................|
+00000090  01 00 00 12 00 00                                 |......|
 >>> Flow 2 (server to client)
-00000000  16 03 01 00 59 02 00 00  55 03 01 13 70 8b ce 13  |....Y...U...p...|
-00000010  6e e5 50 5a 92 bf 18 33  b3 5b 1a bb 52 a9 47 3e  |n.PZ...3.[..R.G>|
-00000020  d3 23 e0 fa a1 af 66 9b  f0 e4 79 20 47 dc 49 70  |.#....f...y G.Ip|
-00000030  99 9e 03 5c fb a2 a8 6a  af e8 75 ff a9 e0 c1 e5  |...\...j..u.....|
-00000040  5c 5a 5e a0 78 ae d1 73  3d 29 04 b7 c0 13 00 00  |\Z^.x..s=)......|
+00000000  16 03 01 00 59 02 00 00  55 03 01 61 6b 2e 41 7f  |....Y...U..ak.A.|
+00000010  af 26 6f a2 8b 63 ee e4  b1 76 19 3a 6d a3 c2 30  |.&o..c...v.:m..0|
+00000020  37 e8 47 c2 90 10 7e e8  c5 b2 eb 20 00 1c 8f 70  |7.G...~.... ...p|
+00000030  0d 15 4a c7 7d ab ca 79  a7 d8 c2 01 62 6e 6f aa  |..J.}..y....bno.|
+00000040  df a2 1c 8f 7c 27 d9 e6  fe e9 c8 ab c0 13 00 00  |....|'..........|
 00000050  0d ff 01 00 01 00 00 0b  00 04 03 00 01 02 16 03  |................|
 00000060  01 02 59 0b 00 02 55 00  02 52 00 02 4f 30 82 02  |..Y...U..R..O0..|
 00000070  4b 30 82 01 b4 a0 03 02  01 02 02 09 00 e8 f0 9d  |K0..............|
@@ -54,17 +54,17 @@
 00000290  77 8d 0c 1c f1 0f a1 d8  40 83 61 c9 4c 72 2b 9d  |w.......@.a.Lr+.|
 000002a0  ae db 46 06 06 4d f4 c1  b3 3e c0 d1 bd 42 d4 db  |..F..M...>...B..|
 000002b0  fe 3d 13 60 84 5c 21 d3  3b e9 fa e7 16 03 01 00  |.=.`.\!.;.......|
-000002c0  aa 0c 00 00 a6 03 00 1d  20 8f 09 63 f7 eb 09 5b  |........ ..c...[|
-000002d0  90 a8 cc 46 27 10 b9 ab  ac dc ff ee 98 27 8d a8  |...F'........'..|
-000002e0  25 5a d0 0c b8 2a 5f 25  00 00 80 a2 2d 18 6c 8d  |%Z...*_%....-.l.|
-000002f0  1d a1 62 35 fe 9a 97 a3  f7 59 56 7f a3 6b 26 7d  |..b5.....YV..k&}|
-00000300  b6 7c e7 f2 d2 30 4e 77  50 91 47 bb 48 e9 3a c1  |.|...0NwP.G.H.:.|
-00000310  c6 58 a4 96 3b 98 3f a8  15 90 51 25 af 50 fc bd  |.X..;.?...Q%.P..|
-00000320  3d fa c3 d4 32 19 fe 9b  bb e5 07 f5 26 56 3a d7  |=...2.......&V:.|
-00000330  e5 00 82 7d dd 26 d8 19  16 6b db 95 20 99 13 44  |...}.&...k.. ..D|
-00000340  8b a5 8b 75 48 de a7 87  cb c4 97 56 60 66 cd d8  |...uH......V`f..|
-00000350  c1 24 7b 21 4a b5 43 1d  37 a5 02 1d 49 33 c9 87  |.${!J.C.7...I3..|
-00000360  af b1 03 0d eb 33 95 ff  ef 8a f6 16 03 01 00 0a  |.....3..........|
+000002c0  aa 0c 00 00 a6 03 00 1d  20 29 0b ca 37 f3 a1 52  |........ )..7..R|
+000002d0  49 1c 84 9a e4 74 6b 4b  2d 1f e6 e9 83 1d 5d 59  |I....tkK-.....]Y|
+000002e0  5a 2f 09 9f bc a4 30 af  71 00 80 d9 bb 6d 09 a7  |Z/....0.q....m..|
+000002f0  ab 47 6f e8 a6 1a da fb  66 7d a5 f0 c9 c3 24 4c  |.Go.....f}....$L|
+00000300  99 56 c6 29 71 27 08 0b  c1 60 44 cc 6d 42 1b 5e  |.V.)q'...`D.mB.^|
+00000310  cd 9f 82 24 38 23 ec d9  fa 32 49 2f 16 5d d2 9d  |...$8#...2I/.]..|
+00000320  e9 13 4e 66 3d f8 bf 30  2e 8c eb 35 4c e8 81 86  |..Nf=..0...5L...|
+00000330  c0 de c7 0d a9 60 7e 7c  4a c4 1d a0 89 70 de 82  |.....`~|J....p..|
+00000340  1b 37 a0 ea 7f 20 a5 fe  d4 20 1d 6f 1a 84 dd a4  |.7... ... .o....|
+00000350  13 46 18 c6 31 14 81 4b  a4 bb 43 5c c4 49 1c 5a  |.F..1..K..C\.I.Z|
+00000360  8d 12 57 e0 1d 9a b6 cd  f1 39 ff 16 03 01 00 0a  |..W......9......|
 00000370  0d 00 00 06 03 01 02 40  00 00 16 03 01 00 04 0e  |.......@........|
 00000380  00 00 00                                          |...|
 >>> Flow 3 (client to server)
@@ -103,29 +103,29 @@
 00000200  e5 35 16 03 01 00 25 10  00 00 21 20 2f e5 7d a3  |.5....%...! /.}.|
 00000210  47 cd 62 43 15 28 da ac  5f bb 29 07 30 ff f6 84  |G.bC.(.._.).0...|
 00000220  af c4 cf c2 ed 90 99 5f  58 cb 3b 74 16 03 01 00  |......._X.;t....|
-00000230  86 0f 00 00 82 00 80 1c  2c 0b 87 f7 a9 33 09 7e  |........,....3.~|
-00000240  0b 19 c7 ef e4 bd e9 37  4e 3c 1e 36 5d 1f d0 51  |.......7N<.6]..Q|
-00000250  f7 87 40 66 c1 d2 54 c5  58 2f 03 32 1a 3b f3 4c  |..@f..T.X/.2.;.L|
-00000260  97 db 49 93 ba c5 c0 f4  d2 eb 43 58 25 80 f8 4d  |..I.......CX%..M|
-00000270  1c 6d 10 79 ea d6 b4 07  01 58 a2 a1 48 ae 06 a2  |.m.y.....X..H...|
-00000280  a7 2b 1e 36 a3 58 ab b6  a6 60 24 1d c1 7d 49 2e  |.+.6.X...`$..}I.|
-00000290  14 2d ca 7d 7f df 3f 79  51 43 75 06 86 0b 7d de  |.-.}..?yQCu...}.|
-000002a0  a4 76 18 8d 54 fa 41 b3  d9 06 f0 44 de c7 41 53  |.v..T.A....D..AS|
-000002b0  05 33 0f 5a 48 9e 76 14  03 01 00 01 01 16 03 01  |.3.ZH.v.........|
-000002c0  00 30 ec 96 c4 f6 af 71  4f b6 c9 e0 bf b6 15 51  |.0.....qO......Q|
-000002d0  5d 0a b6 6b 39 d9 9f 53  0f 7e 0c b7 8e 76 0c c4  |]..k9..S.~...v..|
-000002e0  15 36 07 27 51 f9 3e cb  0c 4e 5f 99 19 2d 3c dd  |.6.'Q.>..N_..-<.|
-000002f0  65 0d                                             |e.|
+00000230  86 0f 00 00 82 00 80 12  76 af 25 e4 e7 ff d6 e4  |........v.%.....|
+00000240  27 58 31 0f 6b 1e 84 13  2f d0 60 80 18 c3 f8 c1  |'X1.k.../.`.....|
+00000250  f8 04 39 d4 07 05 d3 96  e2 b2 10 de 1f 68 88 67  |..9..........h.g|
+00000260  1d dd 0a 11 52 9d 16 0e  af 07 de cb f1 7c f4 b4  |....R........|..|
+00000270  5d 0f 4f 43 5b 3c 25 07  32 13 f2 ab 9b 2d d0 a8  |].OC[<%.2....-..|
+00000280  28 90 cb 04 48 c3 43 bd  2b b4 ef b9 7b cd bd d5  |(...H.C.+...{...|
+00000290  bc d1 cc 00 17 46 fa 9b  1f 44 58 b7 6c de 1b 7a  |.....F...DX.l..z|
+000002a0  e0 d7 12 38 a3 09 f8 7a  9b 26 0b ee 37 bc 79 1b  |...8...z.&..7.y.|
+000002b0  51 9f 9a 1f f9 a9 51 14  03 01 00 01 01 16 03 01  |Q.....Q.........|
+000002c0  00 30 97 df fb 79 78 a8  27 fd 2b 68 6b ec 4d 29  |.0...yx.'.+hk.M)|
+000002d0  a1 02 59 ae 18 0b 46 62  af 61 53 2f 95 50 f2 ac  |..Y...Fb.aS/.P..|
+000002e0  c8 c3 5e 78 ca b0 e2 5d  ff d7 1b 9b 00 30 f6 da  |..^x...].....0..|
+000002f0  d7 91                                             |..|
 >>> Flow 4 (server to client)
-00000000  14 03 01 00 01 01 16 03  01 00 30 2f ff 36 c3 9e  |..........0/.6..|
-00000010  9e ac 31 15 84 6f c2 c0  fa ce d0 bd 02 9b 75 79  |..1..o........uy|
-00000020  31 d7 9d 38 ad d3 3f 3d  37 7b 2b 0c 9e 01 eb 48  |1..8..?=7{+....H|
-00000030  db fd e2 13 92 d6 75 27  67 f5 1c                 |......u'g..|
+00000000  14 03 01 00 01 01 16 03  01 00 30 f9 e9 d7 8c 4a  |..........0....J|
+00000010  6b f4 c9 88 d6 98 70 53  13 fc 51 9c 81 14 cf 71  |k.....pS..Q....q|
+00000020  d9 30 7a d9 2c 34 96 00  a4 a0 2b 1e 7d ff d0 f2  |.0z.,4....+.}...|
+00000030  b7 81 ed 86 c5 e1 09 16  82 47 20                 |.........G |
 >>> Flow 5 (client to server)
-00000000  17 03 01 00 20 6e b9 45  11 17 34 fd 03 ec 49 11  |.... n.E..4...I.|
-00000010  b1 2c cb d8 53 20 21 8f  1a 0f 04 3e ef 73 0f a0  |.,..S !....>.s..|
-00000020  4c 1f df 63 08 17 03 01  00 20 ab 15 7e c9 84 36  |L..c..... ..~..6|
-00000030  06 f2 f3 fe a6 cf ad 04  16 26 49 a2 bd 32 b2 a1  |.........&I..2..|
-00000040  08 8c c6 98 2f 1f 01 8a  13 be 15 03 01 00 20 90  |..../......... .|
-00000050  6a b8 ab fc 99 e0 79 1e  fc 5d 7d f4 07 f8 ff c5  |j.....y..]}.....|
-00000060  e7 62 c6 31 1e 93 08 4c  78 50 b5 d2 db 7f 79     |.b.1...LxP....y|
+00000000  17 03 01 00 20 db b5 66  4e fb b1 47 8a 8e 6b a8  |.... ..fN..G..k.|
+00000010  03 53 1a 51 22 8e 47 a3  3a 74 ed a4 6a aa 79 fd  |.S.Q".G.:t..j.y.|
+00000020  55 0f ac 35 a9 17 03 01  00 20 3e 0b 39 f5 5a 03  |U..5..... >.9.Z.|
+00000030  43 d9 e2 7d 1c dc 3b 42  82 2a 2d d4 04 0a 76 97  |C..}..;B.*-...v.|
+00000040  70 ed ee 99 58 15 40 c1  3a d5 15 03 01 00 20 bf  |p...X.@.:..... .|
+00000050  ea e8 93 67 a4 91 1a b5  f5 03 a5 94 50 95 41 16  |...g........P.A.|
+00000060  b0 2a 74 d9 32 65 94 35  45 b9 0f 2e 80 87 fd     |.*t.2e.5E......|