mirror of
https://github.com/refraction-networking/utls.git
synced 2025-04-04 12:37:35 +03:00
crypto/tls: reorder client_hello extensions
This sets us up for ECH, which need compressible extensions to be contiguous. Put them at the end to make things easier for everyone. Change-Id: I2a51f76d5fcd1b6d82325f5a4a8cde6d75f1be0c Reviewed-on: https://go-review.googlesource.com/c/go/+/585437 Reviewed-by: Filippo Valsorda <filippo@golang.org> Auto-Submit: Roland Shoemaker <roland@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
Roland Shoemaker
Gopher Robot
parent
72f81ff7ec
commit
5578206479
57 changed files with 3345 additions and 3345 deletions
152
testdata/Client-TLSv13-AES256-SHA384
vendored
152
testdata/Client-TLSv13-AES256-SHA384
vendored
|
|
@ -7,87 +7,87 @@
|
|||
00000050 cc a8 c0 2b c0 2f c0 2c c0 30 c0 09 c0 13 c0 0a |...+./.,.0......|
|
||||
00000060 c0 14 00 9c 00 9d 00 2f 00 35 c0 12 00 0a c0 23 |......./.5.....#|
|
||||
00000070 c0 27 00 3c c0 07 c0 11 00 05 13 03 13 01 13 02 |.'.<............|
|
||||
00000080 01 00 00 7f 00 05 00 05 01 00 00 00 00 00 0a 00 |................|
|
||||
00000090 0a 00 08 00 1d 00 17 00 18 00 19 00 0b 00 02 01 |................|
|
||||
000000a0 00 00 0d 00 1a 00 18 08 04 04 03 08 07 08 05 08 |................|
|
||||
000000b0 06 04 01 05 01 06 01 05 03 06 03 02 01 02 03 ff |................|
|
||||
000000c0 01 00 01 00 00 17 00 00 00 12 00 00 00 2b 00 09 |.............+..|
|
||||
00000080 01 00 00 7f 00 0b 00 02 01 00 ff 01 00 01 00 00 |................|
|
||||
00000090 17 00 00 00 12 00 00 00 05 00 05 01 00 00 00 00 |................|
|
||||
000000a0 00 0a 00 0a 00 08 00 1d 00 17 00 18 00 19 00 0d |................|
|
||||
000000b0 00 1a 00 18 08 04 04 03 08 07 08 05 08 06 04 01 |................|
|
||||
000000c0 05 01 06 01 05 03 06 03 02 01 02 03 00 2b 00 09 |.............+..|
|
||||
000000d0 08 03 04 03 03 03 02 03 01 00 33 00 26 00 24 00 |..........3.&.$.|
|
||||
000000e0 1d 00 20 2f e5 7d a3 47 cd 62 43 15 28 da ac 5f |.. /.}.G.bC.(.._|
|
||||
000000f0 bb 29 07 30 ff f6 84 af c4 cf c2 ed 90 99 5f 58 |.).0.........._X|
|
||||
00000100 cb 3b 74 |.;t|
|
||||
>>> Flow 2 (server to client)
|
||||
00000000 16 03 03 00 7a 02 00 00 76 03 03 fc b2 8e 30 c0 |....z...v.....0.|
|
||||
00000010 a2 bd d8 1c 4b 68 bc e0 a1 56 5f 5b 05 54 b7 7a |....Kh...V_[.T.z|
|
||||
00000020 60 9a 49 68 f5 f4 f0 b1 49 27 79 20 00 00 00 00 |`.Ih....I'y ....|
|
||||
00000000 16 03 03 00 7a 02 00 00 76 03 03 3d 39 60 81 a4 |....z...v..=9`..|
|
||||
00000010 cc 92 5d fd 8b 21 58 da 2e 4c e2 70 2b 12 d2 8c |..]..!X..L.p+...|
|
||||
00000020 35 55 bc ba 79 c1 9e 6f 78 8c cf 20 00 00 00 00 |5U..y..ox.. ....|
|
||||
00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
|
||||
00000040 00 00 00 00 00 00 00 00 00 00 00 00 13 02 00 00 |................|
|
||||
00000050 2e 00 2b 00 02 03 04 00 33 00 24 00 1d 00 20 d3 |..+.....3.$... .|
|
||||
00000060 d7 9e 72 ae 5f f9 92 24 6b 76 e5 a1 00 71 78 cf |..r._..$kv...qx.|
|
||||
00000070 e9 55 29 5b fe a8 71 14 e9 02 b0 65 12 e8 04 14 |.U)[..q....e....|
|
||||
00000080 03 03 00 01 01 17 03 03 00 17 24 a0 73 a6 7b ab |..........$.s.{.|
|
||||
00000090 9c d8 69 e7 15 68 4b 26 0a 15 0c ff c4 40 7d b8 |..i..hK&.....@}.|
|
||||
000000a0 ad 17 03 03 02 6d 05 b2 f9 6e 05 48 18 92 2b 87 |.....m...n.H..+.|
|
||||
000000b0 29 1c 5b 8c a8 ae 0e 4b fc 3b 1e b9 2c c2 0c 33 |).[....K.;..,..3|
|
||||
000000c0 f8 5d 16 37 39 b3 b2 4e 12 a4 02 4c fb 3b 16 4e |.].79..N...L.;.N|
|
||||
000000d0 63 92 72 56 49 d6 5b 63 34 20 67 c8 07 a2 b6 0d |c.rVI.[c4 g.....|
|
||||
000000e0 f1 06 b4 bd 88 54 4d 33 66 1a d4 fc 42 9c 4e 00 |.....TM3f...B.N.|
|
||||
000000f0 40 34 5d cf c4 5d f1 ba 14 de 34 50 f5 2f 3d b7 |@4]..]....4P./=.|
|
||||
00000100 1c 17 33 6e 9a 2b 39 1b f1 a6 0d fb b7 0c c3 b3 |..3n.+9.........|
|
||||
00000110 02 f8 0c 30 e8 31 d7 ee bf a1 a0 64 28 67 64 50 |...0.1.....d(gdP|
|
||||
00000120 24 ce 37 fd 15 2e c7 13 1b 8b f0 22 19 e4 ec c8 |$.7........"....|
|
||||
00000130 8c b0 76 b8 d0 2d 87 99 86 8b ec ca e9 9d 8f 23 |..v..-.........#|
|
||||
00000140 bf 3d bf b8 ed 85 34 85 31 15 dd 7a 36 f7 3e 0e |.=....4.1..z6.>.|
|
||||
00000150 df e7 4c e8 ae 5a 98 05 f8 34 76 33 c3 4c 81 fb |..L..Z...4v3.L..|
|
||||
00000160 d8 29 14 b3 47 32 eb 5f 73 5a 95 4a c7 3d 89 2a |.)..G2._sZ.J.=.*|
|
||||
00000170 21 22 bd 97 b2 9d 4b dd 2c eb a5 e3 37 d6 a9 84 |!"....K.,...7...|
|
||||
00000180 0c b6 02 2f 1f 5c 18 1b be 92 be 58 a7 e1 a0 49 |.../.\.....X...I|
|
||||
00000190 95 dc d7 07 70 b1 5b 15 86 3f 55 fc ad 32 39 5d |....p.[..?U..29]|
|
||||
000001a0 95 63 fd d4 85 55 b2 e9 c2 68 d0 09 f9 53 f9 4f |.c...U...h...S.O|
|
||||
000001b0 0e 89 1c a0 85 74 7f 10 97 e7 86 8a 18 28 83 e6 |.....t.......(..|
|
||||
000001c0 66 3c 2a f5 8f 14 1d 90 58 ef ad 1f d3 7f 42 0a |f<*.....X.....B.|
|
||||
000001d0 08 d5 b4 96 b0 9d 3f 72 49 5a 06 13 7c 4b bc 79 |......?rIZ..|K.y|
|
||||
000001e0 8c db 1f 1f 5e 3d c2 fe ad 57 e6 d9 14 bb d0 72 |....^=...W.....r|
|
||||
000001f0 d7 90 14 35 ec 34 31 f6 fd b1 fd 3d 46 6e 4f a7 |...5.41....=FnO.|
|
||||
00000200 1e 7d 14 40 17 0c ef c0 c8 70 fe dc 6a f1 78 6a |.}.@.....p..j.xj|
|
||||
00000210 c6 df 70 2e ac 07 d9 6d f7 90 0e 4a 92 08 cf 88 |..p....m...J....|
|
||||
00000220 26 c0 11 4a 7d e4 34 ba 86 43 cb 94 f8 d7 61 5a |&..J}.4..C....aZ|
|
||||
00000230 05 f5 f9 49 b4 04 f1 c8 43 b6 12 52 ae cf 7c b9 |...I....C..R..|.|
|
||||
00000240 39 d1 90 91 6e 80 43 cf 4c 23 3d 7c c0 c8 88 46 |9...n.C.L#=|...F|
|
||||
00000250 e2 91 86 e4 41 cb ed f2 3a 92 01 9f 04 7c d2 81 |....A...:....|..|
|
||||
00000260 42 18 6c 04 91 25 8a 29 0e d9 23 aa 58 e5 e8 ee |B.l..%.)..#.X...|
|
||||
00000270 39 79 a5 a7 3a 4d e3 cc 15 79 3f 7b f9 e4 21 76 |9y..:M...y?{..!v|
|
||||
00000280 5c 9a d8 de d3 9a f3 9e 69 44 c0 2a 56 04 b4 d2 |\.......iD.*V...|
|
||||
00000290 c3 c1 4c d6 ad b8 d8 ad c8 c2 0d fa ea e1 bc 11 |..L.............|
|
||||
000002a0 67 15 80 ef c6 01 48 7f de f1 c2 36 a7 dd a9 38 |g.....H....6...8|
|
||||
000002b0 31 8b 14 ed 5c 2a 66 55 3b 25 e3 85 cb d9 a9 82 |1...\*fU;%......|
|
||||
000002c0 7a 95 99 b3 c8 aa ac 66 30 b0 c5 3d d1 2a ab b9 |z......f0..=.*..|
|
||||
000002d0 56 b3 5e 9d e0 d7 81 ac 6f 2e ae 62 a2 ef ca ef |V.^.....o..b....|
|
||||
000002e0 7b cf 0f af f6 0b 29 97 2d 27 33 58 ad b6 1b d2 |{.....).-'3X....|
|
||||
000002f0 0a c7 11 ec 89 b0 0d 2e ff 27 64 c2 bf 8e 85 a4 |.........'d.....|
|
||||
00000300 ea 14 52 71 55 1a ec ef 0d ff 14 00 ce 3d 9d 3d |..RqU........=.=|
|
||||
00000310 a9 d3 17 17 03 03 00 99 5e ba 1f f3 93 71 7a 88 |........^....qz.|
|
||||
00000320 bc 14 71 7e 85 15 c9 da fe ee c1 b1 3d f6 ff 67 |..q~........=..g|
|
||||
00000330 fd 28 96 f3 44 44 6f 8f 32 b4 22 be 69 29 e6 dd |.(..DDo.2.".i)..|
|
||||
00000340 60 07 1d 98 0b 0c 0f ec df fa 46 c0 67 66 f2 18 |`.........F.gf..|
|
||||
00000350 bf 5e 36 56 b2 b2 25 ef aa 76 51 ea f7 47 1d ee |.^6V..%..vQ..G..|
|
||||
00000360 7b 25 e5 97 89 4a 04 07 f8 ff 05 73 25 71 e4 28 |{%...J.....s%q.(|
|
||||
00000370 9e 91 45 ff 4c df 82 dc 85 16 02 ba 15 9b 37 91 |..E.L.........7.|
|
||||
00000380 eb 65 12 66 38 59 8a 85 a2 2e af 2f d7 74 75 c1 |.e.f8Y...../.tu.|
|
||||
00000390 7e f6 64 87 7e 4c 86 c8 25 bb 59 8d f8 9c e3 e5 |~.d.~L..%.Y.....|
|
||||
000003a0 a4 53 a5 c6 00 bd 78 d8 07 0e f5 42 92 e3 42 11 |.S....x....B..B.|
|
||||
000003b0 57 17 03 03 00 45 77 98 db b2 e4 66 e3 dc 3e 4f |W....Ew....f..>O|
|
||||
000003c0 49 92 b3 ac 74 cd 1c 3b e2 81 3c 64 0b a5 c9 8c |I...t..;..<d....|
|
||||
000003d0 7e 9a 22 9f df 7e e8 68 99 56 93 49 d5 81 3f c1 |~."..~.h.V.I..?.|
|
||||
000003e0 de 00 07 bd 6e ba 25 00 63 f0 82 41 46 ba 04 b7 |....n.%.c..AF...|
|
||||
000003f0 1f 37 aa 1c f6 49 8f e6 83 e8 23 |.7...I....#|
|
||||
00000050 2e 00 2b 00 02 03 04 00 33 00 24 00 1d 00 20 10 |..+.....3.$... .|
|
||||
00000060 0e 84 6c ef b3 7e f7 93 33 67 0e d0 5e e4 c6 a8 |..l..~..3g..^...|
|
||||
00000070 5f c5 ac e7 85 06 86 a4 21 10 aa 56 18 3a 39 14 |_.......!..V.:9.|
|
||||
00000080 03 03 00 01 01 17 03 03 00 17 a8 c3 84 a3 a2 42 |...............B|
|
||||
00000090 ba c8 40 ef f8 53 02 58 d7 39 3f b2 34 2f 4e 71 |..@..S.X.9?.4/Nq|
|
||||
000000a0 54 17 03 03 02 6d e5 41 6d ac 46 4e 7c 71 5c b9 |T....m.Am.FN|q\.|
|
||||
000000b0 c5 aa 8d 7d f2 ef f3 40 22 9d db d3 83 49 45 94 |...}...@"....IE.|
|
||||
000000c0 96 c6 85 74 ac f1 64 e2 80 7a 47 1e c1 f7 45 bb |...t..d..zG...E.|
|
||||
000000d0 6e 56 b5 5b 90 1f 11 6e 47 d5 52 b7 5d d3 02 80 |nV.[...nG.R.]...|
|
||||
000000e0 55 59 94 53 05 ab 5c aa 18 f8 7d d0 24 1d 6f 7a |UY.S..\...}.$.oz|
|
||||
000000f0 c7 8e e9 80 61 dc b3 2b c0 74 09 d3 58 be e9 cb |....a..+.t..X...|
|
||||
00000100 8b 53 ec 68 d7 b4 4b 70 83 42 bb 24 78 05 3c 8c |.S.h..Kp.B.$x.<.|
|
||||
00000110 a9 54 af 0b 55 e2 d3 35 73 56 9b 9a 19 fd 93 9a |.T..U..5sV......|
|
||||
00000120 21 c3 5f f8 cf fe e0 a1 63 62 b8 58 bf 35 29 1d |!._.....cb.X.5).|
|
||||
00000130 69 58 f6 d3 e8 60 66 1b db 53 4b 26 0b 78 d9 5e |iX...`f..SK&.x.^|
|
||||
00000140 73 d5 34 5a 11 57 98 8d 0c 9f 85 28 80 a4 ee 47 |s.4Z.W.....(...G|
|
||||
00000150 f8 23 ca 31 7a 24 d5 dd 9b 49 7b 62 ab e5 69 fa |.#.1z$...I{b..i.|
|
||||
00000160 e7 cc 83 0c 6e e5 0f 98 4c 07 86 2b a9 97 eb c0 |....n...L..+....|
|
||||
00000170 78 1e 2b 83 7b 9a 6f 51 60 c0 b8 e1 99 f7 b0 e3 |x.+.{.oQ`.......|
|
||||
00000180 bf d8 ec 4e 9f 69 27 c8 89 fc 18 21 58 8a ba 87 |...N.i'....!X...|
|
||||
00000190 23 4c cd 95 b7 f1 a5 9a 79 5c d7 35 74 a5 4a 2c |#L......y\.5t.J,|
|
||||
000001a0 fc c8 f4 b4 c4 de 3b 0e 08 12 e0 24 af 10 b3 e7 |......;....$....|
|
||||
000001b0 04 74 a9 b4 de ee 98 b5 f1 ed 50 9f eb 5f eb 14 |.t........P.._..|
|
||||
000001c0 56 6f d2 f2 b3 5e 40 34 0a f9 2d 44 de 0a 29 8f |Vo...^@4..-D..).|
|
||||
000001d0 e5 86 dc 97 4f dd 26 b6 6a 8f 69 e9 5c 87 87 92 |....O.&.j.i.\...|
|
||||
000001e0 65 04 d6 aa d0 79 bf ab 85 20 ca e9 bf 50 5d a9 |e....y... ...P].|
|
||||
000001f0 80 2c 92 26 8e 19 ef 78 a7 68 64 ba 48 3c 24 2e |.,.&...x.hd.H<$.|
|
||||
00000200 45 69 ce 94 17 e5 8a d7 81 02 de f1 d0 d8 c0 b8 |Ei..............|
|
||||
00000210 86 c1 fb 2c 6d fe 42 1a ce e0 1c f0 29 15 ba fc |...,m.B.....)...|
|
||||
00000220 8d 65 5e 6d ea 9e c3 95 f4 1b 15 bb 91 ac 9c 0b |.e^m............|
|
||||
00000230 13 f0 fa ab 46 ed f1 c5 29 6e 45 db 4c cc 1e 45 |....F...)nE.L..E|
|
||||
00000240 4d fc f2 6c 2b 0a d0 f3 70 69 32 cd 2f 23 6d f2 |M..l+...pi2./#m.|
|
||||
00000250 5f f3 f4 f0 5c 1c d7 d3 a7 0c 8f 23 29 30 7a 8e |_...\......#)0z.|
|
||||
00000260 c3 aa a8 71 21 5c ad b6 fb c6 bd 78 ac ab b1 a0 |...q!\.....x....|
|
||||
00000270 11 84 23 61 7b ec 90 e1 2c 23 ec 9b 21 c8 ab 01 |..#a{...,#..!...|
|
||||
00000280 e0 b9 5b 0b 4c ee a5 3c 5b c0 52 bd 60 7a b1 88 |..[.L..<[.R.`z..|
|
||||
00000290 67 e3 c9 60 b9 04 a8 31 3e 34 d7 33 49 38 d9 a7 |g..`...1>4.3I8..|
|
||||
000002a0 d1 04 b4 13 a8 5f 0b f2 41 77 d4 c8 b2 d3 0e d6 |....._..Aw......|
|
||||
000002b0 8c dc 34 ad 2a d9 4b 5f 4a e2 17 0a be 2a 55 4a |..4.*.K_J....*UJ|
|
||||
000002c0 44 a7 b0 0f d1 39 b0 e5 9d 77 6b d7 44 15 99 bf |D....9...wk.D...|
|
||||
000002d0 c8 02 57 90 5b 73 29 fe ab 85 93 c3 dc 1c b0 b2 |..W.[s).........|
|
||||
000002e0 14 78 01 99 f5 d2 db ef ae 0e 2a d9 17 1e 70 fa |.x........*...p.|
|
||||
000002f0 bb 74 fe 93 a0 aa ff 79 cd 8b 6d 3d 79 66 d2 c8 |.t.....y..m=yf..|
|
||||
00000300 90 c7 2c e6 54 26 de f7 4d b8 a7 73 cd 92 fc 42 |..,.T&..M..s...B|
|
||||
00000310 ad 4e ff 17 03 03 00 99 c6 07 36 ce 58 9c fe 38 |.N........6.X..8|
|
||||
00000320 aa b4 5c c8 8e f5 11 19 82 4c 4b 2b 0a 08 be 3f |..\......LK+...?|
|
||||
00000330 11 76 06 4b d3 1b b7 fc 66 d9 db de fb 6a ee 29 |.v.K....f....j.)|
|
||||
00000340 f6 a5 4b 96 f3 3c a0 67 44 73 d4 46 c5 d4 a1 f8 |..K..<.gDs.F....|
|
||||
00000350 71 36 7c a5 62 79 fc be f9 34 55 85 31 8f fc e3 |q6|.by...4U.1...|
|
||||
00000360 46 be 64 1e 2d 1b 21 c3 89 8e 1c cc df 30 05 57 |F.d.-.!......0.W|
|
||||
00000370 2e d5 d5 67 11 10 46 1a af 99 01 0e fd 40 53 1f |...g..F......@S.|
|
||||
00000380 b0 f0 76 3e 8e c1 7a 6a fe fe ef c1 08 6e ea 9b |..v>..zj.....n..|
|
||||
00000390 75 6c 62 86 07 50 ee 1f ef 3b 55 fd 68 44 47 27 |ulb..P...;U.hDG'|
|
||||
000003a0 07 c1 53 b5 13 c5 e0 a4 d6 9e 8a 3c 78 a0 04 b7 |..S........<x...|
|
||||
000003b0 08 17 03 03 00 45 6b fc 53 20 43 7a f3 26 2f fc |.....Ek.S Cz.&/.|
|
||||
000003c0 97 0e d3 09 f0 d9 c5 46 af be e4 c5 06 31 6f 6c |.......F.....1ol|
|
||||
000003d0 5f 11 ec 4a c5 d5 02 50 aa d5 28 98 60 f1 79 82 |_..J...P..(.`.y.|
|
||||
000003e0 fb e9 87 c0 e0 c0 e0 60 c2 11 cf be 8f 12 d5 0c |.......`........|
|
||||
000003f0 91 40 ed a1 93 40 60 04 98 a3 d7 |.@...@`....|
|
||||
>>> Flow 3 (client to server)
|
||||
00000000 14 03 03 00 01 01 17 03 03 00 45 75 66 f7 1c cc |..........Euf...|
|
||||
00000010 a5 d2 e0 60 37 ff ab 89 16 88 c1 27 ba 57 0c 0d |...`7......'.W..|
|
||||
00000020 28 c9 c3 8a 53 57 05 1c 2a 47 52 b6 98 f9 26 4f |(...SW..*GR...&O|
|
||||
00000030 34 7c 7a 71 00 87 47 c3 a5 b8 0c 8c 03 87 5e de |4|zq..G.......^.|
|
||||
00000040 a1 40 33 9b e1 7f ad 36 71 10 9a e7 28 45 e1 e2 |.@3....6q...(E..|
|
||||
00000050 17 03 03 00 17 a3 83 88 cd fa fc f4 60 12 e7 be |............`...|
|
||||
00000060 8d 11 31 74 3f 25 3e 32 6f 7f 73 57 17 03 03 00 |..1t?%>2o.sW....|
|
||||
00000070 13 7f ab 29 bc f6 7e ea f7 17 ee 7a ef 38 ff bc |...)..~....z.8..|
|
||||
00000080 82 68 f5 07 |.h..|
|
||||
00000000 14 03 03 00 01 01 17 03 03 00 45 ee 00 18 db 1e |..........E.....|
|
||||
00000010 67 aa 0f 9e 5c 20 7d 25 27 49 e8 d5 60 02 78 7b |g...\ }%'I..`.x{|
|
||||
00000020 23 58 70 67 67 93 ca 4d 50 69 b1 cf d9 dc 31 d3 |#Xpgg..MPi....1.|
|
||||
00000030 03 36 b0 07 39 59 52 e1 c7 36 6d 16 0b 56 03 c6 |.6..9YR..6m..V..|
|
||||
00000040 a0 ec 0e 6b ed de 7b ba 51 96 83 b6 b8 77 8f 6a |...k..{.Q....w.j|
|
||||
00000050 17 03 03 00 17 77 f6 6f 83 00 ad eb be 16 26 3d |.....w.o......&=|
|
||||
00000060 27 e8 58 73 a2 bc 11 ff 14 54 4a 15 17 03 03 00 |'.Xs.....TJ.....|
|
||||
00000070 13 bc 94 3f 6e ee 1b 40 b0 2e 03 13 47 28 38 4d |...?n..@....G(8M|
|
||||
00000080 2d 26 5d 15 |-&].|
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue