crypto/tls: enable X25519 by default.

Since this changes the offered curves in the ClientHello, all the test
data needs to be updated too.

Change-Id: I227934711104349c0f0eab11d854e5a2adcbc363
Reviewed-on: https://go-review.googlesource.com/30825
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

1 files changed, 51 insertions, 54 deletions

diff --git a/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
index 4182f8a504..cb956e9791 100644
--- a/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
@@ -1,19 +1,20 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 8b 01 00 00  87 03 03 00 00 00 00 00  |................|
+00000000  16 03 01 00 8d 01 00 00  89 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 36 00 05 00 05 01 00  |.........6......|
-00000060  00 00 00 00 0a 00 08 00  06 00 17 00 18 00 19 00  |................|
-00000070  0b 00 02 01 00 00 0d 00  0e 00 0c 04 01 04 03 05  |................|
-00000080  01 05 03 02 01 02 03 ff  01 00 01 00 00 12 00 00  |................|
+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                                             |..|
 >>> Flow 2 (server to client)
-00000000  16 03 01 00 59 02 00 00  55 03 01 0a 79 c8 7c 83  |....Y...U...y.|.|
-00000010  17 78 ba 03 ce fa 53 bb  f9 18 50 34 c3 7b ff 99  |.x....S...P4.{..|
-00000020  f3 2e e5 fc 9d 0b d4 1e  c0 55 13 20 2d 5d af da  |.........U. -]..|
-00000030  02 22 75 79 66 51 6f 1a  1a e3 c1 91 78 1d 43 04  |."uyfQo.....x.C.|
-00000040  91 a5 2a 92 49 b4 c9 5a  15 39 52 b6 c0 13 00 00  |..*.I..Z.9R.....|
+00000000  16 03 01 00 59 02 00 00  55 03 01 13 70 8b ce 13  |....Y...U...p...|
+00000010  6e e5 50 5a 92 bf 18 33  b3 5b 1a bb 52 a9 47 3e  |n.PZ...3.[..R.G>|
+00000020  d3 23 e0 fa a1 af 66 9b  f0 e4 79 20 47 dc 49 70  |.#....f...y G.Ip|
+00000030  99 9e 03 5c fb a2 a8 6a  af e8 75 ff a9 e0 c1 e5  |...\...j..u.....|
+00000040  5c 5a 5e a0 78 ae d1 73  3d 29 04 b7 c0 13 00 00  |\Z^.x..s=)......|
 00000050  0d ff 01 00 01 00 00 0b  00 04 03 00 01 02 16 03  |................|
 00000060  01 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..............|
