From 5090dd6199841ccaab547b508ec05ad83e174f1c Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 25 Aug 2020 12:59:14 +0700 Subject: [PATCH] use the fuzzing helper functions to generate the frames seed corpus --- .gitignore | 2 -- fuzzing/frames/cmd/corpus.go | 34 +++++++--------------- fuzzing/frames/corpus/multiple-frames-0 | Bin 279 -> 0 bytes fuzzing/frames/corpus/multiple-frames-1 | Bin 525 -> 0 bytes fuzzing/frames/corpus/multiple-frames-10 | Bin 53 -> 0 bytes fuzzing/frames/corpus/multiple-frames-11 | Bin 125 -> 0 bytes fuzzing/frames/corpus/multiple-frames-12 | Bin 20 -> 0 bytes fuzzing/frames/corpus/multiple-frames-13 | Bin 44 -> 0 bytes fuzzing/frames/corpus/multiple-frames-14 | Bin 567 -> 0 bytes fuzzing/frames/corpus/multiple-frames-15 | Bin 307 -> 0 bytes fuzzing/frames/corpus/multiple-frames-16 | Bin 324 -> 0 bytes fuzzing/frames/corpus/multiple-frames-17 | Bin 123 -> 0 bytes fuzzing/frames/corpus/multiple-frames-18 | Bin 408 -> 0 bytes fuzzing/frames/corpus/multiple-frames-19 | Bin 158 -> 0 bytes fuzzing/frames/corpus/multiple-frames-2 | Bin 93 -> 0 bytes fuzzing/frames/corpus/multiple-frames-20 | Bin 41 -> 0 bytes fuzzing/frames/corpus/multiple-frames-21 | Bin 30 -> 0 bytes fuzzing/frames/corpus/multiple-frames-22 | Bin 214 -> 0 bytes fuzzing/frames/corpus/multiple-frames-23 | Bin 315 -> 0 bytes fuzzing/frames/corpus/multiple-frames-24 | Bin 37 -> 0 bytes fuzzing/frames/corpus/multiple-frames-3 | Bin 167 -> 0 bytes fuzzing/frames/corpus/multiple-frames-4 | Bin 150 -> 0 bytes fuzzing/frames/corpus/multiple-frames-5 | Bin 629 -> 0 bytes fuzzing/frames/corpus/multiple-frames-6 | Bin 361 -> 0 bytes fuzzing/frames/corpus/multiple-frames-7 | Bin 306 -> 0 bytes fuzzing/frames/corpus/multiple-frames-8 | Bin 51 -> 0 bytes fuzzing/frames/corpus/multiple-frames-9 | Bin 103 -> 0 bytes fuzzing/frames/corpus/single-frame-0 | 1 - fuzzing/frames/corpus/single-frame-1 | 1 - fuzzing/frames/corpus/single-frame-10 | 1 - fuzzing/frames/corpus/single-frame-11 | 1 - fuzzing/frames/corpus/single-frame-12 | 1 - fuzzing/frames/corpus/single-frame-13 | Bin 8 -> 0 bytes fuzzing/frames/corpus/single-frame-14 | Bin 105 -> 0 bytes fuzzing/frames/corpus/single-frame-15 | Bin 54 -> 0 bytes fuzzing/frames/corpus/single-frame-16 | 2 -- fuzzing/frames/corpus/single-frame-17 | 1 - fuzzing/frames/corpus/single-frame-18 | 1 - fuzzing/frames/corpus/single-frame-19 | 1 - fuzzing/frames/corpus/single-frame-2 | Bin 57 -> 0 bytes fuzzing/frames/corpus/single-frame-20 | 1 - fuzzing/frames/corpus/single-frame-21 | 1 - fuzzing/frames/corpus/single-frame-22 | 1 - fuzzing/frames/corpus/single-frame-23 | 1 - fuzzing/frames/corpus/single-frame-24 | 1 - fuzzing/frames/corpus/single-frame-25 | 1 - fuzzing/frames/corpus/single-frame-26 | 1 - fuzzing/frames/corpus/single-frame-27 | 1 - fuzzing/frames/corpus/single-frame-28 | 1 - fuzzing/frames/corpus/single-frame-29 | 1 - fuzzing/frames/corpus/single-frame-3 | 1 - fuzzing/frames/corpus/single-frame-30 | Bin 5 -> 0 bytes fuzzing/frames/corpus/single-frame-31 | Bin 107 -> 0 bytes fuzzing/frames/corpus/single-frame-32 | Bin 4 -> 0 bytes fuzzing/frames/corpus/single-frame-33 | 1 - fuzzing/frames/corpus/single-frame-34 | 1 - fuzzing/frames/corpus/single-frame-35 | 3 -- fuzzing/frames/corpus/single-frame-36 | Bin 10 -> 0 bytes fuzzing/frames/corpus/single-frame-4 | 2 -- fuzzing/frames/corpus/single-frame-5 | 1 - fuzzing/frames/corpus/single-frame-6 | 1 - fuzzing/frames/corpus/single-frame-7 | Bin 23 -> 0 bytes fuzzing/frames/corpus/single-frame-8 | 1 - fuzzing/frames/corpus/single-frame-9 | Bin 214 -> 0 bytes fuzzing/frames/fuzz.go | 35 ++++++++++++++--------- 65 files changed, 31 insertions(+), 71 deletions(-) delete mode 100644 fuzzing/frames/corpus/multiple-frames-0 delete mode 100644 fuzzing/frames/corpus/multiple-frames-1 delete mode 100644 fuzzing/frames/corpus/multiple-frames-10 delete mode 100644 fuzzing/frames/corpus/multiple-frames-11 delete mode 100644 fuzzing/frames/corpus/multiple-frames-12 delete mode 100644 fuzzing/frames/corpus/multiple-frames-13 delete mode 100644 fuzzing/frames/corpus/multiple-frames-14 delete mode 100644 fuzzing/frames/corpus/multiple-frames-15 delete mode 100644 fuzzing/frames/corpus/multiple-frames-16 delete mode 100644 fuzzing/frames/corpus/multiple-frames-17 delete mode 100644 fuzzing/frames/corpus/multiple-frames-18 delete mode 100644 fuzzing/frames/corpus/multiple-frames-19 delete mode 100644 fuzzing/frames/corpus/multiple-frames-2 delete mode 100644 fuzzing/frames/corpus/multiple-frames-20 delete mode 100644 fuzzing/frames/corpus/multiple-frames-21 delete mode 100644 fuzzing/frames/corpus/multiple-frames-22 delete mode 100644 fuzzing/frames/corpus/multiple-frames-23 delete mode 100644 fuzzing/frames/corpus/multiple-frames-24 delete mode 100644 fuzzing/frames/corpus/multiple-frames-3 delete mode 100644 fuzzing/frames/corpus/multiple-frames-4 delete mode 100644 fuzzing/frames/corpus/multiple-frames-5 delete mode 100644 fuzzing/frames/corpus/multiple-frames-6 delete mode 100644 fuzzing/frames/corpus/multiple-frames-7 delete mode 100644 fuzzing/frames/corpus/multiple-frames-8 delete mode 100644 fuzzing/frames/corpus/multiple-frames-9 delete mode 100644 fuzzing/frames/corpus/single-frame-0 delete mode 100644 fuzzing/frames/corpus/single-frame-1 delete mode 100644 fuzzing/frames/corpus/single-frame-10 delete mode 100644 fuzzing/frames/corpus/single-frame-11 delete mode 100644 fuzzing/frames/corpus/single-frame-12 delete mode 100644 fuzzing/frames/corpus/single-frame-13 delete mode 100644 fuzzing/frames/corpus/single-frame-14 delete mode 100644 fuzzing/frames/corpus/single-frame-15 delete mode 100644 fuzzing/frames/corpus/single-frame-16 delete mode 100644 fuzzing/frames/corpus/single-frame-17 delete mode 100644 fuzzing/frames/corpus/single-frame-18 delete mode 100644 fuzzing/frames/corpus/single-frame-19 delete mode 100644 fuzzing/frames/corpus/single-frame-2 delete mode 100644 fuzzing/frames/corpus/single-frame-20 delete mode 100644 fuzzing/frames/corpus/single-frame-21 delete mode 100644 fuzzing/frames/corpus/single-frame-22 delete mode 100644 fuzzing/frames/corpus/single-frame-23 delete mode 100644 fuzzing/frames/corpus/single-frame-24 delete mode 100644 fuzzing/frames/corpus/single-frame-25 delete mode 100644 fuzzing/frames/corpus/single-frame-26 delete mode 100644 fuzzing/frames/corpus/single-frame-27 delete mode 100644 fuzzing/frames/corpus/single-frame-28 delete mode 100644 fuzzing/frames/corpus/single-frame-29 delete mode 100644 fuzzing/frames/corpus/single-frame-3 delete mode 100644 fuzzing/frames/corpus/single-frame-30 delete mode 100644 fuzzing/frames/corpus/single-frame-31 delete mode 100644 fuzzing/frames/corpus/single-frame-32 delete mode 100644 fuzzing/frames/corpus/single-frame-33 delete mode 100644 fuzzing/frames/corpus/single-frame-34 delete mode 100644 fuzzing/frames/corpus/single-frame-35 delete mode 100644 fuzzing/frames/corpus/single-frame-36 delete mode 100644 fuzzing/frames/corpus/single-frame-4 delete mode 100644 fuzzing/frames/corpus/single-frame-5 delete mode 100644 fuzzing/frames/corpus/single-frame-6 delete mode 100644 fuzzing/frames/corpus/single-frame-7 delete mode 100644 fuzzing/frames/corpus/single-frame-8 delete mode 100644 fuzzing/frames/corpus/single-frame-9 diff --git a/.gitignore b/.gitignore index 2923d563..6e0387a4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,3 @@ fuzzing/*/crashers fuzzing/*/sonarprofile fuzzing/*/suppressions fuzzing/*/corpus/ -!fuzzing/frames/single-frame* -!fuzzing/frames/multiple-frame* diff --git a/fuzzing/frames/cmd/corpus.go b/fuzzing/frames/cmd/corpus.go index 6043a2ab..c65fe98f 100644 --- a/fuzzing/frames/cmd/corpus.go +++ b/fuzzing/frames/cmd/corpus.go @@ -2,12 +2,12 @@ package main import ( "bytes" - "fmt" + "log" "math/rand" - "os" "time" "github.com/lucas-clemente/quic-go" + "github.com/lucas-clemente/quic-go/fuzzing/internal/helper" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/qerr" "github.com/lucas-clemente/quic-go/internal/wire" @@ -246,19 +246,17 @@ func getFrames() []wire.Frame { } func main() { - rand.Seed(42) - - for i, f := range getFrames() { + for _, f := range getFrames() { b := &bytes.Buffer{} if err := f.Write(b, version); err != nil { - panic(err) + log.Fatal(err) } - if err := writeCorpusFile(fmt.Sprintf("single-frame-%d", i), b.Bytes()); err != nil { - panic(err) + if err := helper.WriteCorpusFileWithPrefix("corpus", b.Bytes(), 1); err != nil { + log.Fatal(err) } } - for i := 0; i < 25; i++ { + for i := 0; i < 30; i++ { frames := getFrames() b := &bytes.Buffer{} @@ -268,26 +266,14 @@ func main() { } f := frames[rand.Intn(len(frames))] if err := f.Write(b, version); err != nil { - panic(err) + log.Fatal(err) } if rand.Intn(10) == 0 { // write a PADDING frame b.WriteByte(0x0) } } - if err := writeCorpusFile(fmt.Sprintf("multiple-frames-%d", i), b.Bytes()); err != nil { - panic(err) + if err := helper.WriteCorpusFileWithPrefix("corpus", b.Bytes(), 1); err != nil { + log.Fatal(err) } } } - -func writeCorpusFile(name string, data []byte) error { - file, err := os.Create("corpus/" + name) - if err != nil { - return err - } - data = append(getRandomData(1), data...) - if _, err := file.Write(data); err != nil { - return err - } - return file.Close() -} diff --git a/fuzzing/frames/corpus/multiple-frames-0 b/fuzzing/frames/corpus/multiple-frames-0 deleted file mode 100644 index d707df211fc9ab086258f864a03bd927dc743370..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFky7KoC^?HL6C7KoC^?GXR}|NsC0|NjPQz%r6F52OfCTHT2(TZHw5waej2 zySnR;7@AGchsRqwq<)kIXD3Rih7;AuQfDu7Ia36VwKP#pg$jM(hyNy~bP}zJ~r)HPze>RjBEQx{z zjE!@_I%@(eA{1-_02m$*1a4QtPX!_JqDz@fUy|en zRw5K^0tNs;WOLWiqqBoVEPv9zLBxI8W5}23GJ2+b!=AdOAA^Z7T+nF^P5tU~@pxl~qheBN_p+OmOj* z1D=_}eYFNgzxyb+f~Px42^kw8H;9iud*2AQWAI^uZFu>7qyz=@J~Hivq9Is& z>zJgE+eUx;kgpyMRs4TWuAsNt0X&VSchcq~{~)kq z>`Xv5IVF_}($6aV!%x8prhdD4=wD&hXZIHEae4+-gUd*@fSY+O*wBq0z|2 zb=MAb5C?)<4}z≀(gIW02+0gugS}O#%9bc^x5sPcGuGLyFsHhC0dfd8kfQ`lW`Y zN(rp+Su7Xp=b-ro!Uz>|hUaxn);dW_f-6zm*d5?_FL>RB@-sr*uKQwyWqNnuk${o8 z1ZxxoXHkwb`$Z2s7LJcTw~S`S5lSU@9j@qzP1HObq}gBywJcYM|E=#AuG%v|Al@*- Pcu4rzlYcW4k8hMI$hi63 diff --git a/fuzzing/frames/corpus/multiple-frames-10 b/fuzzing/frames/corpus/multiple-frames-10 deleted file mode 100644 index 455886f4fe228f1bfb07ee91de0512de5267d7b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmcc28?*mE1pGS7r7oZ%IxW;s(~&{c(;h1PpPg$JTTA_akD{%MkIK%d=cr@=07CB^ Ay#N3J diff --git a/fuzzing/frames/corpus/multiple-frames-11 b/fuzzing/frames/corpus/multiple-frames-11 deleted file mode 100644 index 92f19930378226afeabedcccc67829d9fcc4d866..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmYe6m~lU|1B3;$mF;e&TePfr`0mGy!EIYRNHi(V%|ke*otlJazy8 diff --git a/fuzzing/frames/corpus/multiple-frames-12 b/fuzzing/frames/corpus/multiple-frames-12 deleted file mode 100644 index 9d65910714cca9bfba51fec9e2c7f5b79ac61629..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 bcmZ3^$sp^Z!NAUC^sh2FYe~3L+Gj=pHXsHl diff --git a/fuzzing/frames/corpus/multiple-frames-13 b/fuzzing/frames/corpus/multiple-frames-13 deleted file mode 100644 index 126a23c47349f81e8c4d2a74dcf9dc5721360599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 ocmX>o{W4}bUpn6@6$U{^hW}8&=^@0jcA0hRda>(fFflPL0Q;sG=l}o! diff --git a/fuzzing/frames/corpus/multiple-frames-14 b/fuzzing/frames/corpus/multiple-frames-14 deleted file mode 100644 index fd35b2c70f72a1bee405d6d24096f969314c4318..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmdnV>6ChSt&8OHk8xUU`6Z{_&paGnI#Xnjvn~+Z`#?JKRjlAZV+AR=)m=ct@r+P)#US^ za~$q8Ej2FnV-VUjRnkl*E0BSKQDXKPwHLk5giBcdoa9$|b$|V2>5cwN0$2o(xJEtY zU^)@)C@iFE(%8Td`j6#E(WhV~6_bJk<|%D6_nkL8BvilVLZFWQfvQBeEw&a-2iA4V zEj`xiaUeVW(Tj4WEeBYi%Zd2B{c(UHVD-_s6KMySc1x|eP`q9=Yt4TskXZ9Vbpr?s zYI~oEoW&n`RjTDu!b|Uo@^K7bGYuc#yu{BWG$V7{?!pB!Tnr8=#hlw#s7?KO+wtDD zo|ZG6kBzS_ez}i*Ie&hjPLo}dcK2~kr}ou*mhT>4T-Z-4t?#;nO%O=mxDm?)eyfq@NZmr8!T z`lq+9!cI%Obzgerb={pYQO9N7#EVDn-ZDJ93crkl-Ft<2++Fqty}5-xr+CX9`j6lvd3}F9tNJC8|$b3hk~4q%6ndaKF2)m3Ij`~eMn5fbkWT3FiAEwqvnJ;OB|-X z^;jOGwW4WCl=n)Tx1ZS6xIV7^xwGi&#!}nEFXrC*wPLP9e%_-AMgQe(pDyCjayof2 zB;MO$HbdEp#x&vb?E8Ov@)Pg$UOZYJWl}xme0&pol8x!*t^f0LFIYM)XetyrWZ@yR zBKueXgG0)ySsb#*SDFVL|8nY5$W85eKJPZXtlHZ0Vcu*%*5;>veEl;Dj-6279<3@6 zE~d|WoI$15@Zj4IHDW81D#EO)w4W_W{-RiNF2D88?9`{PY&%P(R?fdIwKeca{EFRT z>-850nup!1U^@7B_WLU?rrL}Q2NoR2y`-gbfSqfS-|coz7sh}3GSc=p1V3Hev|$-E NKm>QWzPJMm5&)n!skZ0EGW21^_^0c-s*)qGV0+U?G=Qi<{Pg^0Pcq1$)yPUw7i%252+;befxp2ecKR z>Plk0aBqF#nD?6jY9@=Ux-52dW9A8Xp$%~@(JuQea07&TM87@47(My|9SY4JI+rDv dYH~*%x~(=_8ANda2MUGAHb%GW9)AtX7Zor5G#vl{ diff --git a/fuzzing/frames/corpus/multiple-frames-18 b/fuzzing/frames/corpus/multiple-frames-18 deleted file mode 100644 index e9e4006aae9c0b34ba094c110e8f46970df6424c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmWIK>^!d^E|~4EA)fJ5z+PmD#dkGf6$aUjSC`Zglh5}EZGRtkYx|=#xuxli>UOzXgbM2} z8D04-{qc|g!pU>g-`CEy|8d%=$=E8V>5F#v3qx6zxE<=O^QImM$xE=8J$m z(+P>I|9ndVsu@I1Fn{ySU4LQI0e;C=mo*$62UuA)IQ?_Fe}F-D+FQ$#Uk4cccQgME z`*eUo-Td#h%a0E*Fo|zz&FntFz^-F*QDDXa29`*%hd%!fFo^HG9GaMafPvBW&-;ZE zK>Fq5RXlfqbo&g4-I_r9+WEUFeg_yB8pXf82?Ej?>q>u>0BNSW`MZGf47}{$y10Ne z!;0=l&w#XK-z*t35WnQzr$77HoDTH!Y~Iyuckg9W)a;~&y`>BdnqI3LI5dMA*rfk9 taL(7MThPEH^re9*QKo@$l3?H_@AsZ}lz7<~SzE(5G%|3o=*47<0{}!Hu_gcj diff --git a/fuzzing/frames/corpus/multiple-frames-19 b/fuzzing/frames/corpus/multiple-frames-19 deleted file mode 100644 index 5bcf4fec7ab1451845f603c8baf5e65cf26aaaeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmbO(xHiKC2oP8QH}se7{EAmi<#MoXa&zuzTCpJnmh_e46p_v>xp{o>MkYn`}4e){&xmMJj+ E0C!PNtN;K2 diff --git a/fuzzing/frames/corpus/multiple-frames-2 b/fuzzing/frames/corpus/multiple-frames-2 deleted file mode 100644 index ffcf8bfdb78b5f2fb2b4cfa0ac914da0a0f82250..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmaDZx@N)Mvl+oWZM+SO{zE}X>7Ss7Mz*ODExhr6J6=uP>1-|YUu&YwgNwyibp!ha}W;OTiIzzO5Ac?T|cxh` diff --git a/fuzzing/frames/corpus/multiple-frames-21 b/fuzzing/frames/corpus/multiple-frames-21 deleted file mode 100644 index acc6f8dd6dafcb49bf18347707df62d41caaa742..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 hcmWgVO?>ws0)GAb{zb%4GPQ?6+T*nEV}WbSEC4T{5y1ce diff --git a/fuzzing/frames/corpus/multiple-frames-22 b/fuzzing/frames/corpus/multiple-frames-22 deleted file mode 100644 index 80fe82c7b8b3699dfe4394e5391cd085deabee87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmbQtbZYkP59K~bS7tg1A9){;x6l4e*^%|LkE%uWmmiqZ>5zGuZ{dNcYJo{v7j zQV?lbb-Dfkqrh32`WS_aBpB0^lxC?x2l2R+|&5WPI<16L%#VcI0QRvP;?V9fH?WMXep19}cgjRL-rn{7H z`~U6XvqOg&xEP62#2~ZJXy!KthZOaqo$KfPopG{iuFRpMi8&0J`xs@qBlf5ki-Gszc22n;R|3A-!Z@z1_b3gHDU3iukw&Jw00so6Nb9*m;Ulh7KYFF&V gS5Nyr<(xKlZgB$N&HU diff --git a/fuzzing/frames/corpus/multiple-frames-24 b/fuzzing/frames/corpus/multiple-frames-24 deleted file mode 100644 index 177bf663e992895b85b902ecba3deb48e66be513..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 ncmew)y(NudN7!jo3kDWr4%clg3@QEpp+IU~Ysxg^7ax@XK%Nr} diff --git a/fuzzing/frames/corpus/multiple-frames-3 b/fuzzing/frames/corpus/multiple-frames-3 deleted file mode 100644 index a1ea7e51e1f3f6a4d6f571ae111e181e130ed9ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmbUpQzvR6&9rmlY(|+EO*WOZN!$n z|K#`b#riilZPS{zA*QytYi)RR<&R67`zI^jUbdTC`s1#KI?D#1^D?%tGj7ab?ODp= zZk@d|cMI?BE3wBIcr^b*!P+gCRrs$yep;=>&h_ByOV diff --git a/fuzzing/frames/corpus/multiple-frames-5 b/fuzzing/frames/corpus/multiple-frames-5 deleted file mode 100644 index 0d50411a7676daf6918045a28fc9d4c5efc843bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmV-*0*d_%22f!#HbmTKk21fH<*O8}Z7=|dXBMUvVFjKOAzH5vj{gRTu+J6iVo#J! zGe&wT^{C8y-tY{VGU~UkEM9b2R?PndyI^JNLdIHG{=(l|S(8dJ;K;KWP{uiiTvh)D z;?FAi)Qc75*?2vhGWn(6Q~(T}KCg`b|NsC0|NsBLD+-y&wpaj_su@Q?6k}@u0>0VE`Gz_eY1!9IPb6GeHFU=r|a_H{XxaLeXWwR1)p-UeYVT4Oj--atsi_5)!&b z-^xP33(N{Wx)D9V0pFz0=Z9v%0Kyn!VLHOV1G*%jwXE{M0Od}x?jAhA08f2_(a>+e z00RPPc!)v30064w+DTo&00M?}Y>S$}00AvY8RFl-00A^`qePuR*Fdc+4ig^+7%M9g+!&>76@81hbkav9qnX|& zkp6O@_cn|VmCi=qN%SNx^c;*5_k#dHWE|IXF>kTbuWT$oinFdHxW6^_AXkP+un{)L zv3Ud%qliK7ls4aGJ#lfJJE{k$$^M;JVV^ikHA}sv)?+P3P?2foS1TlV^~3K{X(xcK z7cbfYe72{Qzn$ZVFR$;inXo diff --git a/fuzzing/frames/corpus/multiple-frames-6 b/fuzzing/frames/corpus/multiple-frames-6 deleted file mode 100644 index 6debd4cc4625e6ba750bf520b35f8881bafef133..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmdll@E;1`4B0FWhm^l|557C(>tzeSSn@`V^R@B$%55gj39SAb=5seK0 zzIXX~sj{Upn&uqfcU@i*?xnPWEH#tNpwVFkJAf;op~Wfa!|o zf$W;u2N*aCRpjrlJ;1=oXQrvU_W%QH-0fqJo6k6Jm7n$E<@rtbwNm%^#%PpGT4Hx0NoehTdAlUtMC~ tM271iENEo6g?r7dzST}|blq;h*88*M#;1tHiWADRt8X{?Om9xu3;-$Km^lCd diff --git a/fuzzing/frames/corpus/multiple-frames-8 b/fuzzing/frames/corpus/multiple-frames-8 deleted file mode 100644 index b62d3ea864c24edb8bd77bc317225b2e34b1abb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmX>m$|5JYTtoD!rp*46+k_Yx1ac}Fgp--XtQe%*ooj@4ho2RN$V;7En89uK@B1DA Dj{y;K diff --git a/fuzzing/frames/corpus/multiple-frames-9 b/fuzzing/frames/corpus/multiple-frames-9 deleted file mode 100644 index e3dea7d27d55a66a4afcbb4716e2e1d93d011e05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmXS5;B{n|>eqEGz4n6PyVi{=_I2AMLjS1P_WTJnzOu%k!;gJl;EQC=_PE&QZ0AXK zLRS*B|8rz>h*u{_?5|#3HGl8by)2E|8S~jsui#(gz46`ABd6lBChD&j`40sGEW*AU E0SOc^>OTm.|UyϢǎ \ No newline at end of file diff --git a/fuzzing/frames/corpus/single-frame-10 b/fuzzing/frames/corpus/single-frame-10 deleted file mode 100644 index 6e7e4a7b..00000000 --- a/fuzzing/frames/corpus/single-frame-10 +++ /dev/null @@ -1 +0,0 @@ -W \ No newline at end of file diff --git a/fuzzing/frames/corpus/single-frame-11 b/fuzzing/frames/corpus/single-frame-11 deleted file mode 100644 index 54aa55a3..00000000 --- a/fuzzing/frames/corpus/single-frame-11 +++ /dev/null @@ -1 +0,0 @@ -fLlQ5 \ No newline at end of file diff --git a/fuzzing/frames/corpus/single-frame-12 b/fuzzing/frames/corpus/single-frame-12 deleted file mode 100644 index 9ca1eec6..00000000 --- a/fuzzing/frames/corpus/single-frame-12 +++ /dev/null @@ -1 +0,0 @@ -Mp \ No newline at end of file diff --git a/fuzzing/frames/corpus/single-frame-13 b/fuzzing/frames/corpus/single-frame-13 deleted file mode 100644 index d432b3ee12e547249b0da4f5c37ab9911bd9b524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 Pcmb1TUGYg|IfFU?3@HMi diff --git a/fuzzing/frames/corpus/single-frame-14 b/fuzzing/frames/corpus/single-frame-14 deleted file mode 100644 index 0729a1b1fc0c74452bd6f4030c1e135f7e949fe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmV-v0G9tM1^_^0^=2AH0l}CEot5?jm(s6akI4}WM0>%A0gP=wTsfjZHA!6N3AN5p!S5gBX LAtB*G2&!6F@k=gy diff --git a/fuzzing/frames/corpus/single-frame-15 b/fuzzing/frames/corpus/single-frame-15 deleted file mode 100644 index 33279a57a4999704148f10faffc7270407cd4f90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM<1|c#0Zb3p;e178P&i)V2u;M&2AZUqSPVGb31BSNJBm9CGqd O;?`hf=4EGMWCQ>-MOVN8 diff --git a/fuzzing/frames/fuzz.go b/fuzzing/frames/fuzz.go index adf65d89..1df2c81f 100644 --- a/fuzzing/frames/fuzz.go +++ b/fuzzing/frames/fuzz.go @@ -8,27 +8,34 @@ import ( "github.com/lucas-clemente/quic-go/internal/wire" ) +const version = protocol.VersionTLS + +// PrefixLen is the number of bytes used for configuration +const PrefixLen = 1 + +func toEncLevel(v uint8) protocol.EncryptionLevel { + switch v % 3 { + default: + return protocol.EncryptionInitial + case 1: + return protocol.EncryptionHandshake + case 2: + return protocol.Encryption1RTT + } +} + +// Fuzz fuzzes the QUIC frames. //go:generate go run ./cmd/corpus.go func Fuzz(data []byte) int { - const version = protocol.VersionTLS - - if len(data) < 1 { + if len(data) < PrefixLen { return 0 } + encLevel := toEncLevel(data[0]) + data = data[PrefixLen:] + parser := wire.NewFrameParser(version) parser.SetAckDelayExponent(protocol.DefaultAckDelayExponent) - var encLevel protocol.EncryptionLevel - switch data[0] % 3 { - case 0: - encLevel = protocol.EncryptionInitial - case 1: - encLevel = protocol.EncryptionHandshake - case 2: - encLevel = protocol.Encryption1RTT - } - - data = data[1:] r := bytes.NewReader(data) initialLen := r.Len()