mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17: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

163
testdata/Server-TLSv13-AES256-SHA384 vendored
View file

@ -1,9 +1,9 @@
>>> Flow 1 (client to server)
00000000 16 03 01 00 dc 01 00 00 d8 03 03 f2 41 21 15 42 |............A!.B|
00000010 77 2a a0 81 3d 0e f8 66 c0 9d 10 e6 0d b2 ea 15 |w*..=..f........|
00000020 ad 7b 23 a4 63 a9 8e 06 fd a5 fb 20 38 22 f7 e8 |.{#.c...... 8"..|
00000030 9d 36 66 18 6a 38 41 49 0c 42 9d 56 11 3d 74 cb |.6f.j8AI.B.V.=t.|
00000040 9b 55 93 bb 68 4e 4d de a9 96 fc 45 00 04 13 02 |.U..hNM....E....|
00000000 16 03 01 00 dc 01 00 00 d8 03 03 70 b7 07 12 16 |...........p....|
00000010 50 d7 b9 c9 5f 02 47 2d ff 93 a7 2f e8 51 dc a0 |P..._.G-.../.Q..|
00000020 8f 0d c8 80 38 c7 af 7e da bb ed 20 67 73 58 d7 |....8..~... gsX.|
00000030 11 8b c6 0d 72 86 e0 08 3e 2d d9 b9 16 9f 85 6e |....r...>-.....n|
00000040 3c 87 fd 87 c3 95 f6 4c 76 21 50 af 00 04 13 02 |<......Lv!P.....|
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,82 +11,93 @@
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 97 44 9d 4b c2 e5 38 dd 18 d5 79 ac 7e 65 b7 | .D.K..8...y.~e.|
000000d0 e9 0e 89 ff f8 ab 81 81 ad 7f 9a c3 59 12 5a 55 |............Y.ZU|
000000e0 4e |N|
000000c0 20 f4 08 51 f6 69 b7 d6 a9 3e 18 a7 ee c0 30 f3 | ..Q.i...>....0.|
000000d0 13 63 52 40 30 7c 79 6c 24 03 c9 89 25 bd a4 5f |.cR@0|yl$...%.._|
000000e0 64 |d|
>>> 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 38 22 f7 e8 |........... 8"..|
00000030 9d 36 66 18 6a 38 41 49 0c 42 9d 56 11 3d 74 cb |.6f.j8AI.B.V.=t.|
00000040 9b 55 93 bb 68 4e 4d de a9 96 fc 45 13 02 00 00 |.U..hNM....E....|
00000020 00 00 00 00 00 00 00 00 00 00 00 20 67 73 58 d7 |........... gsX.|
00000030 11 8b c6 0d 72 86 e0 08 3e 2d d9 b9 16 9f 85 6e |....r...>-.....n|
00000040 3c 87 fd 87 c3 95 f6 4c 76 21 50 af 13 02 00 00 |<......Lv!P.....|
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 c8 4d 76 95 99 66 |...........Mv..f|
00000090 62 83 71 d0 1f 1a 84 b9 11 37 57 e3 49 cc fd d4 |b.q......7W.I...|
000000a0 c9 17 03 03 02 6d 94 79 d5 d0 c7 a0 74 d4 96 53 |.....m.y....t..S|
000000b0 b2 d7 c0 a6 95 2a c9 ba d3 85 16 98 66 4b 6d f8 |.....*......fKm.|
000000c0 b6 c7 6d 2f 48 71 1d bc 12 6b 84 4a 29 89 7f 4d |..m/Hq...k.J)..M|
000000d0 39 89 55 8d 26 6d 68 e8 62 38 0c a2 1f 2b 53 fe |9.U.&mh.b8...+S.|
000000e0 0b 9d c0 8c 73 8b ae 13 03 e6 cc af 4f e1 78 29 |....s.......O.x)|
000000f0 be ec d6 c0 6c 9f 18 d2 3f 44 36 b9 0e 97 fc 1c |....l...?D6.....|
00000100 b3 94 62 8d a3 b1 3f e8 e8 c3 77 d9 49 13 d2 db |..b...?...w.I...|
00000110 93 9a 8b c5 51 85 c0 40 a6 0f f3 ca 66 13 e2 3f |....Q..@....f..?|
00000120 29 f1 65 0e ad cc eb bc de 68 18 c0 b7 05 c7 6b |).e......h.....k|
00000130 83 66 a1 5c 5e 97 68 5f 0e ae b2 19 e0 ab b0 ee |.f.\^.h_........|
00000140 b9 44 64 20 5d 7a 77 ee 77 db a1 77 cb 7b ce d5 |.Dd ]zw.w..w.{..|
00000150 c5 e1 78 b2 75 ea e6 2e 3b 8c 39 e3 51 c9 48 37 |..x.u...;.9.Q.H7|
00000160 60 d5 68 4f 15 a7 29 56 76 c3 2c 5a 68 1c 6a b2 |`.hO..)Vv.,Zh.j.|
00000170 20 c4 f0 df 35 87 72 c5 1a ed fa 24 66 b4 87 12 | ...5.r....$f...|
00000180 f5 b3 79 d4 b6 fe c9 4e 31 14 f3 e2 5d 13 fc ed |..y....N1...]...|
00000190 6d 88 04 9d 8d 11 ed fd 6a fb e6 b4 53 20 51 e6 |m.......j...S Q.|
000001a0 49 24 55 b1 5b 86 36 5a ed 68 02 eb 43 97 da 49 |I$U.[.6Z.h..C..I|
000001b0 da 7a 21 61 27 f6 24 6e cc b3 25 76 e9 ce c2 d2 |.z!a'.$n..%v....|
000001c0 b5 ef f7 63 a6 c9 7c 9b dd 12 ea 7c 15 bd 29 fb |...c..|....|..).|
000001d0 20 f5 37 96 07 cc 2c 22 4a c1 11 ef 22 4e 7a 05 | .7...,"J..."Nz.|
000001e0 80 ff 1f cd c9 a7 11 80 1e 3c 11 0d 10 ed 56 c6 |.........<....V.|
000001f0 13 64 55 13 44 ce cc b7 9d 1a 57 11 b6 ef 27 02 |.dU.D.....W...'.|
00000200 62 3e aa 81 14 ab 79 a5 cc 96 7d e3 bf c1 d3 98 |b>....y...}.....|
00000210 da 9d 34 f1 7a c6 1a 1a 0d b4 3d ed 40 41 49 39 |..4.z.....=.@AI9|
00000220 a7 8d a0 85 50 c1 b3 6c e9 51 be 44 8c 7d d8 3b |....P..l.Q.D.}.;|
00000230 d6 e2 77 cb ab 01 98 87 d4 94 53 e4 f6 04 8f d2 |..w.......S.....|
00000240 a4 36 35 9f df dc 2e 72 22 94 db 58 f7 77 c3 96 |.65....r"..X.w..|
00000250 2b 0f 4a 7a 3d 94 12 5a 18 90 6c 87 18 a0 0b 80 |+.Jz=..Z..l.....|
00000260 eb 44 de 79 4f 0e 66 fa 62 e7 26 73 06 af 44 e7 |.D.yO.f.b.&s..D.|
00000270 7a 36 84 68 3d 3d 79 ac cd 33 97 6a ad 95 ca 6d |z6.h==y..3.j...m|
00000280 c8 a9 75 98 21 b0 d2 dc 72 5d 61 15 67 0c 3e f8 |..u.!...r]a.g.>.|
00000290 54 18 52 bd 46 75 81 3f a6 6d c9 84 7a 97 4e db |T.R.Fu.?.m..z.N.|
000002a0 96 73 ad 53 09 ab 1c d6 c3 4d 1a 5c e9 b2 e7 aa |.s.S.....M.\....|
000002b0 2a f1 d5 be 1b c6 01 d1 8b 54 24 e9 16 d1 02 d0 |*........T$.....|
000002c0 dc cb c1 37 71 e1 01 74 b1 5f 91 60 09 01 31 e2 |...7q..t._.`..1.|
000002d0 2a f0 5b 34 e6 d0 52 db a2 cf f1 f1 b7 da b6 76 |*.[4..R........v|
000002e0 8e fd a5 fd 6e f5 c5 0c 34 74 2e f0 c0 44 b4 57 |....n...4t...D.W|
000002f0 e1 50 f5 68 06 a3 14 1d f5 ac 2b 61 f8 ec cf 05 |.P.h......+a....|
00000300 c9 ef e6 a8 31 aa a5 a8 15 65 36 58 e0 da 96 03 |....1....e6X....|
00000310 57 05 4e 17 03 03 00 99 ec a2 db dd 9e a8 d8 10 |W.N.............|
00000320 fc d4 1b 45 02 b5 2c f1 fc 05 44 30 27 55 63 3e |...E..,...D0'Uc>|
00000330 41 45 ea be e1 a8 0b 2e 4d 70 18 3a 9b ae d2 b5 |AE......Mp.:....|
00000340 ed 0d 3e 08 5f b6 86 b0 e0 06 66 45 91 67 bc fd |..>._.....fE.g..|
00000350 7b 8f 6a 73 d4 29 df 17 74 e7 f8 92 f9 2b e4 31 |{.js.)..t....+.1|
00000360 dc 8a 6c 1c 53 1f c2 d6 fc 83 33 15 58 e1 ea 49 |..l.S.....3.X..I|
00000370 cc 74 7c f3 00 37 ca bc ae 31 e8 b2 aa 19 18 e2 |.t|..7...1......|
00000380 7d 60 8c 15 f8 ce e2 7d 86 1b a1 2c 59 5a 2a b2 |}`.....}...,YZ*.|
00000390 81 f3 22 12 8a 6e 28 b9 22 ba 15 03 3d 24 09 50 |.."..n(."...=$.P|
000003a0 b5 81 43 c0 a1 62 cf c6 9d 69 be ba 89 d1 74 19 |..C..b...i....t.|
000003b0 85 17 03 03 00 45 45 29 37 b5 5d ee db 9c 73 85 |.....EE)7.]...s.|
000003c0 4f 69 2b 32 b7 d7 16 c6 73 f1 59 89 38 10 63 88 |Oi+2....s.Y.8.c.|
000003d0 81 72 5e 60 72 d5 6a 26 c9 50 18 03 d3 bd 50 83 |.r^`r.j&.P....P.|
000003e0 1b ea c1 e3 4b f4 31 b0 e7 90 af aa e3 10 fd 77 |....K.1........w|
000003f0 97 49 ef 8b 63 f3 c0 af 82 06 c3 |.I..c......|
00000080 03 03 00 01 01 17 03 03 00 17 cc b9 e4 43 5e f6 |.............C^.|
00000090 9a 5a 62 14 02 39 fb 13 76 e8 10 db 26 1c 07 ec |.Zb..9..v...&...|
000000a0 06 17 03 03 02 6d 39 e9 a0 33 ee 39 36 54 62 f1 |.....m9..3.96Tb.|
000000b0 e9 1d 32 45 0f 5a ca 72 f7 7e 43 d8 89 97 00 3d |..2E.Z.r.~C....=|
000000c0 59 70 08 b4 d1 e1 84 24 7a b8 45 3c b8 32 93 b5 |Yp.....$z.E<.2..|
000000d0 51 a5 58 60 3f 60 52 aa c1 ff 85 fb fd 50 87 38 |Q.X`?`R......P.8|
000000e0 47 7a 88 c6 d1 e6 3c b3 16 14 5b cb 23 50 26 7a |Gz....<...[.#P&z|
000000f0 1d 28 d1 d2 29 5d b0 40 97 2f 3b 58 7c 8a 76 1f |.(..)].@./;X|.v.|
00000100 1c c1 d2 2b 63 9d 53 bc fb c2 42 cb 40 0d d0 7c |...+c.S...B.@..||
00000110 73 6c dc 63 90 89 e3 66 67 2b a2 70 af e0 af fe |sl.c...fg+.p....|
00000120 0c c0 db 41 76 d0 16 37 2a 09 7a 79 31 03 c6 4a |...Av..7*.zy1..J|
00000130 f4 06 22 ac 96 b4 25 1f 54 11 24 c8 67 22 8f 2a |.."...%.T.$.g".*|
00000140 56 0c 24 fa 20 ed a8 37 66 f7 38 44 43 e2 e6 e3 |V.$. ..7f.8DC...|
00000150 96 b5 d5 dd a5 2c 23 e4 57 57 7d 7a 59 e2 4f 66 |.....,#.WW}zY.Of|
00000160 c4 29 d6 d1 32 a3 9c 4c dd 63 b2 a6 dc ff 6f 61 |.)..2..L.c....oa|
00000170 c2 db 88 80 23 c1 27 d4 be dd 4f b4 c9 b8 56 4c |....#.'...O...VL|
00000180 65 b6 f8 32 b2 60 7b af 5f 54 71 61 20 db 25 85 |e..2.`{._Tqa .%.|
00000190 34 b6 58 9b 71 01 dd 53 cd 13 65 2e 23 69 96 0e |4.X.q..S..e.#i..|
000001a0 89 94 75 09 64 60 76 d2 65 85 38 3d f1 0e cb 47 |..u.d`v.e.8=...G|
000001b0 c1 2c 52 f8 ce 7a a6 9f dd 7c 39 7e a7 f9 a6 1b |.,R..z...|9~....|
000001c0 c1 23 81 a6 7a b1 6c d4 3c 1c f3 71 ce 72 24 01 |.#..z.l.<..q.r$.|
000001d0 4a 8d e9 24 47 51 73 67 dc 7a 9f 0b 63 7d 29 e1 |J..$GQsg.z..c}).|
000001e0 3e 5e ac 72 d7 c8 d9 c2 13 de 92 dd 04 cb 09 21 |>^.r...........!|
000001f0 ad 41 69 27 77 48 eb 87 cb 3b 23 ba 06 a3 68 96 |.Ai'wH...;#...h.|
00000200 ad 24 35 f6 a6 03 87 a7 4d 9f d4 bf e5 8b 9f 56 |.$5.....M......V|
00000210 54 dd 0e 08 da 29 ff eb 9b e1 0a a5 25 b1 85 be |T....)......%...|
00000220 f8 ae 63 f4 49 64 cc 0a 41 0e 26 8a 8e bc 6f c9 |..c.Id..A.&...o.|
00000230 f5 41 55 80 0d bd 70 ad 85 b0 d4 8d 33 ac b6 40 |.AU...p.....3..@|
00000240 3e 76 fc fb 8f d2 7d 06 14 d4 45 24 6e 36 46 1c |>v....}...E$n6F.|
00000250 06 d3 f7 f3 4c 3a a5 83 4f 75 72 77 b4 5e 37 49 |....L:..Ourw.^7I|
00000260 41 f1 9f e6 d1 46 87 56 c8 64 28 fd 38 f0 0f 9c |A....F.V.d(.8...|
00000270 d0 39 ff 4b 46 56 73 0d 12 7d bf 63 b4 b8 0d 33 |.9.KFVs..}.c...3|
00000280 6b 4a 2b f8 39 67 f1 ec 2d a6 0b 5c 91 2d d8 3e |kJ+.9g..-..\.-.>|
00000290 91 81 1a 37 29 c7 14 d2 be db 31 61 dc 5d b1 e4 |...7).....1a.]..|
000002a0 64 af 14 9c 93 85 e7 5b 0e 42 63 c7 5e b5 cc 51 |d......[.Bc.^..Q|
000002b0 ca 83 ca fa 52 bd 44 a1 1c 76 20 bc 3d 9f 82 79 |....R.D..v .=..y|
000002c0 20 5c 01 14 e3 07 02 4c f6 87 f7 46 b8 de 47 23 | \.....L...F..G#|
000002d0 5d 5c b3 8f cd 96 49 51 32 3f d2 5d 92 32 19 b5 |]\....IQ2?.].2..|
000002e0 10 33 46 37 f0 b5 82 23 a5 91 1f 60 fb 21 2c 08 |.3F7...#...`.!,.|
000002f0 c3 6e 17 72 0b 5d c9 7b cc 77 97 6f 20 d9 a6 fa |.n.r.].{.w.o ...|
00000300 cc 4a bb c6 3b 0e b1 66 ae 57 f5 1b 16 46 36 b7 |.J..;..f.W...F6.|
00000310 a5 94 ae 17 03 03 00 99 d7 86 a0 5f c0 d2 33 3e |..........._..3>|
00000320 ce ce ea db cb a1 a5 11 b7 cc a1 48 b6 86 f5 11 |...........H....|
00000330 d6 32 8c f9 e8 bb e3 3e ea 6f 1a df 64 cd c8 7d |.2.....>.o..d..}|
00000340 e9 cb e4 19 fe cd 75 74 03 4a fe 91 1d 87 28 65 |......ut.J....(e|
00000350 25 79 3a 19 13 ba 67 16 aa 7e 8e c0 e6 53 4f bb |%y:...g..~...SO.|
00000360 98 ed cc 59 db 5e 73 23 d4 a9 a7 2a 6d 01 73 4a |...Y.^s#...*m.sJ|
00000370 e6 65 2e c0 34 49 c1 d8 70 2e 70 1b 10 97 74 23 |.e..4I..p.p...t#|
00000380 fe 6b 5d cd fa 71 c8 43 c3 5b 42 5c 7b e0 9e 3f |.k]..q.C.[B\{..?|
00000390 a8 3d a9 d1 97 17 87 80 af 7c 5d 8b 70 ba 87 06 |.=.......|].p...|
000003a0 67 dd 29 df f3 ca 9a f4 c8 93 e8 f8 ac c0 df 8e |g.).............|
000003b0 c5 17 03 03 00 45 40 a4 26 66 29 18 b8 d6 a7 87 |.....E@.&f).....|
000003c0 91 5f 6d 79 13 f8 7a 47 cf ac 93 7c 11 cb 4a b2 |._my..zG...|..J.|
000003d0 24 a6 40 fb d4 ed 71 ec 19 53 ba ae e0 bb e6 cf |$.@...q..S......|
000003e0 d6 8a a6 3c 6a 4e a3 6f 6c d7 2d e1 8a a4 6c da |...<jN.ol.-...l.|
000003f0 a1 ab fd c0 de 59 e9 18 fc 47 f2 17 03 03 00 a3 |.....Y...G......|
00000400 5b 85 84 a4 0d ff be 3e ea 00 71 3d ea be c7 e2 |[......>..q=....|
00000410 dc 2f 4a 62 c2 9f e2 e5 16 51 ff 35 a7 70 df 12 |./Jb.....Q.5.p..|
00000420 23 d6 f7 6c 96 91 7f 0f 6d d4 45 5f c6 8c c5 93 |#..l....m.E_....|
00000430 b1 b7 46 ef f0 f4 a3 68 35 ff 09 38 8d 6d c6 84 |..F....h5..8.m..|
00000440 d3 1c 4d 48 4e fc 4a c0 46 06 b1 a5 1c 74 a0 44 |..MHN.J.F....t.D|
00000450 69 68 20 33 df 70 60 69 57 c7 85 bd 3e ed 55 d0 |ih 3.p`iW...>.U.|
00000460 56 84 8f 19 03 5a 54 9a d5 3e 5d 37 98 40 4c f0 |V....ZT..>]7.@L.|
00000470 5e f1 26 e5 97 01 fc 0f 2a 09 e9 7a 51 69 c0 8e |^.&.....*..zQi..|
00000480 d4 25 80 f4 ca 91 f3 a7 5c 0c 96 ba ec a8 b5 ee |.%......\.......|
00000490 ab ec 05 cb 99 30 78 48 1b 78 bf 3d b9 f4 e8 33 |.....0xH.x.=...3|
000004a0 4d 45 d1 |ME.|
>>> Flow 3 (client to server)
00000000 14 03 03 00 01 01 17 03 03 00 45 59 c5 37 de 55 |..........EY.7.U|
00000010 de 8c 48 e6 2e 1c c6 d9 12 58 ad 58 97 af f3 09 |..H......X.X....|
00000020 0c 86 38 94 c8 a3 d0 67 b2 3a 36 80 d8 ac f9 7e |..8....g.:6....~|
00000030 42 58 7a a1 0b a3 06 a3 32 0a e3 21 01 cb 7b 55 |BXz.....2..!..{U|
00000040 73 1a 8b 32 ba cd 85 28 f7 ed 9a c8 dd 2b d7 66 |s..2...(.....+.f|
00000000 14 03 03 00 01 01 17 03 03 00 45 54 0e c1 aa 95 |..........ET....|
00000010 fd c5 d2 8b a0 ae 40 a1 9a b8 87 39 17 53 f7 10 |......@....9.S..|
00000020 62 6f 55 18 42 cf 75 cb 05 de 32 28 c4 a0 f1 17 |boU.B.u...2(....|
00000030 f1 55 ae 2c 97 9e dd d2 d0 a7 6b c6 51 51 c6 0c |.U.,......k.QQ..|
00000040 81 3f 04 db 94 e6 68 f0 a1 80 10 39 06 99 25 e2 |.?....h....9..%.|
>>> Flow 4 (server to client)
00000000 17 03 03 00 1e ee 52 21 e0 e3 c5 ae ac 1b 26 91 |......R!......&.|
00000010 0e b3 a0 b8 70 cc 71 c8 c3 10 0f e8 b4 79 eb 47 |....p.q......y.G|
00000020 fc 13 b7 17 03 03 00 13 02 ef f4 ef 4b a2 83 93 |............K...|
00000030 4b ea 6b 63 d9 29 69 79 0e 8d 34 |K.kc.)iy..4|
00000000 17 03 03 00 1e e4 4f d5 b0 e7 a0 e2 13 69 75 7c |......O......iu||
00000010 b1 84 93 be 99 ea 27 20 dd 08 89 6c e2 5a c6 bc |......' ...l.Z..|
00000020 b8 41 3d 17 03 03 00 13 cf 64 ad ad d9 84 87 36 |.A=......d.....6|
00000030 b9 ea b8 76 97 93 c1 03 44 c5 de |...v....D..|