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

diff --git a/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
index 2fd755e50c..4e52915ac5 100644
--- a/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
+++ b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
@@ -1,7 +1,7 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 73 01 00 00  6f 03 03 e0 a2 fa ce e1  |....s...o.......|
-00000010  09 f4 dc 29 05 6d 58 a3  76 ee 23 bc eb e3 11 b0  |...).mX.v.#.....|
-00000020  93 43 91 69 27 8a e1 fb  0b a2 60 00 00 04 c0 2f  |.C.i'.....`..../|
+00000000  16 03 01 00 73 01 00 00  6f 03 03 4e 1a d7 67 e4  |....s...o..N..g.|
+00000010  d1 11 85 bc 62 59 da 8f  ea d0 a0 2b 9b d3 47 aa  |....bY.....+..G.|
+00000020  d0 39 6f 3f 42 dc 7c 16  bb 25 ef 00 00 04 c0 2f  |.9o?B.|..%...../|
 00000030  00 ff 01 00 00 42 00 0b  00 04 03 00 01 02 00 0a  |.....B..........|
 00000040  00 0a 00 08 00 1d 00 17  00 19 00 18 00 0d 00 20  |............... |
 00000050  00 1e 06 01 06 02 06 03  05 01 05 02 05 03 04 01  |................|
@@ -52,28 +52,28 @@
 00000290  3b e9 fa e7 16 03 03 00  ac 0c 00 00 a8 03 00 1d  |;...............|
 000002a0  20 2f e5 7d a3 47 cd 62  43 15 28 da ac 5f bb 29  | /.}.G.bC.(.._.)|
 000002b0  07 30 ff f6 84 af c4 cf  c2 ed 90 99 5f 58 cb 3b  |.0.........._X.;|