@@ -53,21 +54,19 @@
 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 01 00  |.=.`.\!.;.......|
-000002c0  cb 0c 00 00 c7 03 00 17  41 04 56 62 25 ca 89 d3  |........A.Vb%...|
-000002d0  3c eb f1 38 50 ff 7b 38  ae 1a 83 1e 07 b7 b4 ef  |<..8P.{8........|
-000002e0  2d 64 78 6e 60 f0 a8 fa  f9 f7 b9 d4 a9 43 3b a9  |-dxn`........C;.|
-000002f0  09 c8 39 77 a2 0a fe d1  00 88 1c 1c 06 6e 27 35  |..9w.........n'5|
-00000300  af 1f d4 c5 35 cd 62 8e  12 98 00 80 7d c2 93 eb  |....5.b.....}...|
-00000310  04 ee 59 d3 c2 2a ac 4c  60 ad 3a bc d2 e3 70 02  |..Y..*.L`.:...p.|
-00000320  c2 67 46 c5 a2 88 80 a3  55 4a be 55 5f 04 14 bc  |.gF.....UJ.U_...|
-00000330  23 76 87 81 ab 78 48 74  c7 ac 0a 44 40 8c d5 5e  |#v...xHt...D@..^|
-00000340  b8 b0 dd c5 02 79 d2 b6  89 e8 ea 5c 3f ad e4 7c  |.....y.....\?..||
-00000350  2f 74 db 2a 21 5d 0f ef  92 d1 d2 c6 ae 45 dd 20  |/t.*!].......E. |
-00000360  a5 58 3e 69 dc d5 71 ff  71 03 a9 92 15 e7 69 fa  |.X>i..q.q.....i.|
-00000370  31 35 23 c9 fb e4 3c 3a  e5 80 fb 86 57 06 cf 6e  |15#...<:....W..n|
-00000380  b5 e8 a3 bb 44 aa 44 c6  45 50 9f bf 16 03 01 00  |....D.D.EP......|
-00000390  0a 0d 00 00 06 03 01 02  40 00 00 16 03 01 00 04  |........@.......|
-000003a0  0e 00 00 00                                       |....|
+000002c0  aa 0c 00 00 a6 03 00 1d  20 8f 09 63 f7 eb 09 5b  |........ ..c...[|
+000002d0  90 a8 cc 46 27 10 b9 ab  ac dc ff ee 98 27 8d a8  |...F'........'..|
+000002e0  25 5a d0 0c b8 2a 5f 25  00 00 80 a2 2d 18 6c 8d  |%Z...*_%....-.l.|
+000002f0  1d a1 62 35 fe 9a 97 a3  f7 59 56 7f a3 6b 26 7d  |..b5.....YV..k&}|
+00000300  b6 7c e7 f2 d2 30 4e 77  50 91 47 bb 48 e9 3a c1  |.|...0NwP.G.H.:.|
+00000310  c6 58 a4 96 3b 98 3f a8  15 90 51 25 af 50 fc bd  |.X..;.?...Q%.P..|
+00000320  3d fa c3 d4 32 19 fe 9b  bb e5 07 f5 26 56 3a d7  |=...2.......&V:.|
+00000330  e5 00 82 7d dd 26 d8 19  16 6b db 95 20 99 13 44  |...}.&...k.. ..D|
+00000340  8b a5 8b 75 48 de a7 87  cb c4 97 56 60 66 cd d8  |...uH......V`f..|
+00000350  c1 24 7b 21 4a b5 43 1d  37 a5 02 1d 49 33 c9 87  |.${!J.C.7...I3..|
+00000360  af b1 03 0d eb 33 95 ff  ef 8a f6 16 03 01 00 0a  |.....3..........|
+00000370  0d 00 00 06 03 01 02 40  00 00 16 03 01 00 04 0e  |.......@........|
+00000380  00 00 00                                          |...|
 >>> Flow 3 (client to server)
 00000000  16 03 01 01 fd 0b 00 01  f9 00 01 f6 00 01 f3 30  |...............0|
 00000010  82 01 ef 30 82 01 58 a0  03 02 01 02 02 10 5c 19  |...0..X.......\.|
@@ -101,34 +100,32 @@
 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 01 00 46 10  00 00 42 41 04 1e 18 37  |.5....F...BA...7|
-00000210  ef 0d 19 51 88 35 75 71  b5 e5 54 5b 12 2e 8f 09  |...Q.5uq..T[....|
-00000220  67 fd a7 24 20 3e b2 56  1c ce 97 28 5e f8 2b 2d  |g..$ >.V...(^.+-|
-00000230  4f 9e f1 07 9f 6c 4b 5b  83 56 e2 32 42 e9 58 b6  |O....lK[.V.2B.X.|
-00000240  d7 49 a6 b5 68 1a 41 03  56 6b dc 5a 89 16 03 01  |.I..h.A.Vk.Z....|
-00000250  00 86 0f 00 00 82 00 80  9c e4 48 ef 27 f9 b3 60  |..........H.'..`|
-00000260  30 b0 dc 64 05 6e e2 b1  16 50 4a 10 7c d6 04 23  |0..d.n...PJ.|..#|
-00000270  71 a3 0c e3 ce 73 7b 2d  d7 c3 54 35 a1 8a 17 37  |q....s{-..T5...7|
-00000280  21 d1 58 d5 42 24 49 78  6e 0b 89 6f 94 ca 7f 54  |!.X.B$Ixn..o...T|
-00000290  ae 6d 1f 21 8a 7f a5 d1  fb 9c 2a 04 03 b5 62 ce  |.m.!......*...b.|
-000002a0  7d a1 a0 57 6f 2b b8 a8  91 41 e9 12 52 c5 ec 73  |}..Wo+...A..R..s|
-000002b0  86 68 a0 56 b6 7f 78 9a  89 b9 d4 e1 2e 6c 24 f4  |.h.V..x......l$.|
-000002c0  3b 24 a8 92 05 bc cf 29  e2 dc 25 a9 bf 43 db 81  |;$.....)..%..C..|
-000002d0  e0 bd 7d 98 1a 3a 5b 4e  14 03 01 00 01 01 16 03  |..}..:[N........|
-000002e0  01 00 30 0c 10 7b c1 61  98 1c b6 57 ab e9 2d e8  |..0..{.a...W..-.|
-000002f0  65 fb 50 6f a8 39 6a dd  ca 70 37 84 64 20 65 19  |e.Po.9j..p7.d e.|
-00000300  58 39 fd e3 30 b1 2f 48  c7 22 8f c4 f1 61 a3 f2  |X9..0./H."...a..|
-00000310  70 0b b6                                          |p..|
+00000200  e5 35 16 03 01 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 01 00  |......._X.;t....|
+00000230  86 0f 00 00 82 00 80 1c  2c 0b 87 f7 a9 33 09 7e  |........,....3.~|
+00000240  0b 19 c7 ef e4 bd e9 37  4e 3c 1e 36 5d 1f d0 51  |.......7N<.6]..Q|
+00000250  f7 87 40 66 c1 d2 54 c5  58 2f 03 32 1a 3b f3 4c  |..@f..T.X/.2.;.L|
+00000260  97 db 49 93 ba c5 c0 f4  d2 eb 43 58 25 80 f8 4d  |..I.......CX%..M|
+00000270  1c 6d 10 79 ea d6 b4 07  01 58 a2 a1 48 ae 06 a2  |.m.y.....X..H...|
+00000280  a7 2b 1e 36 a3 58 ab b6  a6 60 24 1d c1 7d 49 2e  |.+.6.X...`$..}I.|
+00000290  14 2d ca 7d 7f df 3f 79  51 43 75 06 86 0b 7d de  |.-.}..?yQCu...}.|
+000002a0  a4 76 18 8d 54 fa 41 b3  d9 06 f0 44 de c7 41 53  |.v..T.A....D..AS|
+000002b0  05 33 0f 5a 48 9e 76 14  03 01 00 01 01 16 03 01  |.3.ZH.v.........|
+000002c0  00 30 ec 96 c4 f6 af 71  4f b6 c9 e0 bf b6 15 51  |.0.....qO......Q|
+000002d0  5d 0a b6 6b 39 d9 9f 53  0f 7e 0c b7 8e 76 0c c4  |]..k9..S.~...v..|
+000002e0  15 36 07 27 51 f9 3e cb  0c 4e 5f 99 19 2d 3c dd  |.6.'Q.>..N_..-<.|
+000002f0  65 0d                                             |e.|
 >>> Flow 4 (server to client)
-00000000  14 03 01 00 01 01 16 03  01 00 30 36 ee 87 93 dd  |..........06....|
-00000010  ec 92 92 ea 76 7f c2 98  34 30 d1 03 b4 60 70 52  |....v...40...`pR|
-00000020  84 e8 e5 88 2c 93 7a 9b  29 6a 2a 62 a3 60 f0 f6  |....,.z.)j*b.`..|
-00000030  9b 81 5d 17 0a 9f 6f cc  45 7e 55                 |..]...o.E~U|
+00000000  14 03 01 00 01 01 16 03  01 00 30 2f ff 36 c3 9e  |..........0/.6..|
+00000010  9e ac 31 15 84 6f c2 c0  fa ce d0 bd 02 9b 75 79  |..1..o........uy|
+00000020  31 d7 9d 38 ad d3 3f 3d  37 7b 2b 0c 9e 01 eb 48  |1..8..?=7{+....H|
+00000030  db fd e2 13 92 d6 75 27  67 f5 1c                 |......u'g..|
 >>> Flow 5 (client to server)
-00000000  17 03 01 00 20 51 b6 eb  e8 21 80 4a 60 d0 ab 86  |.... Q...!.J`...|
-00000010  25 cf 14 9c 21 8d b6 c2  7c e9 96 90 3a f2 bb de  |%...!...|...:...|
-00000020  f4 67 da 4d 9c 17 03 01  00 20 8f 04 37 73 79 25  |.g.M..... ..7sy%|
-00000030  12 95 f1 45 ca ef 71 2f  4c f2 52 67 bb 97 8e 73  |...E..q/L.Rg...s|
-00000040  df ce 2c b1 7f 40 b2 91  4b 8d 15 03 01 00 20 bb  |..,..@..K..... .|
-00000050  34 d8 f2 08 79 fc d3 b9  01 66 7b ad 58 3f f3 64  |4...y....f{.X?.d|
-00000060  4c e2 43 3d cf 32 27 2c  d8 08 c0 e4 3c 23 7b     |L.C=.2',....<#{|
+00000000  17 03 01 00 20 6e b9 45  11 17 34 fd 03 ec 49 11  |.... n.E..4...I.|
+00000010  b1 2c cb d8 53 20 21 8f  1a 0f 04 3e ef 73 0f a0  |.,..S !....>.s..|
+00000020  4c 1f df 63 08 17 03 01  00 20 ab 15 7e c9 84 36  |L..c..... ..~..6|
+00000030  06 f2 f3 fe a6 cf ad 04  16 26 49 a2 bd 32 b2 a1  |.........&I..2..|
+00000040  08 8c c6 98 2f 1f 01 8a  13 be 15 03 01 00 20 90  |..../......... .|
+00000050  6a b8 ab fc 99 e0 79 1e  fc 5d 7d f4 07 f8 ff c5  |j.....y..]}.....|
+00000060  e7 62 c6 31 1e 93 08 4c  78 50 b5 d2 db 7f 79     |.b.1...LxP....y|