From 4ee624457953e3730be8cb012f0cc0450867d1c9 Mon Sep 17 00:00:00 2001 From: maxb Date: Fri, 14 Aug 2020 12:45:39 -0700 Subject: [PATCH] Fix omitSNI test (#59) --- ...HE-RSA-AES128-GCM-SHA256-Chrome-70-OmitSNI | 84 +++++++++---------- u_conn_test.go | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/testdata/Client-TLSv12-UTLS-ECDHE-RSA-AES128-GCM-SHA256-Chrome-70-OmitSNI b/testdata/Client-TLSv12-UTLS-ECDHE-RSA-AES128-GCM-SHA256-Chrome-70-OmitSNI index 6b299ce..af5016a 100644 --- a/testdata/Client-TLSv12-UTLS-ECDHE-RSA-AES128-GCM-SHA256-Chrome-70-OmitSNI +++ b/testdata/Client-TLSv12-UTLS-ECDHE-RSA-AES128-GCM-SHA256-Chrome-70-OmitSNI @@ -6,19 +6,19 @@ 00000040 00 00 00 00 00 00 00 00 00 00 00 00 00 22 0a 0a |............."..| 00000050 13 01 13 02 13 03 c0 2b c0 2f c0 2c c0 30 cc a9 |.......+./.,.0..| 00000060 cc a8 c0 13 c0 14 00 9c 00 9d 00 2f 00 35 00 0a |.........../.5..| -00000070 01 00 01 91 0a 0a 00 00 ff 01 00 01 00 00 00 00 |................| -00000080 05 00 03 00 00 00 00 17 00 00 00 23 00 00 00 0d |...........#....| -00000090 00 14 00 12 04 03 08 04 04 01 05 03 08 05 05 01 |................| -000000a0 08 06 06 01 02 01 00 05 00 05 01 00 00 00 00 00 |................| -000000b0 12 00 00 00 10 00 0e 00 0c 02 68 32 08 68 74 74 |..........h2.htt| -000000c0 70 2f 31 2e 31 75 50 00 00 00 0b 00 02 01 00 00 |p/1.1uP.........| -000000d0 33 00 2b 00 29 0a 0a 00 01 00 00 1d 00 20 2f e5 |3.+.)........ /.| -000000e0 7d a3 47 cd 62 43 15 28 da ac 5f bb 29 07 30 ff |}.G.bC.(.._.).0.| -000000f0 f6 84 af c4 cf c2 ed 90 99 5f 58 cb 3b 74 00 2d |........._X.;t.-| -00000100 00 02 01 01 00 2b 00 0b 0a 0a 0a 03 04 03 03 03 |.....+..........| -00000110 02 03 01 00 0a 00 0a 00 08 0a 0a 00 1d 00 17 00 |................| -00000120 18 00 1b 00 03 02 00 02 1a 1a 00 01 00 00 15 00 |................| -00000130 d4 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00000070 01 00 01 91 0a 0a 00 00 ff 01 00 01 00 00 17 00 |................| +00000080 00 00 23 00 00 00 0d 00 14 00 12 04 03 08 04 04 |..#.............| +00000090 01 05 03 08 05 05 01 08 06 06 01 02 01 00 05 00 |................| +000000a0 05 01 00 00 00 00 00 12 00 00 00 10 00 0e 00 0c |................| +000000b0 02 68 32 08 68 74 74 70 2f 31 2e 31 75 50 00 00 |.h2.http/1.1uP..| +000000c0 00 0b 00 02 01 00 00 33 00 2b 00 29 0a 0a 00 01 |.......3.+.)....| +000000d0 00 00 1d 00 20 2f e5 7d a3 47 cd 62 43 15 28 da |.... /.}.G.bC.(.| +000000e0 ac 5f bb 29 07 30 ff f6 84 af c4 cf c2 ed 90 99 |._.).0..........| +000000f0 5f 58 cb 3b 74 00 2d 00 02 01 01 00 2b 00 0b 0a |_X.;t.-.....+...| +00000100 0a 0a 03 04 03 03 03 02 03 01 00 0a 00 0a 00 08 |................| +00000110 0a 0a 00 1d 00 17 00 18 00 1b 00 03 02 00 02 1a |................| +00000120 1a 00 01 00 00 15 00 dd 00 00 00 00 00 00 00 00 |................| +00000130 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000140 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000150 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000160 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| @@ -33,11 +33,11 @@ 000001f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000200 00 00 00 00 00 |.....| >>> Flow 2 (server to client) -00000000 16 03 03 00 5d 02 00 00 59 03 03 06 bb 2c 4d 12 |....]...Y....,M.| -00000010 6e 2a 6e eb cc 49 a9 d6 d5 65 ef f2 16 80 9b 48 |n*n..I...e.....H| -00000020 84 a4 7e 79 43 97 91 90 b6 33 6f 20 03 ef ac 2c |..~yC....3o ...,| -00000030 6b 3f 5e 39 99 f9 1d 77 de 85 52 fb 38 f7 14 c1 |k?^9...w..R.8...| -00000040 37 ab ff 68 4e 8b a1 6c f5 92 64 70 c0 2f 00 00 |7..hN..l..dp./..| +00000000 16 03 03 00 5d 02 00 00 59 03 03 ef e1 aa 4d 16 |....]...Y.....M.| +00000010 90 97 13 5f e3 be bc a8 cd 95 70 a6 74 fa 41 c0 |..._......p.t.A.| +00000020 94 45 c2 8f 22 6e ff ee f3 4e 09 20 c1 5c 21 15 |.E.."n...N. .\!.| +00000030 e1 54 3f b8 3e 9c 5e 35 88 35 37 64 1c fd b3 3d |.T?.>.^5.57d...=| +00000040 21 6d f7 a2 7a 51 1c 06 07 b6 22 bd c0 2f 00 00 |!m..zQ...."../..| 00000050 11 ff 01 00 01 00 00 0b 00 04 03 00 01 02 00 17 |................| 00000060 00 00 16 03 03 02 59 0b 00 02 55 00 02 52 00 02 |......Y...U..R..| 00000070 4f 30 82 02 4b 30 82 01 b4 a0 03 02 01 02 02 09 |O0..K0..........| @@ -77,33 +77,33 @@ 00000290 73 bb b3 43 77 8d 0c 1c f1 0f a1 d8 40 83 61 c9 |s..Cw.......@.a.| 000002a0 4c 72 2b 9d ae db 46 06 06 4d f4 c1 b3 3e c0 d1 |Lr+...F..M...>..| 000002b0 bd 42 d4 db fe 3d 13 60 84 5c 21 d3 3b e9 fa e7 |.B...=.`.\!.;...| -000002c0 16 03 03 00 ac 0c 00 00 a8 03 00 1d 20 5c de 55 |............ \.U| -000002d0 3e c1 ad 72 ba ed 0e 25 6c a4 04 6a fd bf 76 2e |>..r...%l..j..v.| -000002e0 f3 e5 be 47 24 1d 26 2a 3b 18 f6 35 76 08 04 00 |...G$.&*;..5v...| -000002f0 80 a6 76 6c 19 da 6e 4a 1f c3 a4 cc 3a ac e0 7f |..vl..nJ....:...| -00000300 4f 36 57 96 15 17 85 3e 3b 59 17 cc 16 46 4a 28 |O6W....>;Y...FJ(| -00000310 3a ab f6 50 e6 2e 40 a1 44 25 22 4b 3c 7b ad ba |:..P..@.D%"K<{..| -00000320 30 c9 d3 a5 c4 b0 db c3 59 a1 66 cb 11 fa fc be |0.......Y.f.....| -00000330 89 2d 50 d2 a5 c0 c5 f2 64 40 50 11 ee 58 94 00 |.-P.....d@P..X..| -00000340 70 2f 7f b6 a8 fa f5 d5 66 94 ab fe 32 53 32 95 |p/......f...2S2.| -00000350 87 8d 6d 20 75 18 74 7f cd e6 99 48 2d 9c c5 9f |..m u.t....H-...| -00000360 49 93 28 b7 15 7d 07 82 40 10 be c7 2c bc e1 0f |I.(..}..@...,...| -00000370 c1 16 03 03 00 04 0e 00 00 00 |..........| +000002c0 16 03 03 00 ac 0c 00 00 a8 03 00 1d 20 53 89 27 |............ S.'| +000002d0 49 e8 56 5b b6 a1 47 1a 9f 37 ef 3b 0b 87 ee 8e |I.V[..G..7.;....| +000002e0 04 f8 ef fe 22 4a 23 5f be 28 8c 77 41 08 04 00 |...."J#_.(.wA...| +000002f0 80 47 64 ba da 8d c1 c2 f7 1f 1d 98 f4 25 bb 6b |.Gd..........%.k| +00000300 9e 78 43 f8 3d 8f 7e 3b aa b8 d2 e0 25 29 3d 61 |.xC.=.~;....%)=a| +00000310 dd 2e 00 10 92 76 e2 61 ed 57 56 25 c1 73 c5 44 |.....v.a.WV%.s.D| +00000320 49 c6 f1 7f b6 2a 5d b4 dd b2 4c 80 fc f3 df e2 |I....*]...L.....| +00000330 cb c9 fe 17 c0 29 54 6e 7a f9 6c 51 56 7d 31 d3 |.....)Tnz.lQV}1.| +00000340 99 7e b8 bd 25 02 3d 14 33 e9 6a f7 0e b5 9e 90 |.~..%.=.3.j.....| +00000350 b5 0d 60 a7 48 5b 60 22 90 ae e3 72 1e af c3 79 |..`.H[`"...r...y| +00000360 ed fd 3e a2 dd 6a b1 1a e8 cc 83 d5 a4 e2 91 0c |..>..j..........| +00000370 80 16 03 03 00 04 0e 00 00 00 |..........| >>> Flow 3 (client to server) 00000000 16 03 03 00 25 10 00 00 21 20 2f e5 7d a3 47 cd |....%...! /.}.G.| 00000010 62 43 15 28 da ac 5f bb 29 07 30 ff f6 84 af c4 |bC.(.._.).0.....| 00000020 cf c2 ed 90 99 5f 58 cb 3b 74 14 03 03 00 01 01 |....._X.;t......| -00000030 16 03 03 00 28 00 00 00 00 00 00 00 00 ec 05 89 |....(...........| -00000040 3a db 03 66 f9 69 17 30 51 d6 11 78 5e ed 02 e2 |:..f.i.0Q..x^...| -00000050 6d ef e2 9a 4d 90 90 ec 9f 01 ec cd e6 |m...M........| +00000030 16 03 03 00 28 00 00 00 00 00 00 00 00 9f df 03 |....(...........| +00000040 d3 5f 84 2c fb c6 4c 18 97 0d 3e f3 4a ea 20 da |._.,..L...>.J. .| +00000050 34 5e ac fa 5e a9 2b fb c6 50 2b 13 6f |4^..^.+..P+.o| >>> Flow 4 (server to client) -00000000 14 03 03 00 01 01 16 03 03 00 28 e9 80 13 12 cd |..........(.....| -00000010 84 99 bb c1 f2 5b d3 df 68 b4 34 ec 4c d9 37 91 |.....[..h.4.L.7.| -00000020 26 d5 4e 12 54 49 03 65 75 05 82 c9 18 23 7b 14 |&.N.TI.eu....#{.| -00000030 48 97 ab |H..| +00000000 14 03 03 00 01 01 16 03 03 00 28 eb f3 f5 1b 0f |..........(.....| +00000010 a0 2f 4d bc 2c cc e0 b7 c4 6f c4 a3 22 49 c3 f4 |./M.,....o.."I..| +00000020 2b 36 ff 82 23 82 cb 8a 15 4c 85 b5 45 44 d3 bb |+6..#....L..ED..| +00000030 c5 8d cd |...| >>> Flow 5 (client to server) -00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 7a 74 6f |.............zto| -00000010 72 f9 38 25 e5 6b fb 9a 27 ef a9 04 7b 03 b9 e0 |r.8%.k..'...{...| -00000020 77 8b 36 15 03 03 00 1a 00 00 00 00 00 00 00 02 |w.6.............| -00000030 2f f0 98 5c 7a f9 0a f8 56 16 44 1f d4 b1 9e e0 |/..\z...V.D.....| -00000040 08 02 |..| +00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 d5 bb c2 |................| +00000010 64 4a e8 b9 30 28 bc 73 09 03 b4 8e e7 a7 32 1c |dJ..0(.s......2.| +00000020 0f fc 8c 15 03 03 00 1a 00 00 00 00 00 00 00 02 |................| +00000030 c4 c9 5b 6d 7e 9d 48 d2 f9 f9 f7 8d 4d ae e8 41 |..[m~.H.....M..A| +00000040 27 7c |'|| diff --git a/u_conn_test.go b/u_conn_test.go index e30c385..c12a244 100644 --- a/u_conn_test.go +++ b/u_conn_test.go @@ -387,7 +387,7 @@ func runUTLSClientTestForVersion(t *testing.T, template *clientTest, prefix, opt } test.args = append([]string(nil), test.args...) test.args = append(test.args, option) - test.runUTLS(t, *update, helloID, false) + test.runUTLS(t, *update, helloID, omitSNI) } func runUTLSClientTestTLS12(t *testing.T, template *clientTest, helloID ClientHelloID) {