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>
This commit is contained in:
Adam Langley 2016-10-12 10:53:35 -07:00 committed by Brad Fitzpatrick
parent 0b98d05a6d
commit 38982b663e
64 changed files with 2662 additions and 2721 deletions

View file

@ -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 06 d8 a5 58 9e |....Y...U.....X.|
00000010 fd 74 7b 40 b9 db c7 55 80 57 55 1a 5a c1 e2 bb |.t{@...U.WU.Z...|
00000020 bc a4 8a d6 8c 0c 0a 6e d2 30 66 20 7a 9d fa 67 |.......n.0f z..g|
00000030 69 40 76 32 8f 62 42 ec 36 c1 f8 c8 99 5e 18 3b |i@v2.bB.6....^.;|
00000040 34 45 34 f9 19 1b 75 bb d2 79 4d 2c c0 09 00 00 |4E4...u..yM,....|
00000000 16 03 03 00 59 02 00 00 55 03 03 cf 28 2c 3e 4f |....Y...U...(,>O|
00000010 da 6b ae 24 74 a9 91 c3 c5 55 4b ab ec 07 f8 cd |.k.$t....UK.....|
00000020 65 f8 fe 08 f6 9a 23 da 99 6c 5d 20 af 4a 1e 32 |e.....#..l] .J.2|
00000030 7b bd 3c 0b b1 14 66 a3 b7 2f a4 2a c3 43 c4 e0 |{.<...f../.*.C..|
00000040 c2 ad 78 b1 28 ab 51 06 1b 87 d2 75 c0 09 00 00 |..x.(.Q....u....|
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 aa 57 |*............ .W|
00000280 9d bc 48 b3 81 25 b6 57 78 35 41 10 32 b4 96 e8 |..H..%.Wx5A.2...|
00000290 b0 eb ab 71 be 87 bb 24 c3 05 fa fa b6 08 04 03 |...q...$........|
000002a0 00 8b 30 81 88 02 42 01 61 87 5f 9a 58 37 f1 ff |..0...B.a._.X7..|
000002b0 b5 ff a7 89 fb c1 38 c9 99 00 89 6a 55 7d 2f d8 |......8....jU}/.|
000002c0 e2 3f 55 b1 44 89 9d 30 7c 01 88 52 2b ef ba 90 |.?U.D..0|..R+...|
000002d0 47 3f 9e 2e 22 83 1e 89 77 7a 81 c2 d0 fd 09 4b |G?.."...wz.....K|
000002e0 77 1e 9b 3b d1 95 b4 fb ad 02 42 01 7c b4 80 5a |w..;......B.|..Z|
000002f0 13 e8 f7 00 42 93 f5 5b be 61 fc 60 e5 3e 3c 04 |....B..[.a.`.><.|
00000300 53 c9 5c 21 9c 43 0f 0c a8 56 be 23 97 1f d7 cf |S.\!.C...V.#....|
00000310 e9 88 0f cf 8b 1d cf 45 d2 f2 e9 1d ab 64 af 72 |.......E.....d.r|
00000320 e2 11 f9 d7 00 80 7a 9d 4d c3 ed fe 69 16 03 03 |......z.M...i...|
00000270 2a 16 03 03 00 b7 0c 00 00 b3 03 00 1d 20 18 6f |*............ .o|
00000280 77 a5 2b 27 2c 52 fc 6c 8a 34 41 1c a8 c6 4f 90 |w.+',R.l.4A...O.|
00000290 a9 4b b7 e0 39 8b b1 f5 a6 15 4b 94 e8 2c 04 03 |.K..9.....K..,..|
000002a0 00 8b 30 81 88 02 42 00 dc 3a 14 a2 38 32 c1 40 |..0...B..:..82.@|
000002b0 98 83 17 94 e9 2a 0d 95 c3 59 d6 76 94 c2 3e a0 |.....*...Y.v..>.|
000002c0 f7 e0 5d 64 47 5a d1 d9 ed d2 1c 6b 13 3e e7 83 |..]dGZ.....k.>..|
000002d0 6e bb 53 33 03 7d 69 c6 8f 9d 98 d7 96 9c 73 e3 |n.S3.}i.......s.|
000002e0 12 bd 69 1f b1 d3 f4 25 d7 02 42 01 11 6d c8 53 |..i....%..B..m.S|
000002f0 9b bf f4 db ff 8a 00 82 93 f7 b5 bf c9 bb cd ec |................|
00000300 64 f8 d9 6d 36 0d f8 db ce 9d 65 a0 5e 5a e0 13 |d..m6.....e.^Z..|
00000310 ec 08 73 2c 3f 8c c6 5b 08 cc 0f 4a 7d 6b 5e 89 |..s,?..[...J}k^.|
00000320 bf 4a 4e db 51 5a 9f 51 3e 9d 9a c5 84 16 03 03 |.JN.QZ.Q>.......|
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 |................|
@ -102,31 +102,31 @@
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 af 55 e0 ee |......0...B..U..|
00000250 49 f4 29 a2 53 02 b0 7c 82 de 7d 0b 18 f9 be 28 |I.).S..|..}....(|
00000260 63 8d d4 e5 a7 5f 3e 0c e8 77 4d 67 5f 1b a1 55 |c...._>..wMg_..U|
00000270 d1 f2 02 34 96 08 4c 06 40 9c 08 60 37 38 9b 90 |...4..L.@..`78..|
00000280 a8 81 9d 70 b9 3d be 67 e8 25 51 07 52 02 42 00 |...p.=.g.%Q.R.B.|
00000290 80 8b 8a 47 d2 7e df b8 2b fc 75 4c ce d7 8e 3c |...G.~..+.uL...<|
000002a0 fa a0 59 d2 b2 5a 89 69 25 24 81 ec c3 66 af 52 |..Y..Z.i%$...f.R|
000002b0 83 76 f6 ee 18 9f 2e fa 78 76 b3 ef d0 fe 67 38 |.v......xv....g8|
000002c0 f1 b2 3e 20 80 78 20 9e 3d ea fa 7a 92 f8 a8 ed |..> .x .=..z....|
000002d0 5e 14 03 03 00 01 01 16 03 03 00 40 00 00 00 00 |^..........@....|
000002e0 00 00 00 00 00 00 00 00 00 00 00 00 b5 f1 10 d6 |................|
000002f0 73 66 b5 f6 f3 ab 36 5b f2 80 6a 1c 0b da 18 fc |sf....6[..j.....|
00000300 ac 20 c2 55 66 ae 25 f4 62 e1 16 2c 49 a0 e9 aa |. .Uf.%.b..,I...|
00000310 1f 08 06 f3 72 06 93 cd 64 46 06 aa |....r...dF..|
00000240 00 8f 05 03 00 8b 30 81 88 02 42 01 32 6d 32 38 |......0...B.2m28|
00000250 d6 bd 1b b6 c5 80 f2 ea 60 b8 bf 3f b6 76 68 1b |........`..?.vh.|
00000260 66 fb 5d 69 0b 25 09 7f 2d 73 ad 7e cd 98 cb b5 |f.]i.%..-s.~....|
00000270 93 4e 4f 1c 4e 3f a1 39 cf a0 70 a6 3d 29 36 27 |.NO.N?.9..p.=)6'|
00000280 51 e0 55 95 11 df 00 88 6c 38 d6 de 36 02 42 01 |Q.U.....l8..6.B.|
00000290 67 50 81 90 a7 ae b5 e2 34 75 81 41 c2 71 8d 0c |gP......4u.A.q..|
000002a0 9a 20 e7 33 af 0e 61 48 85 51 a1 f7 90 17 d1 ad |. .3..aH.Q......|
000002b0 b3 e1 cf 3e 12 fc ce 39 16 a8 78 3b 69 0d 79 76 |...>...9..x;i.yv|
000002c0 03 17 75 c2 a0 63 5e dc 0a a7 c9 aa 15 2a 83 65 |..u..c^......*.e|
000002d0 df 14 03 03 00 01 01 16 03 03 00 40 00 00 00 00 |...........@....|
000002e0 00 00 00 00 00 00 00 00 00 00 00 00 27 da 48 f6 |............'.H.|
000002f0 d3 00 98 b9 a6 b7 41 0b eb e6 d1 d7 82 9a 0c 59 |......A........Y|
00000300 8a 42 1c 99 59 af da a7 5b 88 ab b6 7d 01 bc 0f |.B..Y...[...}...|
00000310 45 08 c4 05 0d 2a 4a 83 bf eb b1 b6 |E....*J.....|
>>> Flow 4 (server to client)
00000000 14 03 03 00 01 01 16 03 03 00 40 9e 01 51 a4 a0 |..........@..Q..|
00000010 37 31 94 d1 2f e3 0d c6 a4 99 bb 3e 70 9f e8 fe |71../......>p...|
00000020 38 73 ba c5 35 4e b9 5d dd 5a ec e9 41 c1 f4 f6 |8s..5N.].Z..A...|
00000030 5f 66 3d 27 d2 15 fc c9 0f 22 95 03 7b 1f a5 ff |_f='....."..{...|
00000040 43 f1 73 64 99 a2 eb fa e6 e9 ee |C.sd.......|
00000000 14 03 03 00 01 01 16 03 03 00 40 73 7c e6 43 b9 |..........@s|.C.|
00000010 47 85 1c 50 f1 cb a1 29 79 02 dd 13 85 2a d9 a2 |G..P...)y....*..|
00000020 07 50 e4 80 c4 7e 66 ee f2 1a 21 1d cd e4 ff 4a |.P...~f...!....J|
00000030 a4 61 9d b4 a1 26 88 72 20 2b 06 77 c3 8b 3b 21 |.a...&.r +.w..;!|
00000040 53 33 02 3d a2 06 77 3b a5 a6 0b |S3.=..w;...|
>>> 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 ca 47 da 6e 04 55 13 d0 01 13 e4 |......G.n.U.....|
00000020 18 02 64 9c 1f 3c 3f 4f 5b ba e1 87 20 c5 a2 c4 |..d..<?O[... ...|
00000030 f1 70 f6 84 6c 15 03 03 00 30 00 00 00 00 00 00 |.p..l....0......|
00000040 00 00 00 00 00 00 00 00 00 00 2e 11 23 3c e2 a4 |............#<..|
00000050 18 f3 91 73 57 5f 6c 10 3b cf 9e a2 17 1a 76 d5 |...sW_l.;.....v.|
00000060 e6 4a 86 b1 42 d5 02 dc 5a 2d |.J..B...Z-|
00000010 00 00 00 00 00 1a 45 68 03 9b f0 42 e4 21 5e d8 |......Eh...B.!^.|
00000020 98 d6 46 67 2b 93 80 92 1f 91 60 a3 05 04 1c a0 |..Fg+.....`.....|
00000030 1b a9 ce 45 03 15 03 03 00 30 00 00 00 00 00 00 |...E.....0......|
00000040 00 00 00 00 00 00 00 00 00 00 6b 23 42 c8 5c 29 |..........k#B.\)|
00000050 f5 1f 7c d5 80 c4 9f 6f 12 77 95 71 8f 82 f9 63 |..|....o.w.q...c|
00000060 07 2c 6d ed 6d c6 4f 90 50 a3 |.,m.m.O.P.|