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

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
index 494bad391f..76f0c2511b 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-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 03 00 59 02 00 00  55 03 03 ec cc 8c b3 7b  |....Y...U......{|
-00000010  7a 62 0f 0c 6b a8 15 b8  cc 1f fd 10 bf e5 37 34  |zb..k.........74|
-00000020  ef 7e 62 15 14 59 11 91  6d 49 a1 20 91 fb 98 6d  |.~b..Y..mI. ...m|
-00000030  d2 7e 50 30 c5 c5 c2 bd  d2 b2 7d 02 82 1d 1e 80  |.~P0......}.....|
-00000040  01 b7 df f6 4b 30 cb ce  d0 d4 2e 92 c0 2f 00 00  |....K0......./..|
+00000000  16 03 03 00 59 02 00 00  55 03 03 92 93 45 4c f9  |....Y...U....EL.|
+00000010  93 bf ee 78 58 e0 42 b6  df 32 c2 63 6d ec 89 66  |...xX.B..2.cm..f|
+00000020  5a 11 7c 0d 31 2f b5 90  22 ab 3d 20 65 f3 40 c4  |Z.|.1/..".= e.@.|
+00000030  f8 31 fa 80 f3 fb a7 f6  9e dc 0c 94 67 48 d9 2b  |.1..........gH.+|
+00000040  cb 94 82 5f 4e 8b 41 5e  c6 63 27 da c0 2f 00 00  |..._N.A^.c'../..|
 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 f0 12 33 b8 af 7f 1e  |........ ..3....|
