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

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
index 89426a602d..fb6c940a5f 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-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 03 00 59 02 00 00  55 03 03 04 3b 69 ac b4  |....Y...U...;i..|
-00000010  14 b1 67 6d 1e 99 ab f5  57 c2 a9 99 33 8c 9d 31  |..gm....W...3..1|
-00000020  26 ec 17 43 1a b2 62 36  a0 c3 bd 20 52 d5 07 92  |&..C..b6... R...|
-00000030  e5 d8 a6 2f a5 8d e6 df  b1 90 69 7a 94 2d d7 73  |.../......iz.-.s|
-00000040  cb da 29 ee 6f 13 e5 2d  7f 3a 0e cd c0 2f 00 00  |..).o..-.:.../..|
+00000000  16 03 03 00 59 02 00 00  55 03 03 2e d2 1c 3f f8  |....Y...U.....?.|
+00000010  3a dc be 78 0b fa 03 00  e0 9a b9 62 34 45 f8 34  |:..x.......b4E.4|
+00000020  54 21 4c c0 76 a6 e1 5a  a1 67 c2 20 1b 98 25 34  |T!L.v..Z.g. ..%4|
+00000030  79 ac 59 b5 39 c8 93 10  a9 ea 9d 25 3d 2c d8 69  |y.Y.9......%=,.i|
+00000040  da d8 33 75 ef 44 4c 76  92 2b 3b b4 c0 2f 00 00  |..3u.DLv.+;../..|
 00000050  0d ff 01 00 01 00 00 0b  00 04 03 00 01 02 16 03  |................|
 00000060  03 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 03 00  |.=.`.\!.;.......|
-000002c0  ac 0c 00 00 a8 03 00 1d  20 d7 5f 84 86 e0 7c 20  |........ ._...| |
-000002d0  c5 97 78 c1 40 3f 64 2e  ae 06 51 c3 6f d3 86 a2  |..x.@?d...Q.o...|
-000002e0  03 d3 f8 75 ed 20 28 6b  26 04 01 00 80 c3 8b b6  |...u. (k&.......|
-000002f0  81 65 e3 d2 98 33 78 c8  d4 d4 6a 80 3b cc 26 ab  |.e...3x...j.;.&.|
-00000300  7a 2f d0 0e 02 57 0d 34  30 78 a1 7b d4 df e1 da  |z/...W.40x.{....|
-00000310  7f 8e 04 65 45 8d b9 ad  04 13 84 e2 81 da e0 b6  |...eE...........|
-00000320  20 07 02 f9 e5 78 5e d4  0d 74 f5 d2 98 a8 9b d8  | ....x^..t......|
-00000330  f4 f3 7b 2f 8f 58 58 77  b6 db 4d d0 94 53 df 5a  |..{/.XXw..M..S.Z|
-00000340  61 43 2d a7 64 ec b1 8f  48 80 b4 fd 6c 05 f6 84  |aC-.d...H...l...|
-00000350  b5 d2 0d 30 5d 2f 9d 9f  8f 14 d0 e1 70 64 0b 86  |...0]/......pd..|
-00000360  c3 26 7d b2 b2 f5 9f 9e  de 6e 92 47 76 16 03 03  |.&}......n.Gv...|
+000002c0  ac 0c 00 00 a8 03 00 1d  20 06 be 1b 0b d8 95 59  |........ ......Y|
+000002d0  b2 13 1c 4a 06 b8 36 3e  4f 98 3f 81 11 3e 7d 21  |...J..6>O.?..>}!|
+000002e0  fa d9 f0 db 1b 41 4a d0  14 04 01 00 80 ca 57 f5  |.....AJ.......W.|
+000002f0  e7 b6 72 7e 3f b0 67 f2  a2 d0 84 d5 7f 7d 83 ff  |..r~?.g......}..|
+00000300  92 73 4f 19 f7 94 b6 d7  95 f4 1b 56 2a fc fa 24  |.sO........V*..$|
+00000310  3e fe 00 65 52 76 c8 30  8a bf ae fe b5 c9 f2 47  |>..eRv.0.......G|
+00000320  0a 71 ad c1 6a 61 8c b5  ab 59 09 12 92 b2 b4 ad  |.q..ja...Y......|
+00000330  cb cc ac c4 30 e9 a4 8a  82 4e 2e d6 1d 16 46 dd  |....0....N....F.|
+00000340  60 37 50 b8 ae 83 c1 e6  1d ba 8c c7 18 f7 5e d7  |`7P...........^.|
+00000350  23 e5 8a 14 ba e4 8e a1  77 8a b6 41 03 61 8a 25  |#.......w..A.a.%|
+00000360  8a 27 f8 cb 2e 4a e0 07  aa bf 03 32 98 16 03 03  |.'...J.....2....|
 00000370  00 2a 0d 00 00 26 03 01  02 40 00 1e 06 01 06 02  |.*...&...@......|
 00000380  06 03 05 01 05 02 05 03  04 01 04 02 04 03 03 01  |................|
 00000390  03 02 03 03 02 01 02 02  02 03 00 00 16 03 03 00  |................|
@@ -105,28 +105,28 @@
 00000200  e4 fa cc b1 8a ce e2 23  a0 87 f0 e1 67 51 eb 16  |.......#....gQ..|
 00000210  03 03 00 25 10 00 00 21  20 2f e5 7d a3 47 cd 62  |...%...! /.}.G.b|
 00000220  43 15 28 da ac 5f bb 29  07 30 ff f6 84 af c4 cf  |C.(.._.).0......|
