mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 04:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: implement TLS 1.3 PSK authentication (server side)

Browse source 
Added some assertions to testHandshake, but avoided checking the error
of one of the Close() because the one that would lose the race would
write the closeNotify to a connection closed on the other side which is
broken on js/wasm (#28650). Moved that Close() after the chan sync to
ensure it happens second.

Accepting a ticket with client certificates when NoClientCert is
configured is probably not a problem, and we could hide them to avoid
confusing the application, but the current behavior is to skip the
ticket, and I'd rather keep behavior changes to a minimum.

Updates #9671

Change-Id: I93b56e44ddfe3d48c2bef52c83285ba2f46f297a
Reviewed-on: https://go-review.googlesource.com/c/147445
Reviewed-by: Adam Langley <agl@golang.org>
This commit is contained in:
Filippo Valsorda 2018-11-05 15:59:08 -05:00
parent dc9021e679
commit 166c58b85c
25 changed files with 1959 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

158
testdata/Server-TLSv13-CHACHA20-SHA256 vendored
View file

@ -1,9 +1,9 @@
>>> Flow 1 (client to server)
00000000 16 03 01 00 dc 01 00 00 d8 03 03 3a 67 df d1 61 |...........:g..a|
00000010 7e 99 9a 82 12 bc af 5e 66 ca 60 c4 a2 7f a6 a6 |~......^f.`.....|
00000020 71 b5 ff b7 e5 96 12 21 f0 92 85 20 e6 52 d4 99 |q......!... .R..|
00000030 4b 4a b0 43 53 5e d4 cd 8e d9 a9 f5 42 aa c4 64 |KJ.CS^......B..d|
00000040 58 65 ec 46 ae d9 d7 0d 62 de 21 2e 00 04 13 03 |Xe.F....b.!.....|
00000000 16 03 01 00 dc 01 00 00 d8 03 03 7f d6 02 2f 2d |............../-|
00000010 ed b1 3c f2 c2 48 5e d5 f4 57 c9 8c ba 81 36 52 |..<..H^..W....6R|
00000020 85 3e 79 de 79 cc 36 6a f9 88 89 20 db e1 89 a5 |.>y.y.6j... ....|
00000030 26 4c 2a 2d 0f 33 e2 3f 57 05 cc 74 cd 4c 96 be |&L*-.3.?W..t.L..|
00000040 91 94 ef 54 1c 1f 01 ef d4 36 75 2f 00 04 13 03 |...T.....6u/....|
00000050 00 ff 01 00 00 8b 00 00 00 0e 00 0c 00 00 09 31 |...............1|
00000060 32 37 2e 30 2e 30 2e 31 00 0b 00 04 03 00 01 02 |27.0.0.1........|
00000070 00 0a 00 0c 00 0a 00 1d 00 17 00 1e 00 19 00 18 |................|
@ -11,80 +11,90 @@
00000090 05 03 06 03 08 07 08 08 08 09 08 0a 08 0b 08 04 |................|
000000a0 08 05 08 06 04 01 05 01 06 01 00 2b 00 03 02 03 |...........+....|
000000b0 04 00 2d 00 02 01 01 00 33 00 26 00 24 00 1d 00 |..-.....3.&.$...|
000000c0 20 d0 26 0b b3 f0 56 30 0d 3b 71 2b db 78 60 62 | .&...V0.;q+.x`b|
000000d0 e9 d1 6b e0 12 95 27 be 40 ad 40 56 e1 f3 f6 c8 |..k...'.@.@V....|
000000e0 4f |O|
000000c0 20 30 20 a8 d0 3d ea df 38 aa 65 6f dd c8 25 13 | 0 ..=..8.eo..%.|
000000d0 03 c4 a2 24 d4 a8 0d 1a a6 65 32 75 83 ef 71 70 |...$.....e2u..qp|
000000e0 30 |0|
>>> Flow 2 (server to client)
00000000 16 03 03 00 7a 02 00 00 76 03 03 00 00 00 00 00 |....z...v.......|
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 20 e6 52 d4 99 |........... .R..|
00000030 4b 4a b0 43 53 5e d4 cd 8e d9 a9 f5 42 aa c4 64 |KJ.CS^......B..d|
00000040 58 65 ec 46 ae d9 d7 0d 62 de 21 2e 13 03 00 00 |Xe.F....b.!.....|
00000020 00 00 00 00 00 00 00 00 00 00 00 20 db e1 89 a5 |........... ....|
00000030 26 4c 2a 2d 0f 33 e2 3f 57 05 cc 74 cd 4c 96 be |&L*-.3.?W..t.L..|
00000040 91 94 ef 54 1c 1f 01 ef d4 36 75 2f 13 03 00 00 |...T.....6u/....|
00000050 2e 00 2b 00 02 03 04 00 33 00 24 00 1d 00 20 2f |..+.....3.$... /|
00000060 e5 7d a3 47 cd 62 43 15 28 da ac 5f bb 29 07 30 |.}.G.bC.(.._.).0|
00000070 ff f6 84 af c4 cf c2 ed 90 99 5f 58 cb 3b 74 14 |.........._X.;t.|
00000080 03 03 00 01 01 17 03 03 00 17 ea 45 ce e9 f5 10 |...........E....|
00000090 95 59 6d ed 7a 9c fb 59 92 aa 50 11 a8 59 93 03 |.Ym.z..Y..P..Y..|
000000a0 a1 17 03 03 02 6d 3c ce b8 65 ce 05 e3 17 9d ed |.....m<..e......|
000000b0 f7 79 65 08 6b 3d 04 bb 8d 60 0a 38 25 e7 4c a8 |.ye.k=...`.8%.L.|
000000c0 6b e1 ad 95 85 30 59 06 c0 0a 26 0e d6 1a 81 76 |k....0Y...&....v|
000000d0 40 55 6a 43 26 71 95 3b d5 73 1b 24 52 79 23 f9 |@UjC&q.;.s.$Ry#.|
000000e0 db 97 c7 8d a7 c3 03 b8 35 56 1a 4a cc 3d 76 88 |........5V.J.=v.|
000000f0 4f 23 75 67 c2 84 6d db fa cc 6c 77 94 f3 eb 95 |O#ug..m...lw....|
00000100 eb 27 f4 e2 03 41 b5 d7 e9 e1 7e 29 b4 82 01 e6 |.'...A....~)....|
00000110 3f 76 e4 1f ef cb 39 27 a5 3b 34 f1 d5 f2 26 c7 |?v....9'.;4...&.|
00000120 10 37 41 c1 08 81 00 9e 37 6d e4 0f a9 57 a7 1d |.7A.....7m...W..|
00000130 ea a8 19 23 32 a7 1a 04 8f c1 00 18 da 06 fd bc |...#2...........|
00000140 90 5d fb e7 03 f5 68 28 77 ed 47 5d 38 ec 66 6b |.]....h(w.G]8.fk|
00000150 0d c6 04 94 b9 af c0 a6 75 63 a4 8e bc 2e fd 52 |........uc.....R|
00000160 9b c3 f5 4f b0 23 4d ed 7b 56 23 f5 fc d6 0e 3d |...O.#M.{V#....=|
00000170 80 e2 31 24 79 33 6c 14 54 ef 09 b7 2d 3a 27 69 |..1$y3l.T...-:'i|
00000180 a7 18 9d cb 70 f6 bc 1a 87 61 f2 9b 37 62 d5 6e |....p....a..7b.n|
00000190 d1 32 b8 93 9b 83 48 48 27 f4 cb fa cd c4 66 92 |.2....HH'.....f.|
000001a0 5d 4e 20 4b 26 b5 27 26 19 60 83 80 3c 4d a7 0a |]N K&.'&.`..<M..|
000001b0 8a 1d 82 29 ae bc b8 94 4c c7 ee 16 38 30 20 1f |...)....L...80 .|
000001c0 19 60 15 99 88 45 ca 37 8d 49 28 ac 81 0d 95 98 |.`...E.7.I(.....|
000001d0 fd 71 b4 a8 00 59 a1 6c 56 c1 aa 75 dc 37 1b 29 |.q...Y.lV..u.7.)|
000001e0 e1 4a 1d 90 51 4f 93 33 c8 00 7b 56 ef b7 bc 3f |.J..QO.3..{V...?|
000001f0 3f fe c5 b6 20 6d 15 cf e5 87 22 ce 0f fd 6a a4 |?... m...."...j.|
00000200 f9 80 06 ce a7 3f b8 3f d9 25 bd b7 0f 5d d4 80 |.....?.?.%...]..|
00000210 f1 b0 33 01 97 f5 f8 d8 93 94 e9 0b fb 86 1f ea |..3.............|
00000220 18 6a cc 5e b8 7e 59 3f 27 4d dd af 2c 0b b1 8c |.j.^.~Y?'M..,...|
00000230 4f a6 5f 0b 3f 85 ec 3c fe 48 46 59 6f 92 77 af |O._.?..<.HFYo.w.|
00000240 54 da c7 b7 f2 35 e8 09 79 ef 9b 72 70 36 c5 6b |T....5..y..rp6.k|
00000250 a5 bd 7d ca 9e 4e 90 f1 e4 fb 87 af 1a 03 4d bd |..}..N........M.|
00000260 50 6b 10 88 a6 e1 fe 5c bd 1a 20 2d 44 d6 69 d3 |Pk.....\.. -D.i.|
00000270 67 b0 79 dd 88 fd 07 9c ce 05 8d 36 a5 40 15 85 |g.y........6.@..|
00000280 7c 88 51 ad 41 d3 26 a0 04 49 f8 4b 0e ad d0 e8 ||.Q.A.&..I.K....|
00000290 46 73 e7 4d 01 52 17 15 a1 70 62 70 0f 6a 71 98 |Fs.M.R...pbp.jq.|
000002a0 85 27 b4 4d 47 e7 01 6a 4e 21 0d b0 f7 26 9f 28 |.'.MG..jN!...&.(|
000002b0 61 fc 4c e0 28 3d 06 a9 37 c9 ab 98 13 dd f0 06 |a.L.(=..7.......|
000002c0 f1 6d 8b 0d 28 95 2f 1d d6 7b 80 fe 1b e3 6d e9 |.m..(./..{....m.|
000002d0 7c 62 ef e4 e1 08 78 5d 8d b5 2c eb e0 bf 8e de ||b....x]..,.....|
000002e0 f5 77 35 d2 51 ec 84 1b c0 7f 74 c8 a7 0b 70 f4 |.w5.Q.....t...p.|
000002f0 22 2d 3e fd 38 52 60 d3 0b d8 56 9b 38 3f 09 ca |"->.8R`...V.8?..|
00000300 cf 26 02 22 9e 48 30 4f eb 24 e3 94 df 09 bc 8f |.&.".H0O.$......|
00000310 51 27 5f 17 03 03 00 99 aa 1e 71 5d 27 7c 0a cc |Q'_.......q]'|..|
00000320 a6 16 22 c9 77 45 a7 c4 a4 e5 2d 2d ac c8 1b 2b |..".wE....--...+|
00000330 2e 48 03 a5 94 c4 0c 4d 52 e4 2e eb eb 46 36 1e |.H.....MR....F6.|
00000340 57 d8 bd 8a 9b 23 9c 27 fb ac 6f 37 2b 8f 70 69 |W....#.'..o7+.pi|
00000350 ed f4 83 56 54 fb 03 d6 58 b5 5e 0d b7 82 58 09 |...VT...X.^...X.|
00000360 32 ce a0 e4 d7 4d 41 ea 42 39 c3 0b 5e 25 29 50 |2....MA.B9..^%)P|
00000370 d0 5b b4 94 15 22 85 d6 52 19 38 a9 56 c4 81 2e |.[..."..R.8.V...|
00000380 ef 8d 3b b9 a0 9e c2 2f 24 53 4f 44 0e c1 a2 e3 |..;..../$SOD....|
00000390 59 d8 d4 44 a9 39 19 e2 b0 d0 ab c7 7a e0 68 e1 |Y..D.9......z.h.|
000003a0 a1 04 f0 7c 0a 12 e8 85 0a a6 6f ec 68 98 a6 98 |...|......o.h...|
000003b0 b9 17 03 03 00 35 08 a4 e6 55 41 66 f8 c3 d4 3c |.....5...UAf...<|
000003c0 17 6f 54 f3 d5 91 09 53 db b1 49 15 d5 0a 2d ec |.oT....S..I...-.|
000003d0 fc 88 68 76 a3 8d 8d d6 b1 4b af b5 be c8 69 0c |..hv.....K....i.|
000003e0 08 41 a3 9d 23 c1 87 5d 33 b9 a6 |.A..#..]3..|
00000080 03 03 00 01 01 17 03 03 00 17 f4 9a 6e ea 99 81 |............n...|
00000090 59 33 26 a6 6a 40 1d a9 59 67 31 35 09 b0 ed 15 |Y3&.j@..Yg15....|
000000a0 83 17 03 03 02 6d 56 59 69 c8 6d 45 c6 2f 58 3d |.....mVYi.mE./X=|
000000b0 db 87 dd 56 0f 2d d9 21 1b 97 94 77 f2 72 28 0d |...V.-.!...w.r(.|
000000c0 48 04 79 83 7e 2e a1 c9 30 56 d7 9c c8 0a 37 65 |H.y.~...0V....7e|
000000d0 b6 6b 31 ae 9a 5f ff 13 15 94 99 7c 92 e1 32 80 |.k1.._.....|..2.|
000000e0 28 3c ab b1 cc fe ba 92 3c 03 bb fd b8 55 f5 f2 |(<......<....U..|
000000f0 ba be 28 90 c5 7e 07 48 d5 45 b6 84 80 02 2d cd |..(..~.H.E....-.|
00000100 14 27 81 b6 4e b4 7f 5f 78 a3 26 c2 0c af 12 d6 |.'..N.._x.&.....|
00000110 e9 14 22 c8 ee 2e 5e fc c3 ca 8f 01 9b 37 6a b0 |.."...^......7j.|
00000120 f8 53 b2 8e 31 d7 1f 34 f6 35 ed 81 e0 f7 6f e1 |.S..1..4.5....o.|
00000130 90 cf 1a 4f 44 50 d5 cd 96 c3 4a 22 7a 54 28 bd |...ODP....J"zT(.|
00000140 88 56 5c 77 67 eb a6 78 5c 8b 82 39 03 13 55 c3 |.V\wg..x\..9..U.|
00000150 20 68 45 26 7a 96 fe 1c f9 33 14 1e 1d 8a 5f 51 | hE&z....3...._Q|
00000160 c3 2f 17 91 ba 37 63 49 e1 65 89 bf e8 a1 27 5f |./...7cI.e....'_|
00000170 fd 59 46 80 f7 9b 45 89 50 ab cd 9b aa b4 45 04 |.YF...E.P.....E.|
00000180 b5 1b 85 88 1c 59 ba b2 d6 50 0b fd 5c d9 59 83 |.....Y...P..\.Y.|
00000190 7a 6c 9b ad 27 33 a0 49 74 eb a6 cd a8 e8 4b d7 |zl..'3.It.....K.|
000001a0 71 ef 63 64 ff 24 a7 09 2e b7 f6 6f 9d 9f 75 84 |q.cd.$.....o..u.|
000001b0 97 0a 76 bf 72 ed ff e8 1a 49 ca 0b 0d f5 2c fb |..v.r....I....,.|
000001c0 69 c2 5c fe db 58 0a a1 9c d4 47 6a 8f a6 bd ec |i.\..X....Gj....|
000001d0 32 fb 40 6a 71 9d 19 37 e6 fd d4 3d fa 5b f3 53 |2.@jq..7...=.[.S|
000001e0 43 df d5 fa 53 29 40 70 77 a6 9e f7 03 7d 08 8b |C...S)@pw....}..|
000001f0 5a 71 73 e5 af 45 58 56 9f 56 ad 73 aa d2 b3 7c |Zqs..EXV.V.s...||
00000200 92 99 c8 04 16 bf ca f2 81 2e 29 c3 79 21 f1 11 |..........).y!..|
00000210 92 f4 1d 34 24 73 e3 82 28 5a 31 70 45 da 8d 94 |...4$s..(Z1pE...|
00000220 38 75 31 bc f9 e5 2b 11 7e fd bc 19 fe 65 ad 53 |8u1...+.~....e.S|
00000230 e5 e6 17 b8 69 ea 54 fd 92 a9 41 7a 8c 7f da 4f |....i.T...Az...O|
00000240 ba f1 9f a2 e2 5b e7 7a 23 17 9e 29 95 7e 72 79 |.....[.z#..).~ry|
00000250 22 67 c5 68 0a 4d fb e9 64 61 3a 53 18 e7 dd 7d |"g.h.M..da:S...}|
00000260 5b 16 b9 fa 69 95 82 eb ee 1a 30 97 93 97 fc ee |[...i.....0.....|
00000270 9e 2b 22 64 08 7d 25 05 77 5e d7 bd 0e c3 9f a4 |.+"d.}%.w^......|
00000280 f4 bf 77 3d 56 84 c8 a1 10 1c e0 5b da 39 3d 2d |..w=V......[.9=-|
00000290 92 80 9a 07 b2 29 c5 ab e0 e1 1c ad ba 3e fa 4e |.....).......>.N|
000002a0 65 4f 31 63 de 33 6a 5c af e0 88 70 fc 6e 6a a2 |eO1c.3j\...p.nj.|
000002b0 ca da 2f 14 1d 4f 8c 7d 8d da 36 9b ea 7f 7e 79 |../..O.}..6...~y|
000002c0 9c dc 4a 3b 69 d9 50 31 bb f2 f8 8a 7f 6e 73 bc |..J;i.P1.....ns.|
000002d0 41 7c 3a 86 10 91 9b 3a 8e 3e c8 bc 6a c4 4d f2 |A|:....:.>..j.M.|
000002e0 45 87 49 49 d2 2f aa 4d d0 6f e9 1e a4 d6 06 63 |E.II./.M.o.....c|
000002f0 ac 90 ce 9a cb f7 97 55 2b e8 8c 8d 55 f6 32 26 |.......U+...U.2&|
00000300 55 d4 60 0e c0 0b da 0e ac c9 4c c3 95 03 54 d7 |U.`.......L...T.|
00000310 99 ec e1 17 03 03 00 99 c4 65 5e 67 e3 a1 98 d6 |.........e^g....|
00000320 f8 34 15 ed a9 55 80 c7 c0 e7 ca 67 f1 cb 58 e2 |.4...U.....g..X.|
00000330 6e 4d d4 9e 18 c3 37 c2 ff 72 bc cb 8e 6a 97 e2 |nM....7..r...j..|
00000340 b5 83 75 34 2a 75 9f 7f 8e 1e 47 e6 cd 53 85 c5 |..u4*u....G..S..|
00000350 69 b6 c0 46 9f 46 a8 09 6a 21 d5 af 36 d2 d0 ba |i..F.F..j!..6...|
00000360 65 0f da a5 af eb 3a 0c 8b 85 00 2a dd 11 71 28 |e.....:....*..q(|
00000370 5b 71 a9 df 69 20 8a d9 27 1e 4f 02 89 03 6f 27 |[q..i ..'.O...o'|
00000380 20 e1 37 17 69 c2 62 3e 46 39 43 2d 64 43 f3 cc | .7.i.b>F9C-dC..|
00000390 14 5f a0 73 06 bf 42 cb da 79 21 28 b1 a1 c4 de |._.s..B..y!(....|
000003a0 39 98 83 ad 3a d6 05 fd 58 b0 2c 97 bf 48 74 0e |9...:...X.,..Ht.|
000003b0 25 17 03 03 00 35 69 10 76 25 e3 9e 63 10 76 73 |%....5i.v%..c.vs|
000003c0 f5 fc 90 2c 95 e5 dc 29 79 a0 ed 0a 3a 72 58 38 |...,...)y...:rX8|
000003d0 bf b9 17 af 77 9f 05 92 af d4 a7 c7 d6 56 77 01 |....w........Vw.|
000003e0 da 94 31 d2 be be 95 e1 b1 95 75 17 03 03 00 93 |..1.......u.....|
000003f0 f9 fa a9 41 89 d3 e8 3b cb 11 63 76 56 fe 28 86 |...A...;..cvV.(.|
00000400 87 b0 0f d0 4d a8 fb 22 e9 89 f6 40 8a db 51 be |....M.."...@..Q.|
00000410 2c 9f 9c 39 f4 43 bc 1f b0 32 9b 9c 8e a6 6e e1 |,..9.C...2....n.|
00000420 f3 f7 f0 91 ed 56 6f 2d be 37 6b 3b ed f7 5b a6 |.....Vo-.7k;..[.|
00000430 d3 14 0a f9 58 b8 7b 37 fc 15 97 57 79 16 8c 0c |....X.{7...Wy...|
00000440 d2 93 7a 58 b8 48 51 f7 58 82 7d a0 4b e1 41 f6 |..zX.HQ.X.}.K.A.|
00000450 e1 44 12 1e ea 80 f3 b6 d0 72 ec 5c 84 01 6a b3 |.D.......r.\..j.|
00000460 f7 83 b5 47 22 0b e7 03 60 09 a7 23 23 20 5e 6b |...G"...`..## ^k|
00000470 f6 25 34 64 11 ad 46 90 db cb 13 f5 10 0a 75 e8 |.%4d..F.......u.|
00000480 3e c8 03 |>..|
>>> Flow 3 (client to server)
00000000 14 03 03 00 01 01 17 03 03 00 35 6a 0f 9f 87 b5 |..........5j....|
00000010 48 60 db 20 7b e9 4f ba fd bf e5 b8 fc 14 3e 2f |H`. {.O.......>/|
00000020 3e e8 58 ed d4 c5 e5 da cc 7d c4 32 d4 db c2 6a |>.X......}.2...j|
00000030 39 65 85 63 9c 92 7b 7c b3 6f 45 d8 c4 c3 5e 6c |9e.c..{|.oE...^l|
00000000 14 03 03 00 01 01 17 03 03 00 35 27 f0 39 68 fc |..........5'.9h.|
00000010 9f 6c a4 fd a7 cf 1f 25 67 54 3c e6 9e 7c 99 5a |.l.....%gT<..|.Z|
00000020 e9 b7 3c 0c f2 dc b6 22 36 0d 43 a3 ee 76 4b a9 |..<...."6.C..vK.|
00000030 6a cb b8 f6 8a c8 58 91 79 19 95 7c 83 a0 87 57 |j.....X.y..|...W|
>>> Flow 4 (server to client)
00000000 17 03 03 00 1e f5 83 ab 23 7e fa 4b 92 40 4b d3 |........#~.K.@K.|
00000010 dd 19 de a3 32 df 90 94 86 da da b6 58 97 5a 46 |....2.......X.ZF|
00000020 5f f5 b4 17 03 03 00 13 ef a9 5a 2c 54 8d 83 21 |_.........Z,T..!|
00000030 79 79 0e 9e a6 f2 4f f6 f8 36 63 |yy....O..6c|
00000000 17 03 03 00 1e d5 8a ef 04 f9 6c 27 62 0a f1 a4 |..........l'b...|
00000010 4b 7f e4 e4 ff 53 f3 61 20 b9 56 96 30 f9 06 c9 |K....S.a .V.0...|
00000020 cc 9c ed 17 03 03 00 13 4a 83 cd 86 98 97 20 45 |........J..... E|
00000030 ab 2f c5 72 15 f6 ed a8 8c 8c 0e |./.r.......|