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

diff --git a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
index 67cc2e2ba7..494bad391f 100644
--- a/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-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 03 00 59 02 00 00  55 03 03 cc 6d d6 f4 ad  |....Y...U...m...|
-00000010  da e3 e3 4d 06 1c 2d 3b  cc 52 82 4b a2 2f 18 c3  |...M..-;.R.K./..|
-00000020  a8 c9 ba b0 ca 93 87 ad  bc 4e 55 20 cb 8d 51 98  |.........NU ..Q.|
-00000030  35 01 2e 3c 2c 1e 36 20  82 18 f4 e1 08 1e 08 af  |5..<,.6 ........|
-00000040  22 f3 df 45 d2 c9 0d 81  57 c8 12 2f c0 2f 00 00  |"..E....W.././..|
+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......./..|
 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..............|
@@ -53,23 +54,21 @@
 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  cd 0c 00 00 c9 03 00 17  41 04 2a 05 cf 47 ee 3d  |........A.*..G.=|
-000002d0  d5 25 3e 5f f1 ea 99 b1  82 cd 4f af 1f 19 07 bb  |.%>_......O.....|
-000002e0  56 84 c2 9e 68 5b 49 b3  f6 a0 33 fe 4b c4 fa 00  |V...h[I...3.K...|
-000002f0  32 6e 04 d9 16 4a 83 6a  82 86 94 06 e0 53 c0 a9  |2n...J.j.....S..|
-00000300  3c 99 72 7f b7 11 5c b4  97 8f 04 01 00 80 ce b7  |<.r...\.........|
-00000310  71 2e f2 82 4a d0 f8 1c  4d 14 68 da e3 90 30 dd  |q...J...M.h...0.|
-00000320  9b 87 ae be ad e4 7a 57  cd ea 0f 11 a2 e3 1a dd  |......zW........|
-00000330  71 da ec 0f 4b 0f a3 90  05 c5 0f 25 92 a8 ef 25  |q...K......%...%|
-00000340  03 98 57 97 ed 5e 82 b1  ce d5 26 65 b1 cd dd 87  |..W..^....&e....|
-00000350  8a 19 b3 aa 22 17 de e7  55 4f 0e cb 99 8f ca 8a  |...."...UO......|
-00000360  d9 9f f6 eb 6a f5 76 e0  f8 15 54 21 f1 58 6b b1  |....j.v...T!.Xk.|
-00000370  7c f1 15 cc 4b 12 84 be  8a 38 d2 62 ee fe 83 6c  ||...K....8.b...l|
-00000380  f0 14 d5 76 8d 4a b1 cf  65 8a dc af d5 c4 16 03  |...v.J..e.......|
-00000390  03 00 2a 0d 00 00 26 03  01 02 40 00 1e 06 01 06  |..*...&...@.....|
-000003a0  02 06 03 05 01 05 02 05  03 04 01 04 02 04 03 03  |................|
-000003b0  01 03 02 03 03 02 01 02  02 02 03 00 00 16 03 03  |................|
-000003c0  00 04 0e 00 00 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....+.......|
+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  |................|
+000003a0  04 0e 00 00 00                                    |.....|
 >>> Flow 3 (client to server)
 00000000  16 03 03 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.......\.|
@@ -103,31 +102,29 @@
 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 03 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 03  |.I..h.A.Vk.Z....|
-00000250  00 88 0f 00 00 84 05 01  00 80 28 75 56 c7 d3 be  |..........(uV...|
-00000260  c0 45 b3 9e 08 1a 61 fa  f7 e9 2d 33 7b 3f 7a db  |.E....a...-3{?z.|
-00000270  7d 8e 34 8e 34 69 1b 41  80 4f bd b8 18 9e 35 91  |}.4.4i.A.O....5.|
-00000280  4c 48 26 8c 0b f0 9a b3  85 cd 32 04 90 45 eb 27  |LH&.......2..E.'|
-00000290  ed c9 c7 78 8b 27 12 25  6a 1c 1b 70 37 ce 27 fd  |...x.'.%j..p7.'.|
-000002a0  fd da 54 db 98 f9 05 65  de a8 41 e7 12 07 84 7d  |..T....e..A....}|
-000002b0  96 4b 59 71 5e e1 58 1f  88 87 4e d8 43 c2 9d bf  |.KYq^.X...N.C...|
-000002c0  a0 e2 eb d3 67 79 c5 c0  d8 a2 bb 50 13 3d 6b bf  |....gy.....P.=k.|
-000002d0  99 8a f6 a8 91 1f 8d 74  49 35 14 03 03 00 01 01  |.......tI5......|
-000002e0  16 03 03 00 28 00 00 00  00 00 00 00 00 bb 51 07  |....(.........Q.|
-000002f0  ab b3 89 a0 04 91 ee c0  43 96 00 50 2d 5f b8 4d  |........C..P-_.M|
-00000300  f3 d8 e1 44 ec b3 37 0e  a9 b9 2f cd 2e           |...D..7.../..|
+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....'{|
 >>> Flow 4 (server to client)
-00000000  14 03 03 00 01 01 16 03  03 00 28 df 01 78 2e ef  |..........(..x..|
-00000010  b5 6d ea c6 2d fa 23 b9  3f db e9 c1 27 0f 90 1f  |.m..-.#.?...'...|
-00000020  1e a0 b0 6e ab aa 1c ab  4e de 7f 18 82 b1 45 b9  |...n....N.....E.|
-00000030  c9 a6 e1                                          |...|
+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.|
 >>> Flow 5 (client to server)
-00000000  17 03 03 00 1e 00 00 00  00 00 00 00 01 02 12 eb  |................|
-00000010  61 0e 5e 44 5b d0 3c 78  42 ae 47 31 5a 98 9a a3  |a.^D[.<xB.G1Z...|
-00000020  0a 96 1b 15 03 03 00 1a  00 00 00 00 00 00 00 02  |................|
-00000030  a4 b2 43 e3 bc 24 ca 03  b8 7e ce 42 b9 6a 1f 91  |..C..$...~.B.j..|
-00000040  5e f2                                             |^.|
+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.|