-000002d0  11 b6 9a aa 42 0d 8e 1f  5d 3f a5 38 10 b6 6c cf  |....B...]?.8..l.|
-000002e0  36 14 6b 50 d6 73 78 38  63 04 01 00 80 cc 76 3b  |6.kP.sx8c.....v;|
-000002f0  f2 ee 84 7c 46 ed 0f ff  06 bd f7 ab 5c d2 68 b9  |...|F.......\.h.|
-00000300  fc 9e 8c 19 5b 6d 5c be  be 0f 09 e7 1c 1d 67 77  |....[m\.......gw|
-00000310  00 c2 22 02 2f 2d 86 c0  f3 48 fb 0e 4c 5c f0 b7  |.."./-...H..L\..|
-00000320  f9 e8 86 3a 94 0c b5 a0  56 8a 89 49 dd 5d 34 80  |...:....V..I.]4.|
-00000330  02 fe 23 fe 3e 2f 22 b5  09 9d 9a 03 66 d0 6e 3d  |..#.>/".....f.n=|
-00000340  a7 2f d3 2a b5 8c 6e eb  1e 9c fe 53 fb 94 a0 45  |./.*..n....S...E|
-00000350  1e 20 2b 96 1b 1f 9c ee  64 df 27 66 6e 5d ec 61  |. +.....d.'fn].a|
-00000360  e9 aa 76 31 8f 9d ce f7  2b 03 8b ac 05 16 03 03  |..v1....+.......|
+000002c0  ac 0c 00 00 a8 03 00 1d  20 66 49 44 2b 04 fe f5  |........ fID+...|
+000002d0  41 68 60 09 81 0e 24 c4  46 68 33 87 41 dd 48 69  |Ah`...$.Fh3.A.Hi|
+000002e0  4c be c8 22 2d 4e ff 80  20 04 01 00 80 30 85 40  |L.."-N.. ....0.@|
+000002f0  30 56 d5 1d 41 14 9d e8  27 39 a2 18 d5 eb 92 27  |0V..A...'9.....'|
+00000300  63 4b 05 85 1a 9e 5f 60  2c 80 a3 20 9f 9c 57 29  |cK...._`,.. ..W)|
+00000310  ba 5f ac 0a aa 89 98 fc  ca 8e 37 6b 44 bc 0f 33  |._........7kD..3|
+00000320  5d 47 91 46 55 d4 f9 4f  76 73 51 c4 f6 a9 90 e4  |]G.FU..OvsQ.....|
+00000330  95 10 92 94 f1 33 11 3d  83 0a eb 5d ff e6 9d 9c  |.....3.=...]....|
+00000340  19 ec e1 65 11 ad d7 7b  6a a4 f9 d8 b6 0c 53 8a  |...e...{j.....S.|
+00000350  16 d5 1f a7 0b 80 6f c5  d8 6a 57 11 2f b1 84 65  |......o..jW./..e|
+00000360  24 8a 02 de aa 10 40 bd  9b 68 a2 b7 b6 16 03 03  |$.....@..h......|
 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,26 +105,26 @@
 00000200  e5 35 16 03 03 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 03 00  |......._X.;t....|
-00000230  88 0f 00 00 84 05 01 00  80 6a 76 53 cc dd 4d d8  |.........jvS..M.|
-00000240  33 94 d3 5d 48 ec b6 0a  de 44 58 fc 95 a9 87 a4  |3..]H....DX.....|
-00000250  e7 9d 60 0c 33 69 e7 bc  f6 83 2d 03 28 8e dc 20  |..`.3i....-.(.. |
-00000260  15 71 10 dc 8e b2 e0 a3  4e 68 0c 6d a9 34 f0 e3  |.q......Nh.m.4..|
-00000270  8a 24 e6 ba 6b 8c c1 23  ae 5d c4 2d cd 21 9e e1  |.$..k..#.].-.!..|
-00000280  13 84 a4 1b 10 df 43 f2  4d 04 93 46 51 c7 36 0b  |......C.M..FQ.6.|
-00000290  ca e2 dc 35 2a 80 18 e5  72 06 c0 51 81 21 2f 62  |...5*...r..Q.!/b|
-000002a0  60 a7 f9 f3 d3 85 5f 22  4b 78 62 76 70 db 8c f0  |`....._"Kxbvp...|
-000002b0  0a 29 d1 ab 64 c5 d5 45  dc 14 03 03 00 01 01 16  |.)..d..E........|
-000002c0  03 03 00 28 00 00 00 00  00 00 00 00 63 18 f4 94  |...(........c...|
-000002d0  17 00 8b 17 4e b6 3d e7  d5 24 e6 a8 a6 90 fa bd  |....N.=..$......|
-000002e0  3e e4 78 bf 4e 50 ae 92  1f bb 27 7b              |>.x.NP....'{|
+00000230  88 0f 00 00 84 05 01 00  80 05 9b 97 90 30 0b 21  |.............0.!|
+00000240  ed 52 16 19 e0 54 7d 59  42 17 94 81 9b 2c b6 5b  |.R...T}YB....,.[|
+00000250  7f 7c 8e a5 bf 27 a9 25  14 74 f0 37 fa 6e 2b 84  |.|...'.%.t.7.n+.|
+00000260  80 a4 cd ae a6 8a 1b 62  2d 5e 03 ff 70 55 d7 99  |.......b-^..pU..|
+00000270  68 3c b3 0e 03 41 ae af  c6 3e 09 d4 16 8e 06 71  |h<...A...>.....q|
+00000280  14 f8 90 97 cd f6 eb 7d  90 3c d1 f3 95 db 35 3c  |.......}.<....5<|
+00000290  c9 7d dc 30 55 e1 a0 66  8e 26 20 4f 43 89 08 6f  |.}.0U..f.& OC..o|
+000002a0  95 58 42 ae e8 6c b6 77  45 c6 8c c7 ad e5 ed ff  |.XB..l.wE.......|
+000002b0  09 6f 2e 7e b0 e4 5c f2  db 14 03 03 00 01 01 16  |.o.~..\.........|
+000002c0  03 03 00 28 00 00 00 00  00 00 00 00 c0 2c cc 32  |...(.........,.2|
+000002d0  78 5e 6c 3e e9 a3 83 65  b4 bb 4e 79 b2 04 08 30  |x^l>...e..Ny...0|
+000002e0  09 e9 04 99 70 48 44 95  26 b0 37 c9              |....pHD.&.7.|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 28 bc 3c df ab 59  |..........(.<..Y|
-00000010  84 ac 66 96 2a 71 da 4c  6d 43 69 c9 62 44 e2 2a  |..f.*q.LmCi.bD.*|
-00000020  36 cc a7 c6 ef df 3f 95  8a 07 d4 95 fc 84 7d 88  |6.....?.......}.|
-00000030  98 70 c8                                          |.p.|
+00000000  14 03 03 00 01 01 16 03  03 00 28 5f 80 e2 f1 78  |..........(_...x|
+00000010  0f cb 58 5c 3c 50 4c 1e  33 8a 1f b7 89 92 37 11  |..X\<PL.3.....7.|
+00000020  a3 8a 76 39 4a 3d b0 1f  a3 e9 ba 52 f8 2b e5 a3  |..v9J=.....R.+..|
+00000030  59 7c ac                                          |Y|.|
 >>> Flow 5 (client to server)
-00000000  17 03 03 00 1e 00 00 00  00 00 00 00 01 d3 a5 de  |................|
-00000010  f4 95 bc eb 72 cc 58 ea  10 ed 66 20 29 4c a1 ff  |....r.X...f )L..|
-00000020  e5 28 56 15 03 03 00 1a  00 00 00 00 00 00 00 02  |.(V.............|
-00000030  bf b4 94 6d 93 b1 be 47  dd 79 3f b4 b4 91 e8 8d  |...m...G.y?.....|
-00000040  65 d6                                             |e.|
+00000000  17 03 03 00 1e 00 00 00  00 00 00 00 01 75 dc 54  |.............u.T|
+00000010  d9 c5 b1 c2 c9 64 9a ea  20 e5 76 61 6c 05 af 33  |.....d.. .val..3|
+00000020  6b bc d7 15 03 03 00 1a  00 00 00 00 00 00 00 02  |k...............|
+00000030  24 6b 03 76 d3 da d0 ee  a6 32 c3 58 a1 5e a5 21  |$k.v.....2.X.^.!|
+00000040  b8 3a                                             |.:|