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

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
index a61dccc246..1ff91986d2 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
@@ -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 b5 1b a7 76 84  |....Y...U.....v.|
-00000010  6b 76 c7 d4 db 65 6e e7  f8 df 4e cb 27 33 77 e3  |kv...en...N.'3w.|
-00000020  15 b3 47 eb 35 c8 11 80  d9 33 6f 20 a4 6c b2 e6  |..G.5....3o .l..|
-00000030  95 77 72 69 11 59 10 8b  ee 75 a3 68 f8 87 36 31  |.wri.Y...u.h..61|
-00000040  19 09 80 27 e4 63 cf 93  4f 85 82 f5 c0 09 00 00  |...'.c..O.......|
+00000000  16 03 03 00 59 02 00 00  55 03 03 84 4b ff a4 2a  |....Y...U...K..*|
+00000010  a4 76 c0 26 f6 05 72 94  01 15 44 f2 c6 7d b0 4b  |.v.&..r...D..}.K|
+00000020  1b fa da 51 54 45 78 66  e6 0a dd 20 17 df d2 0c  |...QTExf... ....|
+00000030  2f d6 55 b9 ae 82 ce 2f  2f 07 67 54 5e 02 bd 2f  |/.U....//.gT^../|
+00000040  48 f6 fb 3d 9c fa 4f a8  66 15 08 da c0 09 00 00  |H..=..O.f.......|
 00000050  0d ff 01 00 01 00 00 0b  00 04 03 00 01 02 16 03  |................|
 00000060  03 02 0e 0b 00 02 0a 00  02 07 00 02 04 30 82 02  |.............0..|
 00000070  00 30 82 01 62 02 09 00  b8 bf 2d 47 a0 d2 eb f4  |.0..b.....-G....|
