From 0e80828e146a30bc03b60eefbf0d4c3583e243e3 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Mon, 20 Mar 2023 17:00:46 +0100 Subject: [PATCH] fuzz: add a new fuzzer to test TLS certificates (#1901) --- .gitignore | 2 + fuzz/Makefile.am | 23 +++++++-- fuzz/corpus/fuzz_tls_certificate/1 | Bin 0 -> 1407 bytes fuzz/corpus/fuzz_tls_certificate/2 | Bin 0 -> 1774 bytes .../25bb24bf6b2dbe8357e10cd3a38f157c5b154115 | 1 + fuzz/corpus/fuzz_tls_certificate/3 | Bin 0 -> 1262 bytes fuzz/corpus/fuzz_tls_certificate/4 | Bin 0 -> 947 bytes fuzz/corpus/fuzz_tls_certificate/5 | Bin 0 -> 973 bytes fuzz/corpus/fuzz_tls_certificate/6 | Bin 0 -> 985 bytes .../69cbc51f584260bfa23cba82f5fec7ce81237e26 | 1 + fuzz/corpus/fuzz_tls_certificate/7 | Bin 0 -> 1566 bytes .../7cf184f4c67ad58283ecb19349720b0cae756829 | 1 + fuzz/corpus/fuzz_tls_certificate/8 | Bin 0 -> 438 bytes .../85f065f6c019d131ffe4e2bef840af10af47a097 | 1 + fuzz/corpus/fuzz_tls_certificate/9 | Bin 0 -> 759 bytes .../e276406b98ab53e543fe58b5c2aa124f3bda868c | Bin 0 -> 34 bytes .../e414032ad5cb3ae242e73b6f218bc481dcc97a59 | 1 + .../fb77b8f6d4ed7940dc0e2a5af6ec28c7ac81c84c | 1 + fuzz/dictionary_tls_certificate.dict | 8 +++ fuzz/fuzz_tls_certificate.c | 47 ++++++++++++++++++ src/lib/protocols/tls.c | 19 ++++--- 21 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 fuzz/corpus/fuzz_tls_certificate/1 create mode 100644 fuzz/corpus/fuzz_tls_certificate/2 create mode 100644 fuzz/corpus/fuzz_tls_certificate/25bb24bf6b2dbe8357e10cd3a38f157c5b154115 create mode 100644 fuzz/corpus/fuzz_tls_certificate/3 create mode 100644 fuzz/corpus/fuzz_tls_certificate/4 create mode 100644 fuzz/corpus/fuzz_tls_certificate/5 create mode 100644 fuzz/corpus/fuzz_tls_certificate/6 create mode 100644 fuzz/corpus/fuzz_tls_certificate/69cbc51f584260bfa23cba82f5fec7ce81237e26 create mode 100644 fuzz/corpus/fuzz_tls_certificate/7 create mode 100644 fuzz/corpus/fuzz_tls_certificate/7cf184f4c67ad58283ecb19349720b0cae756829 create mode 100644 fuzz/corpus/fuzz_tls_certificate/8 create mode 100644 fuzz/corpus/fuzz_tls_certificate/85f065f6c019d131ffe4e2bef840af10af47a097 create mode 100644 fuzz/corpus/fuzz_tls_certificate/9 create mode 100644 fuzz/corpus/fuzz_tls_certificate/e276406b98ab53e543fe58b5c2aa124f3bda868c create mode 100644 fuzz/corpus/fuzz_tls_certificate/e414032ad5cb3ae242e73b6f218bc481dcc97a59 create mode 100644 fuzz/corpus/fuzz_tls_certificate/fb77b8f6d4ed7940dc0e2a5af6ec28c7ac81c84c create mode 100644 fuzz/dictionary_tls_certificate.dict create mode 100644 fuzz/fuzz_tls_certificate.c diff --git a/.gitignore b/.gitignore index 12f83d067..847a6da77 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ /fuzz/fuzz_ds_ptree /fuzz/fuzz_ds_ahocorasick /fuzz/fuzz_libinjection +/fuzz/fuzz_tls_certificate /fuzz/fuzz_ndpi_reader_alloc_fail_seed_corpus.zip /fuzz/fuzz_ndpi_reader_seed_corpus.zip /fuzz/fuzz_quic_get_crypto_data_seed_corpus.zip @@ -89,6 +90,7 @@ /fuzz/fuzz_ds_ptree_seed_corpus.zip /fuzz/fuzz_ds_ahocorasick_seed_corpus.zip /fuzz/fuzz_libinjection_seed_corpus.zip +/fuzz/fuzz_tls_certificate_seed_corpus.zip /fuzz/fuzz_*.dict /influxdb/Makefile /install-sh diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index 7e4e922ee..08def2ff3 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_quic_get_crypto_data fuzz_config fuzz_community_id fuzz_serialization +bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_quic_get_crypto_data fuzz_config fuzz_community_id fuzz_serialization fuzz_tls_certificate #Alghoritms bin_PROGRAMS += fuzz_alg_bins fuzz_alg_hll fuzz_alg_hw_rsi_outliers_da fuzz_alg_jitter fuzz_alg_ses_des fuzz_alg_crc32_md5 fuzz_alg_bytestream #Data structures @@ -292,7 +292,18 @@ fuzz_libinjection_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ $(fuzz_libinjection_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ - +fuzz_tls_certificate_SOURCES = fuzz_tls_certificate.c fuzz_common_code.c +fuzz_tls_certificate_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) +fuzz_tls_certificate_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS) +fuzz_tls_certificate_LDFLAGS = $(LIBS) +if HAS_FUZZLDFLAGS +fuzz_tls_certificate_CFLAGS += $(LIB_FUZZING_ENGINE) +fuzz_tls_certificate_LDFLAGS += $(LIB_FUZZING_ENGINE) +endif +# force usage of CXX for linker +fuzz_tls_certificate_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_tls_certificate_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ # required for Google oss-fuzz # see https://github.com/google/oss-fuzz/tree/master/projects/ndpi @@ -389,8 +400,12 @@ files_corpus_fuzz_libinjection := $(wildcard corpus/fuzz_libinjection/*) fuzz_libinjection_seed_corpus.zip: $(files_corpus_fuzz_libinjection) zip -j fuzz_libinjection_seed_corpus.zip $(files_corpus_fuzz_libinjection) +files_corpus_fuzz_tls_certificate := $(wildcard corpus/fuzz_tls_certificate/*) -corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip fuzz_serialization_seed_corpus.zip fuzz_ds_ptree_seed_corpus.zip fuzz_alg_crc32_md5_seed_corpus.zip fuzz_alg_bytestream_seed_corpus.zip fuzz_libinjection_seed_corpus.zip +fuzz_tls_certificate_seed_corpus.zip: $(files_corpus_fuzz_tls_certificate) + zip -j fuzz_tls_certificate_seed_corpus.zip $(files_corpus_fuzz_tls_certificate) + +corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip fuzz_serialization_seed_corpus.zip fuzz_ds_ptree_seed_corpus.zip fuzz_alg_crc32_md5_seed_corpus.zip fuzz_alg_bytestream_seed_corpus.zip fuzz_libinjection_seed_corpus.zip fuzz_tls_certificate_seed_corpus.zip #Create dictionaries exactly as expected by oss-fuzz. #This way, if we need to change/update/add something, @@ -399,6 +414,7 @@ dictionaries: cp dictionary.dict fuzz_ndpi_reader.dict cp dictionary.dict fuzz_ndpi_reader_alloc_fail.dict cp dictionary.dict fuzz_process_packet.dict + cp dictionary_tls_certificate.dict fuzz_tls_certificate.dict distdir: find . -type d | xargs -I'{}' mkdir -p '$(distdir)/{}' @@ -413,6 +429,7 @@ distdir: -o -path './corpus/fuzz_serialization/*' \ -o -path './corpus/fuzz_community_id/*' \ -o -path './corpus/fuzz_libinjection/*' \ + -o -path './corpus/fuzz_tls_certificate/*' \ -o -path './corpus/fuzz_alg_ses_des/*' \ -o -path './corpus/fuzz_alg_bins/*' \ -o -path './corpus/fuzz_alg_hll/*' \ diff --git a/fuzz/corpus/fuzz_tls_certificate/1 b/fuzz/corpus/fuzz_tls_certificate/1 new file mode 100644 index 0000000000000000000000000000000000000000..12dfe718c0610838be86133ebbd223c6ac9c9849 GIT binary patch literal 1407 zcmXqLVy!l4VoqMb%*4pVBy7dNz+K8)_~592m+v|TAmA=F;AP{~YV&CO&dbQi&B|a9 zV#sa4$;KSY!Y0fV6ly4DAOhlW3G;d<78j%z6=zo}_#`G7>KbT+#F>RvP{b7iN|SOj zlNEwfi^?*SQ;QWse1a969S!8fc?~TM4U9|;EDVi}OrpejjSPWY6DZf95Y<+GpsRqU za|pBf<`*aDmm5L_*x>>~1_BUwal-9~8Nn^g2EuIYK%bwpWnyIG05g~w*_oXfSOTB6tY5|<*RNw?<#lkcufQ#CiJIo^VV`HM zd%~(#zkcO*{Xd@n-}VJ}uFhZ!_*782@3xG1%y9vx9B1A+sh{4STHM6=$)Jhx9nb>i zP+3(L9s@2m4sA9@R#tXqMgu_@n^A&=)c_bTtOnK~b%HD=21ZRdT-zj}rH8{GAaBa@ zv52vVoO5MX=s3Da$L^J2?G*>H&2bGm-~(67gvTj~nTbR=rNn>_ zX#M6w>x~I#0``>0Vz? z=L@z^I3(Ww@BudyV+s?axPdf6Hx~<^0cymeW+dh&CPoGc_AO@~KYDuFrTRo>>Ql!+ zP3{G!XMJmNaos%ipy(pwuHJTL!$+bFPGLSV@|?w~xqVTKWjWmfrk|)cpY=TN?Vf*z zC4%p)B5!Zdb}cOV5*L=%@#dQG%zuXt9xhFIuryZI{lT6;O3(UR_)Xg;8+W7J<)|9!aT;E#q+9~_GW{#<)G^}^pzuXlfY z^;-RFZi3#9!d(XYwB?r-{D^zN$#RQ%(osj*T`nhI%{dWtO0wh6v?u-oPbB36?EHMw z`6euHykN((L#vlf%Rj5;OH2HDE0XMf!GNSo61I-^=wC*u5lIdOAeo}j8sM&^VXSCErA1=x~p)ORuV{7}Z zFYm3AZx<Xyy5s;$$wp3s&Yg zj<@wckGFjO^wjY@gYWCT#V;K{boui+wyFbfOTS*ydhx)HuUcMtqksLL3A4nM-1zIm Ggp~oY-}Joz literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/2 b/fuzz/corpus/fuzz_tls_certificate/2 new file mode 100644 index 0000000000000000000000000000000000000000..50f796c7ba1ba311ae1daf4f975d81c0f2334cf7 GIT binary patch literal 1774 zcmb7EX;4#F6n^jJC4q$1C<3Ac1za0$f)g2x4NGkfe3Ky~^J_(JO#b+Sv~bN&3sQKH7JNFia&vz@JG4`XoXSN}?e_Jmwrg z!wm|}fGdg+d4$Ev>An&nb17Jiy9qSgTYcnHLzaA~YWBw(6>*|?KTGvo;*bgx)} zL@0_AN|~0xd@?&z58S5v%fckwO+5OB4IWH$U^bbeai}zsA;nHYC2G8tlT7aJ8X2og-m$+sz4pn@RO-m?ubwqG?{^%@ z8NaC8e42UqBIOwM>t3b$y;vMRItWMcN*@)MmtIQ>SkfBW{h=lMV8{3BN|x_;55_9q zYcFIEbEQqujCe|1^lV>)o?iUGg-W zjVF`i%d6eDW=fZ-?Go2jG7^Tu8is?FZ7PLd%g`beo$I{bx|zGWDDTCrTtSrFzo4gG zWn%J1JMYe(e(E?GA;1t^sv(>J8bTqk#=1Cv5sI}ld3JSFN%v`8YGy)rWxMgwOSg_F zYX`u59AJc+p|j~-e9KWgx3S_^eIZ>gqnje_TWLUj3qLnS)jt9CRn5O2BMr@!Ek)8y z?CG!tGzLvAL}P`&TDTxuBu_bEA*N;Um%j{qJ>oC3ly8Uv)jcFG2@*8CGu zDvXm&V*>BbC`7wvs&)Zhblfzc!+)1A2L^chG`#l+z;#L_QLvVya9aX`BB*)@Rrf=^ zkP`AL4|=H>$)SU)k_^#6f1>FMj{N$#Z_U25ePgnTXm1FDRj#vsFoPhJ0C@vX#0Gl8 zbz`?zE^C$T%;xVM>@dw)sZx}1VrnmtFNYk+y`PTIspo}cOPb%Yy~*wlFB{&!@=HAw z%%x;n4Bk6cqhvj9gH+H$Pfzl;AlohZ?k633-$iSmF0vP%uk%X^{v~C*q|+FgjC&sY z-&kB9;DyDV@ZH$y=o5dP%inGE7|t+Y6p#k3Bqi&&)N$KF zySi^Zm2J&d3*K%&Ty&^Kk8}0HgB0E1kC}U}c-*NU%2?6JFj{^NIh9^FVcdfrIb(gz z$JTp)bqA&Mxn4z`fL~FV6q;B1!lhH`(!ga@lG6)55L5E)EtgpJb@6`>sgIC9*uCIP zx6ZpUOQ9syN;#zmGaU}CYgXLLnt1BhH7@EWuWx^|lWwc~qijbG%hN5(-^Q&Yf8^mj i%1xv2k)rzco)cP2{eas8vtlleJ+nAk)%&8Rg!T{Du5OnA literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/25bb24bf6b2dbe8357e10cd3a38f157c5b154115 b/fuzz/corpus/fuzz_tls_certificate/25bb24bf6b2dbe8357e10cd3a38f157c5b154115 new file mode 100644 index 000000000..ef9d8b0e7 --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/25bb24bf6b2dbe8357e10cd3a38f157c5b154115 @@ -0,0 +1 @@ +‚Hü \ No newline at end of file diff --git a/fuzz/corpus/fuzz_tls_certificate/3 b/fuzz/corpus/fuzz_tls_certificate/3 new file mode 100644 index 0000000000000000000000000000000000000000..608f16c792172d34c2fe19cb77905975a6582521 GIT binary patch literal 1262 zcmXqLVtHlI#C&N1GZP~dlK__~$JH23ZN}OkYf}&Ke}7`Y%f_kI=F#?@mywa1mBAp< zklTQhjX9KsO_(V(*ih6!7{uWc=5fhP&vZ^LDpByvOE#1=5C;i!3k#H&m+PefrILYC zddc~@h6)C9ASq^HakvimocyH39EG6#{1OFcM*}%=ULykoOCu8lFo+W8H3o5wjf_n# zO)aAg{E2dcrhz)d9tF5PAwIzhLBWm+!5)rAre+F821W)z`wR`57?qH{$;isU+{DPw z02Jq9YGPz$IOx4O)xBWPUH^#NZ|1x`oc2`SP&j0*SDKr=4%eF$_NRJx?(F1Jczgfx zkqh%?t*nx5>Ub&`c3WaTe)I13Q>x6>vw|Gc1QPtig*`vK zFi&s3|NOFdx{p%evip291>S}SmZ&|dJ$@=lPguHMxkEKL|DZ_(LwC#nAN!U^cq&y- zTf3-Zw&qupEj)Z5jMYL{GDac%m&!zn*coeN$Rwx>e8&y!hm-EU9-C89geeTtC`&&{q} zuDwWIL3ry0TZhYv2JDkx&HT#5%*epFxQTHcFho`v$O3~^mXAe@MPz&SqE{MxHWR3-N|ry9)=GusmG+ z`l#o@zZXy5?^!>^RmV+hak8bt&v{-dQyfpMy!mKO2rJv^7@2(x()=r;{!8voJubFh zG3;(4>&ch>Gs^B~OJ6AB3D{|%S+zeQQXoy(N_UN@V2-Xb50f3M^}nYJ=RE4V-G1Hc zMci`_w%4nLW_?=UayYu#Yi48fYKDcUxNLkDsdj29Eno84*eAM2Pl{*LYs|GFwvR=t|su**2LYR|&*m-U$<+zj^R flQ#NB7q@c>Uzl^^leeXRP>bg>p9y~Q-?sn&!lt^k literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/4 b/fuzz/corpus/fuzz_tls_certificate/4 new file mode 100644 index 0000000000000000000000000000000000000000..2f1e5523af47d44e35ea27be89e25a663ea7f99f GIT binary patch literal 947 zcmXqLVqS01#58>YGZP~dlK_YHgRlusZW|YtW}S?jc-+f?myJ`a&7D}zCz zA-4f18*?ZNn=n&ou%W1dFo?q?%;S=op6Q%gRHERSmux6$APy4d78WQkFV{-}N+koO z^pf*)4HXRJKvK-Y;&2`AIr&M6ISN7f`6UX@js|k#yar~5hK2?Z5GBrQ4CKMN^l(BG zqY|>m8Ce;an;7{S44N3Zn3@dd`IJs!)JE3#aq8T|A z&M;11?q{$)_`CCwOos5ek9w8vwzD}fG;*FhC*8dN{#olnw@25~jV;t*_#-WJ|60ik06Z{$usNcN*7A>Z>YdMz&_;#V8wj@Ao_KA}aTB!TxfA z{eKw0wccFeA`oG;vQ*;g#YOwvAE{@3nPvRLlOv(~O8ge9mi-G?dHK}Zo%fH=DT`a+ zZ9Z|{9i?Zv=R~CXvQGayyICYf{CKqHJfr=e-u=4F?Q~`Jc1NRIJXhZTXuP_+H^P3a z^b1doMFqDES?+${B=*UN%a47$hjQ?3! zfC;G0fFHyc2Ju-9n1PgmEJ%QlMT|v+`Cfo&*hQb+X&)9pl9oO^eUt6QPy>08v@(l? zfmj1}1*qu{7!8aJr{|cj@(>o{`gPZ3j(^aGFZb86e66hHSga!P$6LGQfbPz#$Nzmf zC?9cpNA8@elIJrtR|{@^T(Dr_S)Y!XlY1r>JX*~!vv2as|H)UMuqRwzynk*q=f|sk zkAuJTCI7NtetS#W{iL*O7xNr@Kk06LRqi!^Zp0()$O8__Z*?`AT67HFks3>ujWo?Cxj#WeU z^4IG{MPAb-4oIsket75QefOHJTU0n$4c_SP<=*eQKVav| c&#z}N3avfSacqW3d@q;Hv6ok;PR+ds0Q5R4EPOUbNw(q=*jNGgY28|00xeYkkm_u3EgqcEv z4TTK^K^zWYF6YFY%(VQXyv#&HAp-%BAiFSUaA{s%Wm#fQs-d6(KS+#An8PiwJ4s}LW2IeM4eg=ak zMlPl%Mn;AslX4%Nettnp_?vXaI(>cNHeZ1~=RP=chMsqANxPz?uv#<8_q4zgRyV#QT5GLZ>TdU>Z2GDx z(fRoL?N9qIJXP0s+ANV3Ggan!Q0Vd6tw|LZ=W*J^g-y|LSZl+dl=>q^FvRbR)1eylb3!ke5a;dmTQgoO1t?F7}}>L)-QM+|M-?5 z-_vPVAMgH_y|y;vz#&b;VkTxr2FAs_29R_pE6l=Vz@|? z`T2Xc&_>+@rJ_z#B`X_FJ=gpr?;dKRAslyodi?6AktWqQXU?-0)#Lm1X?|Qz#v;{A z_Ywu3#;jL(wfGWKu`!px3}&@Ed)Un7MJ0L_ga0jlrc|1sv}emE5szux8D_qBxHD&| zhVa$hRf{ApS#d79GC|jMz0}_6IZ1*krhb-cFXswgQItIBXL|cYsQ4sZ?~^fX5=%;t zKHhesT#Juwac}OQsg5svZaW`J%s9Kh*WoVDEw&YpotIP!9^f&J-D*8gvO>%EIe(r^ z-?_rwIwg;<2F}ZRdHd$|C9k)d_2h+T-pR;cXcW$y;W+){d%;Zgh^KL(|C2flncig^ F004X*UU2{b literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/6 b/fuzz/corpus/fuzz_tls_certificate/6 new file mode 100644 index 0000000000000000000000000000000000000000..adf9d557ea12e67b0ef04165310259ee5f7ecc53 GIT binary patch literal 985 zcmXqLV!mq7#I$z-GZP~d6DPy1Z)RJZuPp60;AP{~YV&CO&dbQi&B|cVxWJIxfRl|m zl!Z;0DKywn*gz1(;SlC>PRz+n%P-2yOf(cS5C93X3v&jS=H*qECFZ0W3L5Z(#JGex z-13V`GV@YP4CM@DKtkNYqRy#6p|s58#FA76$I_CF{G!Z~N<#qyK9D@KFne)nK><*g zp|XJ@+&P?#Vj@s+2cW%RBlVK=a}DIgc@0es%ni+qjEqf;Eu+MFjV%le4K1PEq2Prk zMkVBcXJlnyZerwTFlb`rVrpV!WVm7-SbV`$Na)02zeq=qi`EA>EW66ztf<*tvH$g9 zm$}E%nr6LYkzX)>^@Fn&M{_Ql+}&liDL3eKgr{fo%=%}~w!OIBl)NRq@Jh@n{q@@m zjM@WCYYtB6xL_iwyK-UUX3w|3zl6Seu<23wvH5!I4LzCjGV|8Bf2~`0EqKj?TTR9b zCd+-z{L!^6C3{X-Vt~(y+B!uO{ag;wUasft_S~iCuYB9WZF+k5YPG&wUzY6=?>acC z)6%fnzui}P+oRiGR!?BGWB+WKv@-tMug1l?*LQty)z~Q|)G~ELv&3$n+)Hz&UVCxm zLO}Y=kG8_D-g(`n?_zhzD=$1Z@!$>pueS|7b*p8QnV15;{mR2@9rA9rBBK-Qu;Lc z^W7T(nGUHBdxXDE4-spSJMrT{M})#-{h++7>@_0VR~Dz;{IVj^_{WQnGc%s6=g*nE z?q%v0@98J_b_!HkIeK*5s@W90**s#}m$!1>ise_BwAA0p7&E^PjcGKWoTDVA$mnrNV0UW7 bl+u-a$Ni_+ZVfuL{#V}|$0L(^cC-Tkc6fJ% literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/69cbc51f584260bfa23cba82f5fec7ce81237e26 b/fuzz/corpus/fuzz_tls_certificate/69cbc51f584260bfa23cba82f5fec7ce81237e26 new file mode 100644 index 000000000..f86eba04a --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/69cbc51f584260bfa23cba82f5fec7ce81237e26 @@ -0,0 +1 @@ +‚²0‚‚²0 \ No newline at end of file diff --git a/fuzz/corpus/fuzz_tls_certificate/7 b/fuzz/corpus/fuzz_tls_certificate/7 new file mode 100644 index 0000000000000000000000000000000000000000..70128a98d5f543dd87f664bfbc1be4cb0dddb898 GIT binary patch literal 1566 zcmXqLVv{mxVr5#u%*4pVB*0w$_Rg;#`%HEz+tg^!GORb?W#iOp^Jx3d%gD&h%3x4n z$Zf#M#vIDRCd?EXY$$3V4B~JJ^SETDXF8`Al_+@TB^yc_h=YW=g$2sX%k@%#QprFm zz2y8{Lwy5XkQB498eB)Phog~#M`n74f@5)UX;ETca;idbYEfBgk%F_Mft)z6k)Z() zK|mCkYYG%GHnlXhj55eXb&;@vAjo_UVJ_#yoXoWRqP)yRL#QCTFqdy?UQWJ3Kw?q0 zp}2u4#O-`;iOH!+`T5y8Ajj*$B$#>lwDi)TQXsb*L;`)w4h)TRwoHs{9AE}BBRjJb z1B-JLOX{q)#Qfm>9t*p=>dW?Be9>vNWt8;~Oxx zNkDbxCl?o>IL5#iu8OJ65#~`~!YnE&Mp38_%Tk~m1i z-hZD*UxE9K-^Y~43=E9ry=~iS7#LWX89WT!m=qZ%Ef2rJuJSzVure#}i}YQI62^Lh z4k9Q2Z)3f`IdodbMWB+kC43q;)Gv9)6JY`edvv0@wPC+f+fn@Rdh}A4TDg37m%^%2j zo4r{Q$-Ja-)oo^*57+y8GasqE0a|=zS^1e6zh3rqrBBbQjpWdO^2}aHv?a~NH%V`) z_RSZ`Xhj`!6C)!-*604UE@kT$*EfU(+A&-6R_i$=KQQy(bx|O1%H<}eb%I~dZ#-Jr z+x(P6@Zq!VxqjOXs=bbJ8U8PryZFNti^_{0oq3lf9#89SdCS|iPB*AvxAPh2^*?r% zIWJT-S)+0@J1y+V+dt*6X7$-m-B#*dHAj5ej_WbJ1$-;##+NgHdm1HaX!D1E($h-& z&#ZBt71vH{i>QbTTo&K$ptbJ4(!^JV%{%UOs{GJl@QgSdp6vgKLg5G=wi;B;SYxP&|>EW8M;vuA|(#$R~FZOGv YGPnBc)w~}g6r2OUIz5Q1E9UtK0K#YxdjJ3c literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/7cf184f4c67ad58283ecb19349720b0cae756829 b/fuzz/corpus/fuzz_tls_certificate/7cf184f4c67ad58283ecb19349720b0cae756829 new file mode 100644 index 000000000..8ac2eb508 --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/7cf184f4c67ad58283ecb19349720b0cae756829 @@ -0,0 +1 @@ +H \ No newline at end of file diff --git a/fuzz/corpus/fuzz_tls_certificate/8 b/fuzz/corpus/fuzz_tls_certificate/8 new file mode 100644 index 0000000000000000000000000000000000000000..2a79b4f40c41e609e46f18d315440f838acd107d GIT binary patch literal 438 zcmXqLV%%iV#3;RhnTe5siIbtfV__U4qx~8KUN%mxHjlRNyo`+8tPBRyhLQ&2Y|No7 z%sc`S$;&3{s2$;k`vd(~yHIP=F>@_OO<Q zJk$M&#?M2AesNrkyW0+)`uZ#@GP+S=mS`8B(zJE?nSVM@_Dj_W#y|caWb--UB12uB z^Rx3JduAu4{pCMtk|D=GdEwSme6P=MpKD$@K_@pMGT4^gWnJ}4CT2zkMr7v!gMu08 zuBvy(+H51YZnVmO!g0oa{>1yNrdh#Xcc{penk;r`j`{M{;!dGw9Zz|y@ZR%28uILA ze>LY#niwUhq^_j;Auy|6V1l^F?8@ZEA9g(bo*9k}N4DJjU%lq)_VtB{`dUr4nnJga jDV(^?^*cjRKr5v|MA_El)0NYkUm2b=T+5}&Bybb}D!`$E literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/85f065f6c019d131ffe4e2bef840af10af47a097 b/fuzz/corpus/fuzz_tls_certificate/85f065f6c019d131ffe4e2bef840af10af47a097 new file mode 100644 index 000000000..4065fd518 --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/85f065f6c019d131ffe4e2bef840af10af47a097 @@ -0,0 +1 @@ +‚Hü, \ No newline at end of file diff --git a/fuzz/corpus/fuzz_tls_certificate/9 b/fuzz/corpus/fuzz_tls_certificate/9 new file mode 100644 index 0000000000000000000000000000000000000000..10226095724c51e8c0bd8931ad7e0663d676a52d GIT binary patch literal 759 zcmXqLV)|^*#1ylDnTe5!iHk-5;}*4lzfK1pHQ;6A)N1o+`_9YA$jZuK5M{`1z{$oO z%EBhh6dG(OY#<2Ya0zoc78K;9DtP84>lum~2!jN~OA z*zWtj$qRzLWsdEh)#d*8{w0r+FA=hQGYN}GHZ`mAYNJ|TvA~Vx zK7A$N*pTI85n~aV+`W9^REN|PMcpf2|MPg3VAQa6k^v7$zc3@?e-s>_UGJJ#|! z!GTQvmp6Z%60~IVs%bZzckHk_b^Mi^b7T4361JL7rtIh4GyLS(w5;6!OljD_{b6=T fmgMnw92LE(l@o6*E6bm?^5zABLwCOHFo^^J5xeq} literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/e276406b98ab53e543fe58b5c2aa124f3bda868c b/fuzz/corpus/fuzz_tls_certificate/e276406b98ab53e543fe58b5c2aa124f3bda868c new file mode 100644 index 0000000000000000000000000000000000000000..525fb161218176678c0235c0c4e23b52d946fef8 GIT binary patch literal 34 ocmXqLV%%iV#0W&245Sw@GchtSaWeFGER17hv|nSu+r-8Q0GbsDLjV8( literal 0 HcmV?d00001 diff --git a/fuzz/corpus/fuzz_tls_certificate/e414032ad5cb3ae242e73b6f218bc481dcc97a59 b/fuzz/corpus/fuzz_tls_certificate/e414032ad5cb3ae242e73b6f218bc481dcc97a59 new file mode 100644 index 000000000..64ce7694d --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/e414032ad5cb3ae242e73b6f218bc481dcc97a59 @@ -0,0 +1 @@ +0‚²0‚‚²00  \ No newline at end of file diff --git a/fuzz/corpus/fuzz_tls_certificate/fb77b8f6d4ed7940dc0e2a5af6ec28c7ac81c84c b/fuzz/corpus/fuzz_tls_certificate/fb77b8f6d4ed7940dc0e2a5af6ec28c7ac81c84c new file mode 100644 index 000000000..2ba85439e --- /dev/null +++ b/fuzz/corpus/fuzz_tls_certificate/fb77b8f6d4ed7940dc0e2a5af6ec28c7ac81c84c @@ -0,0 +1 @@ +Hü \ No newline at end of file diff --git a/fuzz/dictionary_tls_certificate.dict b/fuzz/dictionary_tls_certificate.dict new file mode 100644 index 000000000..cb363dc8a --- /dev/null +++ b/fuzz/dictionary_tls_certificate.dict @@ -0,0 +1,8 @@ +"\x55\x04\x03" +"\x55\x04\x06" +"\x55\x04\x07" +"\x55\x04\x08" +"\x55\x04\x0A" +"\x55\x04\x0B" +"\x30\x1E\x17" +"\x55\x1D\x11" diff --git a/fuzz/fuzz_tls_certificate.c b/fuzz/fuzz_tls_certificate.c new file mode 100644 index 000000000..bcbdd0e60 --- /dev/null +++ b/fuzz/fuzz_tls_certificate.c @@ -0,0 +1,47 @@ +#define NDPI_LIB_COMPILATION + +#include "ndpi_api.h" +#include "fuzz_common_code.h" + +#include +#include + +extern void processCertificateElements(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + u_int16_t p_offset, u_int16_t certificate_len); +struct ndpi_tcphdr tcph; +struct ndpi_iphdr iph; +struct ndpi_ipv6hdr iphv6; + +struct ndpi_detection_module_struct *ndpi_struct = NULL; +struct ndpi_flow_struct *ndpi_flow = NULL; + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + struct ndpi_packet_struct *packet; + int is_ipv6; + + if (ndpi_struct == NULL) { + fuzz_init_detection_module(&ndpi_struct); + ndpi_flow = ndpi_calloc(1, sizeof(struct ndpi_flow_struct)); + } + + if(size == 0) + return -1; + + packet = &ndpi_struct->packet; + packet->payload = data; + packet->payload_packet_len = size; + is_ipv6 = data[size - 1] % 5 ? 1 : 0; /* "Random" ipv4 vs ipv6 */ + packet->iphv6 = is_ipv6 ? &iphv6 : NULL; + packet->iph = is_ipv6 ? NULL : &iph; + packet->tcp = &tcph; + + memset(ndpi_flow, 0, sizeof(struct ndpi_flow_struct)); + strcpy(ndpi_flow->host_server_name, "doh.opendns.com"); + ndpi_flow->detected_protocol_stack[0] = NDPI_PROTOCOL_TLS; + + processCertificateElements(ndpi_struct, ndpi_flow, 0, size); + ndpi_free_flow_data(ndpi_flow); + + return 0; +} diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 6b56529dd..c78f01876 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -247,7 +247,7 @@ static int extractRDNSequence(struct ndpi_packet_struct *packet, char *rdnSeqBuf, u_int *rdnSeqBuf_offset, u_int rdnSeqBuf_len, const char *label) { - u_int8_t str_len = packet->payload[offset+4], is_printable = 1; + u_int8_t str_len, is_printable = 1; char *str; u_int len; @@ -258,6 +258,10 @@ static int extractRDNSequence(struct ndpi_packet_struct *packet, #endif return -1; } + if((offset+4) >= packet->payload_packet_len) + return(-1); + + str_len = packet->payload[offset+4]; // packet is truncated... further inspection is not needed if((offset+4+str_len) >= packet->payload_packet_len) @@ -356,9 +360,9 @@ static void checkTLSSubprotocol(struct ndpi_detection_module_struct *ndpi_struct /* **************************************** */ /* See https://blog.catchpoint.com/2017/05/12/dissecting-tls-using-wireshark/ */ -static void processCertificateElements(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow, - u_int16_t p_offset, u_int16_t certificate_len) { +void processCertificateElements(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + u_int16_t p_offset, u_int16_t certificate_len) { struct ndpi_packet_struct *packet = &ndpi_struct->packet; u_int16_t num_found = 0, i; char buffer[64] = { '\0' }, rdnSeqBuf[2048]; @@ -427,7 +431,6 @@ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi #endif } else if((packet->payload[i] == 0x30) && (packet->payload[i+1] == 0x1e) && (packet->payload[i+2] == 0x17)) { /* Certificate Validity */ - u_int8_t len = packet->payload[i+3]; u_int offset = i+4; if(num_found == 0) { @@ -450,8 +453,10 @@ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi rdn_len = 0; /* Reset buffer */ } - if((offset+len) < packet->payload_packet_len) { + if(i + 3 < certificate_len && + (offset+packet->payload[i+3]) < packet->payload_packet_len) { char utcDate[32]; + u_int8_t len = packet->payload[i+3]; #ifdef DEBUG_TLS u_int j; @@ -568,7 +573,7 @@ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi i += 3 /* skip the initial patten 55 1D 11 */; /* skip the first type, 0x04 == BIT STRING, and jump to it's length */ - if(packet->payload[i] == 0x04) i++; else i += 4; /* 4 bytes, with the last byte set to 04 */ + if(i < packet->payload_packet_len && packet->payload[i] == 0x04) i++; else i += 4; /* 4 bytes, with the last byte set to 04 */ if(i < packet->payload_packet_len) { i += (packet->payload[i] & 0x80) ? (packet->payload[i] & 0x7F) : 0; /* skip BIT STRING length */