-000002c0  74 05 01 00 80 48 99 55  da 4d dc cb 40 a5 ae 4f  |t....H.U.M..@..O|
-000002d0  d7 01 11 60 a8 70 c3 4e  0b 46 55 59 8c 7c 24 2d  |...`.p.N.FUY.|$-|
-000002e0  15 93 f9 a4 6e 74 00 f5  2f f3 35 69 58 b6 f1 5c  |....nt../.5iX..\|
-000002f0  0e 2f ba 55 28 fb 7a 34  6f e1 a1 dc 91 f1 6f 9e  |./.U(.z4o.....o.|
-00000300  84 3a e6 12 9a 4d 49 45  8b 14 59 ca 18 aa a5 33  |.:...MIE..Y....3|
-00000310  4f b3 1a 88 97 d5 c2 fa  cb 24 bc 5b cb 2a d6 46  |O........$.[.*.F|
-00000320  54 68 42 7c c8 eb 8b 93  68 2f 4b e2 cf 81 43 af  |ThB|....h/K...C.|
-00000330  d1 d2 50 9f d7 d6 1c 41  62 c1 36 75 d2 b1 e6 0e  |..P....Ab.6u....|
-00000340  4d 17 18 0a 5d 16 03 03  00 04 0e 00 00 00        |M...].........|
+000002c0  74 05 01 00 80 b2 49 30  60 b7 0c 48 cb 9f 1c 75  |t.....I0`..H...u|
+000002d0  a6 b0 b0 7b 5e e6 f9 bc  5a 49 d4 51 e2 76 4c 01  |...{^...ZI.Q.vL.|
+000002e0  55 bd 37 cf 86 75 4f 33  9b fd 3c fc bb da 81 a9  |U.7..uO3..<.....|
+000002f0  26 7b 82 31 c5 51 0f d4  e8 fa a3 16 45 19 c8 40  |&{.1.Q......E..@|
+00000300  23 fa 32 bc 05 36 fb a7  a2 d9 6f e7 bc b8 27 0b  |#.2..6....o...'.|
+00000310  2a 9e 7b 95 fd b4 c0 2e  f0 73 fe fb a2 ea 20 a2  |*.{......s.... .|
+00000320  73 73 96 c8 bc 82 58 09  84 fc f4 09 2a c8 68 cb  |ss....X.....*.h.|
+00000330  66 b0 de 2c 78 7a d4 ec  06 f1 1c 52 03 5a 69 24  |f..,xz.....R.Zi$|
+00000340  c4 e6 bb 68 f4 16 03 03  00 04 0e 00 00 00        |...h..........|
 >>> Flow 3 (client to server)
-00000000  16 03 03 00 25 10 00 00  21 20 c6 88 23 46 a5 6c  |....%...! ..#F.l|
-00000010  ba 69 bb 5e 23 b1 27 01  5e 9d 7f 45 72 93 63 31  |.i.^#.'.^..Er.c1|
-00000020  e8 f2 87 08 9d 01 75 32  82 56 14 03 03 00 01 01  |......u2.V......|
-00000030  16 03 03 00 28 1e f0 f4  f5 2d b5 37 5b e1 59 60  |....(....-.7[.Y`|
-00000040  70 eb 63 31 ca 3b 41 7c  39 52 fd 33 1b 40 61 22  |p.c1.;A|9R.3.@a"|
-00000050  8f 24 69 dd 91 62 f8 d3  a2 2a a4 31 a9           |.$i..b...*.1.|
+00000000  16 03 03 00 25 10 00 00  21 20 41 d4 8d 53 2e 47  |....%...! A..S.G|
+00000010  b8 35 ba 86 3c 41 07 2e  c1 a0 9d c2 e9 11 d8 20  |.5..<A......... |
+00000020  a1 fa 0a ff 28 64 5b af  c3 67 14 03 03 00 01 01  |....(d[..g......|
+00000030  16 03 03 00 28 78 fd 19  36 4d a7 ca ab ba 06 6b  |....(x..6M.....k|
+00000040  3f a5 79 17 2f 2b ec f6  19 db 17 1a 52 ea 72 0b  |?.y./+......R.r.|
+00000050  01 af 56 8b 14 8f 8a 04  f3 ff ea fe 33           |..V.........3|
 >>> Flow 4 (server to client)
 00000000  14 03 03 00 01 01 16 03  03 00 28 00 00 00 00 00  |..........(.....|
-00000010  00 00 00 4e d7 27 fc b0  64 d8 64 a2 4b d3 a7 52  |...N.'..d.d.K..R|
-00000020  2a 30 7a 97 d2 61 6f 4b  2f d3 81 5c 99 b3 69 3e  |*0z..aoK/..\..i>|
-00000030  29 aa 7b 17 03 03 00 25  00 00 00 00 00 00 00 01  |).{....%........|
-00000040  0a e3 da e2 13 b5 b8 d5  01 e9 54 ba ad 43 3c 11  |..........T..C<.|
-00000050  12 70 23 b6 c4 6c 5c 5a  c5 14 3c ef cd 15 03 03  |.p#..l\Z..<.....|
-00000060  00 1a 00 00 00 00 00 00  00 02 37 f7 d8 64 bb 4b  |..........7..d.K|
-00000070  ff b9 8d 5a aa 47 0a 33  12 37 29 f8              |...Z.G.3.7).|
+00000010  00 00 00 ec 99 e0 9a 83  28 94 e6 72 4f be 28 24  |........(..rO.($|
+00000020  64 bd 9d 86 79 cc ab 05  15 39 06 6e da 0c b8 4e  |d...y....9.n...N|
+00000030  6c a9 f3 17 03 03 00 25  00 00 00 00 00 00 00 01  |l......%........|
+00000040  9a d7 b0 54 dd 3c ae 8e  3f 1f 41 68 a5 01 a0 da  |...T.<..?.Ah....|
+00000050  e8 8e 90 55 1a 11 f0 70  8d a3 af a4 29 15 03 03  |...U...p....)...|
+00000060  00 1a 00 00 00 00 00 00  00 02 a8 96 cb 16 d7 b1  |................|
+00000070  41 7e bc 0e 01 8f cc 47  40 e5 c7 2a              |A~.....G@..*|