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

Fix invalid SNI handling

Browse source 
SNIExtension was previously marshalling both ip addresses and empty
strings, which are not allowed. See RFC 6066, Section 3.

All of the utls specific testdata replays needed to be rebuilt to
properly accomodate this change since they had previously been including
empty server name extension values

Addresses https://github.com/refraction-networking/utls/issues/96
This commit is contained in:
Maxb 2022-02-01 21:01:29 -08:00
parent 0b2885c8c0
commit ee9f86141f
48 changed files with 3445 additions and 3621 deletions
Download patch file Download diff file Expand all files Collapse all files

53
testdata/Client-TLSv12-UTLS-AES128-GCM-SHA256-Golang-0 vendored
View file

@ -1,5 +1,5 @@
>>> Flow 1 (client to server)
00000000 16 03 01 00 f8 01 00 00 f4 03 03 00 00 00 00 00 |................|
00000000 16 03 01 01 0b 01 00 01 07 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 20 00 00 00 00 |........... ....|
00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
@ -7,20 +7,21 @@
00000050 cc a9 c0 2f c0 2b c0 30 c0 2c c0 27 c0 13 c0 23 |.../.+.0.,.'...#|
00000060 c0 09 c0 14 c0 0a 00 9c 00 9d 00 3c 00 2f 00 35 |...........<./.5|
00000070 c0 12 00 0a 00 05 c0 11 c0 07 13 01 13 03 13 02 |................|
00000080 01 00 00 79 00 05 00 05 01 00 00 00 00 00 0a 00 |...y............|
00000090 0a 00 08 00 1d 00 17 00 18 00 19 00 0b 00 02 01 |................|
000000a0 00 00 0d 00 18 00 16 08 04 08 05 08 06 04 01 04 |................|
000000b0 03 05 01 05 03 06 01 06 03 02 01 02 03 ff 01 00 |................|
000000c0 01 00 00 12 00 00 00 2b 00 09 08 03 04 03 03 03 |.......+........|
000000d0 02 03 01 00 33 00 26 00 24 00 1d 00 20 2f e5 7d |....3.&.$... /.}|
000000e0 a3 47 cd 62 43 15 28 da ac 5f bb 29 07 30 ff f6 |.G.bC.(.._.).0..|
000000f0 84 af c4 cf c2 ed 90 99 5f 58 cb 3b 74 |........_X.;t|
00000080 01 00 00 8c 00 00 00 0f 00 0d 00 00 0a 66 6f 6f |.............foo|
00000090 62 61 72 2e 63 6f 6d 00 05 00 05 01 00 00 00 00 |bar.com.........|
000000a0 00 0a 00 0a 00 08 00 1d 00 17 00 18 00 19 00 0b |................|
000000b0 00 02 01 00 00 0d 00 18 00 16 08 04 08 05 08 06 |................|
000000c0 04 01 04 03 05 01 05 03 06 01 06 03 02 01 02 03 |................|
000000d0 ff 01 00 01 00 00 12 00 00 00 2b 00 09 08 03 04 |..........+.....|
000000e0 03 03 03 02 03 01 00 33 00 26 00 24 00 1d 00 20 |.......3.&.$... |
000000f0 2f e5 7d a3 47 cd 62 43 15 28 da ac 5f bb 29 07 |/.}.G.bC.(.._.).|
00000100 30 ff f6 84 af c4 cf c2 ed 90 99 5f 58 cb 3b 74 |0.........._X.;t|
>>> Flow 2 (server to client)
00000000 16 03 03 00 51 02 00 00 4d 03 03 53 99 8c 34 d0 |....Q...M..S..4.|
00000010 a0 4a d5 31 69 d6 d7 c8 7a 88 84 05 0d 12 74 d3 |.J.1i...z.....t.|
00000020 4e 88 d6 40 81 a6 ee d9 cb 21 c3 20 a5 b4 15 b3 |N..@.....!. ....|
00000030 9f e0 5f ff 6f 89 b4 b4 52 fc 30 ac b5 4e cd 63 |.._.o...R.0..N.c|
00000040 68 f8 df f0 96 ca 57 0b bc 25 85 da 00 9c 00 00 |h.....W..%......|
00000000 16 03 03 00 51 02 00 00 4d 03 03 41 75 e9 0c 36 |....Q...M..Au..6|
00000010 dd cd 21 24 c1 e2 d8 29 17 b8 b3 c2 cc d6 f8 65 |..!$...).......e|
00000020 92 8d 8e da 48 19 a7 c4 1d c1 0d 20 fb e1 2f 3c |....H...... ../<|
00000030 2d c2 ef b6 57 d2 7d 99 d1 db d8 34 d9 85 05 07 |-...W.}....4....|
00000040 2c 99 7e 3a df e5 21 10 fc 2a a7 41 00 9c 00 00 |,.~:..!..*.A....|
00000050 05 ff 01 00 01 00 16 03 03 02 59 0b 00 02 55 00 |..........Y...U.|
00000060 02 52 00 02 4f 30 82 02 4b 30 82 01 b4 a0 03 02 |.R..O0..K0......|
00000070 01 02 02 09 00 e8 f0 9d 3f e2 5b ea a6 30 0d 06 |........?.[..0..|
@ -70,17 +71,17 @@
00000060 c5 70 0f 08 83 48 e9 48 ef 6e 50 8b 05 7e e5 84 |.p...H.H.nP..~..|
00000070 25 fa 55 c7 ae 31 02 27 00 ef 3f 98 86 20 12 89 |%.U..1.'..?.. ..|
00000080 91 59 28 b4 f7 d7 af d2 69 61 35 14 03 03 00 01 |.Y(.....ia5.....|
00000090 01 16 03 03 00 28 00 00 00 00 00 00 00 00 c7 85 |.....(..........|
000000a0 f5 46 9d ec 9c ca e4 c7 88 13 78 cf f9 37 48 81 |.F........x..7H.|
000000b0 78 57 80 d7 87 21 ef 6e 5a 36 b0 4f f6 11 |xW...!.nZ6.O..|
00000090 01 16 03 03 00 28 00 00 00 00 00 00 00 00 8d 57 |.....(.........W|
000000a0 f8 02 0b e5 88 30 43 21 b7 69 eb b3 1c 91 b3 0b |.....0C!.i......|
000000b0 c4 2e c7 35 c1 dd c3 86 18 d8 ce 32 dd e7 |...5.......2..|
>>> Flow 4 (server to client)
00000000 14 03 03 00 01 01 16 03 03 00 28 4b 2c ce e2 19 |..........(K,...|
00000010 94 64 d3 d6 d8 2a 55 f3 6d a4 d8 89 b6 e1 fe 35 |.d...*U.m......5|
00000020 8d a8 1b 2d 31 8e 50 96 bd 4a 5d 86 4b 50 69 b2 |...-1.P..J].KPi.|
00000030 3a 5e bb |:^.|
00000000 14 03 03 00 01 01 16 03 03 00 28 1a 0b 15 03 95 |..........(.....|
00000010 30 3f 57 6f 7a 70 71 a2 1b 49 60 a1 5d fa e9 c7 |0?Wozpq..I`.]...|
00000020 07 f4 ef bf 2b 1b d9 dc 9b 92 e0 31 14 a5 a3 5b |....+......1...[|
00000030 8c 42 26 |.B&|
>>> Flow 5 (client to server)
00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 42 2a 74 |.............B*t|
00000010 6d ab 21 86 c6 d7 b0 59 ed 5f ac 59 09 47 00 fc |m.!....Y._.Y.G..|
00000020 1a c7 2c 15 03 03 00 1a 00 00 00 00 00 00 00 02 |..,.............|
00000030 fc 8b 1e ab dc e1 5a e8 97 bd b3 be 0e 66 4d c3 |......Z......fM.|
00000040 2b f1 |+.|
00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 f7 35 34 |..............54|
00000010 d0 32 25 43 f0 26 10 56 c8 1d f8 9c 9a ff 98 bb |.2%C.&.V........|
00000020 f7 be 67 15 03 03 00 1a 00 00 00 00 00 00 00 02 |..g.............|
00000030 2f 39 eb 7b f6 d7 69 ca e2 52 aa af 57 a4 22 3d |/9.{..i..R..W."=|
00000040 4f 11 |O.|