-00000230  c2 ed 90 99 5f 58 cb 3b  74 16 03 03 00 93 0f 00  |...._X.;t.......|
-00000240  00 8f 05 03 00 8b 30 81  88 02 42 01 6d 16 77 ad  |......0...B.m.w.|
-00000250  3f 82 a2 df 03 16 35 64  a0 19 e9 e1 dd 21 f3 dc  |?.....5d.....!..|
-00000260  a4 c8 98 ae 2c 28 02 cc  85 c3 f9 fe eb 60 6f ac  |....,(.......`o.|
-00000270  b8 03 25 2e 48 fb 7c 8b  4a 6e b3 5c 4d 83 77 a1  |..%.H.|.Jn.\M.w.|
-00000280  d6 ed c3 df 8b 16 09 81  3d 81 a7 e2 6d 02 42 01  |........=...m.B.|
-00000290  df a2 14 a8 e5 4b 02 63  1e 3a a6 70 18 75 78 d9  |.....K.c.:.p.ux.|
-000002a0  ae eb 89 35 09 7b 56 9c  1e 61 82 26 6e c1 f5 02  |...5.{V..a.&n...|
-000002b0  5e 7c 71 53 5b 3a a2 17  5f 58 38 86 f5 32 17 40  |^|qS[:.._X8..2.@|
-000002c0  e8 b6 04 61 ee 0a df c0  ee d1 e0 16 aa 88 34 f4  |...a..........4.|
-000002d0  ad 14 03 03 00 01 01 16  03 03 00 28 00 00 00 00  |...........(....|
-000002e0  00 00 00 00 4b b7 1d c9  55 aa 66 46 df 94 39 e9  |....K...U.fF..9.|
-000002f0  96 9e 89 e0 e6 f3 f2 11  0b f2 9a 71 25 e2 2f aa  |...........q%./.|
-00000300  8a 77 a8 7b                                       |.w.{|
+00000230  c2 ed 90 99 5f 58 cb 3b  74 16 03 03 00 92 0f 00  |...._X.;t.......|
+00000240  00 8e 05 03 00 8a 30 81  87 02 41 19 c6 1e f0 f4  |......0...A.....|
+00000250  ca 79 d7 8c 36 0f 56 9a  9d 07 55 31 fe 63 f1 ec  |.y..6.V...U1.c..|
+00000260  20 80 6f 12 ed 7f bb c0  87 0a 0d 68 81 89 bd 8b  | .o........h....|
+00000270  19 04 5e c0 19 8a d2 0f  6d 71 83 59 ee a7 be be  |..^.....mq.Y....|
+00000280  1d bb 2f 12 53 9b ca 58  0e a6 8d ae 02 42 00 d0  |../.S..X.....B..|
+00000290  4c 69 75 30 86 d1 da 73  1b 8e 3e e1 82 9b f3 58  |Liu0...s..>....X|
+000002a0  8f 6d 0a 10 86 72 5f 90  17 d1 ac 34 8a b5 60 d0  |.m...r_....4..`.|
+000002b0  b8 54 0f 05 7f cd 6a c0  62 b5 04 d9 3a 98 95 b6  |.T....j.b...:...|
+000002c0  b3 00 1d 94 6e 79 35 57  d2 78 a4 7a 4a 45 89 d1  |....ny5W.x.zJE..|
+000002d0  14 03 03 00 01 01 16 03  03 00 28 00 00 00 00 00  |..........(.....|
+000002e0  00 00 00 cf b5 3c cf 0a  b7 6b 51 cb fe 06 4c df  |.....<...kQ...L.|
+000002f0  2c 79 a6 5e a8 75 8b 4c  44 7b ae ff 64 d7 67 dc  |,y.^.u.LD{..d.g.|
+00000300  af ef 54                                          |..T|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 28 11 75 ff 06 73  |..........(.u..s|
-00000010  15 0d 08 4b e8 0b 91 56  b0 bb 28 2b 5d df 73 21  |...K...V..(+].s!|
-00000020  16 99 52 30 56 e9 fb a2  9f c6 8b 3b 38 be 32 96  |..R0V......;8.2.|
-00000030  3c 8d cb                                          |<..|
+00000000  14 03 03 00 01 01 16 03  03 00 28 1c 12 5e 29 ba  |..........(..^).|
+00000010  34 b3 d8 ae f7 2a 83 0d  3e 21 ec 91 c9 fa 7f d1  |4....*..>!......|
+00000020  42 7e 8d d9 e5 ed 4e f9  ae 95 66 27 85 cc 44 2d  |B~....N...f'..D-|
+00000030  cd a3 26                                          |..&|
 >>> Flow 5 (client to server)
-00000000  17 03 03 00 1e 00 00 00  00 00 00 00 01 8d b0 1a  |................|
-00000010  28 53 1d 8f df ad 0c f4  29 b1 89 01 6d f4 f2 7f  |(S......)...m...|
-00000020  29 88 4c 15 03 03 00 1a  00 00 00 00 00 00 00 02  |).L.............|
-00000030  6b b0 6f ca 9a 62 19 e9  a1 37 27 dc 3c 00 b8 03  |k.o..b...7'.<...|
-00000040  4c b4                                             |L.|
+00000000  17 03 03 00 1e 00 00 00  00 00 00 00 01 8b 4c 36  |..............L6|
+00000010  6f b8 69 16 0a 40 67 05  5e a8 e6 48 cc ad 7b 29  |o.i..@g.^..H..{)|
+00000020  95 3d 02 15 03 03 00 1a  00 00 00 00 00 00 00 02  |.=..............|
+00000030  58 e3 b5 8e 30 e7 5d 02  cd e5 c0 11 95 3a ef a9  |X...0.]......:..|
+00000040  d7 86                                             |..|