@@ -49,18 +49,18 @@
 00000240  13 83 0d 94 06 bb d4 37  7a f6 ec 7a c9 86 2e dd  |.......7z..z....|
 00000250  d7 11 69 7f 85 7c 56 de  fb 31 78 2b e4 c7 78 0d  |..i..|V..1x+..x.|
 00000260  ae cb be 9e 4e 36 24 31  7b 6a 0f 39 95 12 07 8f  |....N6$1{j.9....|
-00000270  2a 16 03 03 00 b7 0c 00  00 b3 03 00 1d 20 20 fd  |*............  .|
-00000280  ab d5 d0 a5 9d bd ff 8f  03 f1 45 8d 64 04 50 1c  |..........E.d.P.|
-00000290  72 e7 29 36 af 91 39 d8  10 3d e8 6f 7d 17 04 03  |r.)6..9..=.o}...|
-000002a0  00 8b 30 81 88 02 42 00  ca bc 74 65 5b 16 c0 66  |..0...B...te[..f|
-000002b0  01 73 bb 25 6f 14 1b 91  06 b4 07 a9 b1 9e 89 77  |.s.%o..........w|
-000002c0  7f 9f 00 85 be 66 96 58  63 c5 8b c5 84 2c 16 04  |.....f.Xc....,..|
-000002d0  7f 78 0b 48 2b 4c 41 50  6f d3 e4 0d 0c e9 42 39  |.x.H+LAPo.....B9|
-000002e0  07 2f fc d4 53 43 9f 82  52 02 42 01 17 01 a4 8b  |./..SC..R.B.....|
-000002f0  bf af 45 8a 92 fe 88 f5  00 7e 29 d1 9d 8b d4 a9  |..E......~).....|
-00000300  7c 07 50 74 44 7d 6d 3a  ac ee ca 14 18 a7 dc 54  ||.PtD}m:.......T|
-00000310  38 58 be fd 00 75 53 26  cd 8c a9 cf a0 ce d7 97  |8X...uS&........|
-00000320  d9 20 1d cf 3c 27 0c 0d  20 62 33 d5 e8 16 03 03  |. ..<'.. b3.....|
+00000270  2a 16 03 03 00 b7 0c 00  00 b3 03 00 1d 20 5d 4e  |*............ ]N|
+00000280  0c 9e ad 7b f1 48 0c db  03 96 26 2e 16 87 2c e2  |...{.H....&...,.|
+00000290  ce a2 47 5a 57 30 e8 e1  7e b2 53 5b c6 7b 04 03  |..GZW0..~.S[.{..|
+000002a0  00 8b 30 81 88 02 42 00  e8 8e 68 a8 e3 b5 b4 fe  |..0...B...h.....|
+000002b0  b9 91 aa 4f 96 3d 97 8d  b2 ef 23 a4 3d 16 db 2b  |...O.=....#.=..+|
+000002c0  50 6d 52 cd a5 e7 79 ae  65 10 d6 36 e0 ba c3 6b  |PmR...y.e..6...k|
+000002d0  53 61 14 bb 05 47 5a df  26 2f cb 3a 95 c6 6b dc  |Sa...GZ.&/.:..k.|
+000002e0  88 fd 2e 22 b5 ef ff 31  0e 02 42 01 be ce 6e 53  |..."...1..B...nS|
+000002f0  42 43 1c 1c d8 83 7f 45  c4 16 ee d2 7b 66 a0 f4  |BC.....E....{f..|
+00000300  f3 14 da 5c 14 e8 fc bc  86 7d 18 43 b9 7b 90 8c  |...\.....}.C.{..|
+00000310  af f1 05 95 c6 53 0b 0b  0d 10 a1 e9 bb 89 35 c2  |.....S........5.|
+00000320  b2 e1 d7 dd 99 7c bf 85  19 3c 4e 8e 8f 16 03 03  |.....|...<N.....|
 00000330  00 2a 0d 00 00 26 03 01  02 40 00 1e 06 01 06 02  |.*...&...@......|
 00000340  06 03 05 01 05 02 05 03  04 01 04 02 04 03 03 01  |................|
 00000350  03 02 03 03 02 01 02 02  02 03 00 00 16 03 03 00  |................|
@@ -101,31 +101,31 @@
 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 18 5b ff 66 70 07 cd  |..........[.fp..|
-00000240  9b 6d a3 a6 dc c6 5b 53  42 27 13 71 0c 0e aa 5e  |.m....[SB'.q...^|
-00000250  01 0c 84 34 20 1a af 48  8c 0c 28 07 68 1f 89 4d  |...4 ..H..(.h..M|
-00000260  1c 96 1e de cc 55 5a cd  59 cd 6d fd 8a 5d 09 f4  |.....UZ.Y.m..]..|
-00000270  a0 38 ec e5 c5 84 70 f8  3c c2 4d b7 9b 93 bb 22  |.8....p.<.M...."|
-00000280  e1 d9 4d d7 c1 54 73 55  99 63 fb 0e 1d 2a 41 51  |..M..TsU.c...*AQ|
-00000290  c7 9d 91 d1 1c 1c f2 ae  7e 8f b8 5a 71 20 3a 82  |........~..Zq :.|
-000002a0  99 ef 4c 8f 84 e4 3a 17  d8 a3 f0 06 e4 89 95 89  |..L...:.........|
-000002b0  c8 f3 39 c5 a0 52 00 16  c6 14 03 03 00 01 01 16  |..9..R..........|
+00000230  88 0f 00 00 84 05 01 00  80 98 58 a8 77 3d db 0b  |..........X.w=..|
+00000240  04 36 78 51 8b 23 48 fc  70 2b c9 94 1f ee 32 ae  |.6xQ.#H.p+....2.|
+00000250  41 c0 42 20 19 51 67 e7  fa c0 fd 15 a1 5f 55 4f  |A.B .Qg......_UO|
+00000260  aa be 29 77 f5 47 71 b9  6c 51 89 18 df 25 98 fd  |..)w.Gq.lQ...%..|
+00000270  c8 6e ae e3 fd 99 63 ca  2c d2 fb ca bc 57 b7 7f  |.n....c.,....W..|
+00000280  a2 90 a6 6f b7 2e b7 2a  52 29 e6 75 57 86 cc b1  |...o...*R).uW...|
+00000290  d8 6c f3 4e 49 ab 4b 66  0a 72 aa ec c2 f7 6e 57  |.l.NI.Kf.r....nW|
+000002a0  15 26 79 1a a4 24 c2 ba  76 9e dd b9 f9 d4 da 1b  |.&y..$..v.......|
+000002b0  c9 29 66 eb 64 1b 68 66  66 14 03 03 00 01 01 16  |.)f.d.hff.......|
 000002c0  03 03 00 40 00 00 00 00  00 00 00 00 00 00 00 00  |...@............|
-000002d0  00 00 00 00 6f 19 d0 de  11 e8 13 98 0e ba 3a fd  |....o.........:.|
-000002e0  ba 8d da 63 73 a8 2c 28  a8 b6 de bc 76 ee ec 43  |...cs.,(....v..C|
-000002f0  7b 4a d7 9c 70 4d 59 02  6a 87 5e 33 51 49 63 88  |{J..pMY.j.^3QIc.|
-00000300  cd 6a 4f 13                                       |.jO.|
+000002d0  00 00 00 00 70 2b 69 27  05 9a 96 e6 e8 52 ea 0f  |....p+i'.....R..|
+000002e0  3a d6 40 b5 e2 89 5b bf  aa 95 6c c1 7d 53 09 89  |:.@...[...l.}S..|
+000002f0  23 38 6b 83 85 84 fa f4  2e fb cd b3 57 4e 79 8a  |#8k.........WNy.|
+00000300  92 74 03 22                                       |.t."|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 40 59 c9 2e 02 4d  |..........@Y...M|
-00000010  ac c3 f4 a2 97 8f 92 12  fd 99 c4 80 59 96 f4 af  |............Y...|
-00000020  eb 1b 2d 70 55 8b 28 22  42 9a 61 cd 9c 64 54 d3  |..-pU.("B.a..dT.|
-00000030  f1 a2 25 98 ad 15 cf 7d  82 12 b0 b5 06 1d 5b 21  |..%....}......[!|
-00000040  1d b9 14 69 f8 1b 30 55  67 df 22                 |...i..0Ug."|
+00000000  14 03 03 00 01 01 16 03  03 00 40 8f 91 f1 f5 6b  |..........@....k|
+00000010  cc 52 9d db 35 1f db b4  64 fe 33 a5 83 08 24 2f  |.R..5...d.3...$/|
+00000020  57 18 0e 60 4e 18 54 bb  80 31 37 fe 26 14 b8 c8  |W..`N.T..17.&...|
+00000030  dd c4 8c 07 42 0b 80 0b  41 82 40 f6 9b b8 60 4f  |....B...A.@...`O|
+00000040  cb 7b 43 ea 1a 6e 31 8d  9f 82 f7                 |.{C..n1....|
 >>> Flow 5 (client to server)
 00000000  17 03 03 00 30 00 00 00  00 00 00 00 00 00 00 00  |....0...........|
-00000010  00 00 00 00 00 95 75 2b  6f 14 f6 25 db 2e 1a 98  |......u+o..%....|
-00000020  62 91 50 6d b8 88 ed c4  33 58 2b 33 5f 64 78 e8  |b.Pm....3X+3_dx.|
-00000030  cf 89 29 b5 69 15 03 03  00 30 00 00 00 00 00 00  |..).i....0......|
-00000040  00 00 00 00 00 00 00 00  00 00 d5 d3 10 25 68 c0  |.............%h.|
-00000050  65 67 23 fb cd ee 4c c1  7d ec 15 76 c9 1f cd d5  |eg#...L.}..v....|
-00000060  a5 6e 67 03 d9 27 0d 47  c0 90                    |.ng..'.G..|
+00000010  00 00 00 00 00 70 e7 c8  03 9c e2 58 73 68 ab 9b  |.....p.....Xsh..|
+00000020  5c bf 32 57 f8 f1 13 97  02 59 de 99 d3 3e 16 3d  |\.2W.....Y...>.=|
+00000030  87 11 d4 b4 63 15 03 03  00 30 00 00 00 00 00 00  |....c....0......|
+00000040  00 00 00 00 00 00 00 00  00 00 9b 99 45 f3 0d f1  |............E...|
+00000050  c5 36 07 8c 81 94 b7 0a  dc 7c ee 0c 22 1b 36 fd  |.6.......|..".6.|
+00000060  d4 fc 7d f1 98 8b 87 be  5f c6                    |..}....._.|