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

diff --git a/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
index a6a7676b4b..c81acc8992 100644
--- a/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
+++ b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
@@ -1,7 +1,7 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 5d 01 00 00  59 03 03 94 e5 c5 27 21  |....]...Y.....'!|
-00000010  3f de 6d 5e 20 2f a9 54  9b db db fd 60 38 22 1e  |?.m^ /.T....`8".|
-00000020  df 4a ba e7 40 4e e5 f1  64 58 fa 00 00 04 00 2f  |.J..@N..dX...../|
+00000000  16 03 01 00 5d 01 00 00  59 03 03 f3 3a db 98 ff  |....]...Y...:...|
+00000010  29 a2 30 75 53 87 b3 5f  00 b5 9f 77 4d 88 38 ea  |).0uS.._...wM.8.|
+00000020  e9 87 f4 a4 e4 da dd 73  00 47 d1 00 00 04 00 2f  |.......s.G...../|
 00000030  00 ff 01 00 00 2c 00 0d  00 20 00 1e 06 01 06 02  |.....,... ......|
 00000040  06 03 05 01 05 02 05 03  04 01 04 02 04 03 03 01  |................|
 00000050  03 02 03 03 02 01 02 02  02 03 00 16 00 00 00 17  |................|
@@ -84,40 +84,40 @@
 000001d0  ac 11 b1 28 56 be 1d cd  61 62 84 09 bf d6 80 c6  |...(V...ab......|
 000001e0  45 8d 82 2c b4 d8 83 9b  db c9 22 b7 2a 12 11 7b  |E..,......".*..{|
 000001f0  fa 02 3b c1 c9 ff ea c9  9d a8 49 d3 95 d7 d5 0e  |..;.......I.....|
-00000200  e5 35 16 03 03 00 86 10  00 00 82 00 80 07 40 a1  |.5............@.|
-00000210  a4 df e2 86 a1 2b 63 f9  2b 60 e2 ee 53 2c 31 19  |.....+c.+`..S,1.|
-00000220  30 f6 ca 42 4d 16 c8 f6  7a 93 7c c9 49 b5 46 f5  |0..BM...z.|.I.F.|
-00000230  f8 fc 24 91 83 06 51 b4  96 a3 c4 29 a0 3c c4 64  |..$...Q....).<.d|
-00000240  a9 e3 28 79 88 0a b2 98  26 c7 e3 bf 36 74 cd b7  |..(y....&...6t..|
-00000250  b6 90 6c 6b 52 41 1d 0b  34 3f 28 24 fd 0a fd 53  |..lkRA..4?($...S|
-00000260  e1 ba f8 54 0f a0 01 d1  41 4b ab 2e c6 8a 6e d7  |...T....AK....n.|
-00000270  6b b5 f8 e0 8b 24 b9 d2  ce 67 58 77 95 ad c9 84  |k....$...gXw....|
-00000280  7f a3 6f bc 3c 25 aa 5d  ae b0 d8 9e ac 16 03 03  |..o.<%.]........|
-00000290  00 88 0f 00 00 84 04 01  00 80 54 6c d7 6f 08 34  |..........Tl.o.4|
-000002a0  30 5d 62 1c d2 47 c2 03  1d f3 74 36 f0 41 be 1c  |0]b..G....t6.A..|
-000002b0  b6 d6 e2 69 52 4d 05 19  1e 29 03 fa 84 69 c6 f0  |...iRM...)...i..|
-000002c0  83 2c e1 05 8f 6c 3b 6d  85 a2 5b 17 d1 65 5a 5d  |.,...l;m..[..eZ]|
-000002d0  7a 17 d1 4d b5 10 f7 a5  6d a6 22 5e 34 5c c9 eb  |z..M....m."^4\..|
-000002e0  fc 6e 82 7b fb bc aa 13  56 3e 42 d5 ea 81 25 a8  |.n.{....V>B...%.|
-000002f0  5e 1d cc f8 b3 db 88 68  1b 9d f2 b1 e8 31 07 b4  |^......h.....1..|
-00000300  4e 8f 51 ac a3 7b a8 91  20 30 21 41 c9 b6 db 91  |N.Q..{.. 0!A....|
-00000310  6c 55 e5 95 1a 59 14 82  0f 79 14 03 03 00 01 01  |lU...Y...y......|
-00000320  16 03 03 00 40 5d 23 b8  61 24 07 ff 4c 52 c5 41  |....@]#.a$..LR.A|
-00000330  f2 5c 67 c1 bc 98 82 15  d2 f0 9c fb c8 bc ad df  |.\g.............|
-00000340  20 c0 3f dd 14 68 ec b9  e3 b4 1b 75 8b 90 90 75  | .?..h.....u...u|
-00000350  e6 46 5b 53 76 d4 53 98  d2 e5 13 fa a8 74 18 74  |.F[Sv.S......t.t|
-00000360  ef dd a5 02 2d                                    |....-|
+00000200  e5 35 16 03 03 00 86 10  00 00 82 00 80 47 31 82  |.5...........G1.|
+00000210  ae c1 d2 74 3f a4 74 5a  57 16 ae e2 d0 46 72 53  |...t?.tZW....FrS|
+00000220  e1 5e 6a e8 e4 d5 8c 84  2b d9 82 c1 4a da 9e 1d  |.^j.....+...J...|
+00000230  a0 da 60 08 0d 35 0c 55  6d 6a 68 04 09 ee 94 39  |..`..5.Umjh....9|
+00000240  c7 a3 49 7f 2c ee 6a cf  09 01 bd 08 d3 59 0a bd  |..I.,.j......Y..|
+00000250  7f 6c d3 26 eb be 7b fd  9b 17 fd e2 6e 82 d1 c7  |.l.&..{.....n...|
+00000260  dd c3 64 8c 87 f0 41 f2  71 75 f1 0a 01 26 5b 97  |..d...A.qu...&[.|
+00000270  94 ba ac 50 df 19 32 39  80 ae 14 ea 4a d2 e5 9f  |...P..29....J...|
+00000280  5d 07 9f 2d 89 ac 83 33  40 aa 8e cc 2c 16 03 03  |]..-...3@...,...|
+00000290  00 88 0f 00 00 84 04 01  00 80 7d 37 8b 6f be e9  |..........}7.o..|
+000002a0  e7 fa 4c 28 cf 16 0d 28  40 e9 f2 9a 11 22 fc 8a  |..L(...(@...."..|
+000002b0  2c 52 f7 36 af 1a cf d7  8a f8 17 19 9f ed 9d 1d  |,R.6............|
+000002c0  43 f9 e2 fb 0f dd ca d6  1d 4c 03 4e 25 8d 5c 4c  |C........L.N%.\L|
+000002d0  95 98 02 db cf ea 44 2a  ad 36 74 e3 08 07 e3 9a  |......D*.6t.....|
+000002e0  50 6c dc 46 a1 f5 84 9b  65 7f 48 94 b5 de cc a9  |Pl.F....e.H.....|
+000002f0  cf ee 0e 31 f2 f8 6f 8f  19 4b 29 14 b4 32 1d 21  |...1..o..K)..2.!|
+00000300  02 d2 da 64 68 e8 a1 72  cc ee 64 48 d8 74 e5 64  |...dh..r..dH.t.d|
+00000310  90 b3 50 cc 3e 25 0e b1  88 53 14 03 03 00 01 01  |..P.>%...S......|
+00000320  16 03 03 00 40 6a 61 6b  3e ea 63 2c b8 26 95 e2  |....@jak>.c,.&..|
+00000330  5f 83 e3 c3 cd c3 b7 a8  0b 76 81 8a 5b 46 ff 41  |_........v..[F.A|
+00000340  c2 02 eb 21 85 31 b9 ba  2e 30 e7 6e 8d 1c 49 15  |...!.1...0.n..I.|
+00000350  af a0 a7 67 62 b7 42 8c  fa a8 04 8c 23 7a 3d 39  |...gb.B.....#z=9|
+00000360  74 18 70 2b 99                                    |t.p+.|
 >>> Flow 4 (server to client)
 00000000  14 03 03 00 01 01 16 03  03 00 40 00 00 00 00 00  |..........@.....|
-00000010  00 00 00 00 00 00 00 00  00 00 00 8b ed 4b 14 13  |.............K..|
-00000020  c8 be 9e d4 63 ab 7e 4e  b5 61 43 a2 aa 64 a4 00  |....c.~N.aC..d..|
-00000030  b7 85 b5 67 c5 0c 85 09  c3 d5 b9 2e 70 60 59 d1  |...g........p`Y.|
-00000040  32 68 55 6a 4f 19 e8 5d  c0 06 c5 17 03 03 00 40  |2hUjO..].......@|
+00000010  00 00 00 00 00 00 00 00  00 00 00 a6 5b 7c b0 91  |............[|..|
+00000020  53 f6 d5 e4 34 71 4f 64  2a 03 9d 75 62 d9 8d a8  |S...4qOd*..ub...|
+00000030  39 7b e1 d8 31 80 26 db  14 f3 3a 52 66 7d 12 31  |9{..1.&...:Rf}.1|
+00000040  29 14 7f a1 39 b6 1c e0  c9 55 6e 17 03 03 00 40  |)...9....Un....@|
 00000050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00000060  cd ae 88 cd bb 85 80 23  ac ca d5 3e 67 f7 c1 2d  |.......#...>g..-|
-00000070  0c 08 3f c6 b4 32 c8 ac  ce e8 04 4f 80 41 30 bc  |..?..2.....O.A0.|
-00000080  c2 58 7a 7e 20 e3 4a 63  96 23 70 3e 83 b2 ec 90  |.Xz~ .Jc.#p>....|
+00000060  5e 00 64 9b 25 cd 74 94  b7 65 6e 83 8e 5b 68 e8  |^.d.%.t..en..[h.|
+00000070  59 4c f0 31 8b f2 0c 59  2a ff 11 8e 43 d4 73 fd  |YL.1...Y*...C.s.|
+00000080  b3 2a 76 59 25 52 32 76  bd 2e 1d 4d 0a 53 d7 c2  |.*vY%R2v...M.S..|
 00000090  15 03 03 00 30 00 00 00  00 00 00 00 00 00 00 00  |....0...........|
-000000a0  00 00 00 00 00 9f 18 6b  e8 4b 70 8c e6 f7 d4 bc  |.......k.Kp.....|
-000000b0  3e 65 77 94 7a 51 a0 fb  81 e1 58 94 2f 9a cf 72  |>ew.zQ....X./..r|
-000000c0  1c 22 93 c1 af                                    |."...|
+000000a0  00 00 00 00 00 23 96 6e  7d 41 bb 51 4f 40 52 07  |.....#.n}A.QO@R.|
+000000b0  90 cc 6c bd c0 bb 99 d4  8a 91 7b 8a f3 24 ef 71  |..l.......{..$.q|
+000000c0  20 d4 98 b0 14                                    | ....|