From 03ecb026ff4d0e545cf21d463807b40265441bb3 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Fri, 9 Feb 2024 19:19:03 +0100 Subject: [PATCH] fuzz: improve fuzzing coverage (#2309) --- .gitignore | 1 - fuzz/Makefile.am | 9 ++----- .../05b662515f000d83deb96ffc4583991d649cd5aa | Bin 1413 -> 0 bytes .../05deb1919325611cef82cdbb9a9cae2e079a35e7 | Bin 1026 -> 0 bytes .../0696e1fef974d3020398c0645c7f5dd946898729 | Bin 1024 -> 0 bytes .../111657ab9fedcc5017d6df1970230b5dddd2d981 | Bin 1024 -> 0 bytes .../17557d4ba17829b390c3de69535bf6ccfa2d5642 | Bin 1026 -> 0 bytes .../239ec011fcc8cc26627acc3714c8faf52c5e0903 | Bin 1024 -> 0 bytes .../241b26ca01fa5bbb08b23913607309f5063017bd | Bin 1024 -> 0 bytes .../24cf5c21b413b0e45721eb80edc898cf6e5f95dd | Bin 1024 -> 0 bytes .../274042194cc72a3f82a114918e3abdb5bd658add | Bin 1025 -> 0 bytes .../2cf61acbd07ae5eae2549cedfbe05bf42bd595f7 | Bin 1024 -> 0 bytes .../32c0c554c558ebedb342d3e70e1f023387d578c9 | Bin 1027 -> 0 bytes .../370f2d854e17f91097c19f2f4a1f8aa66a598105 | Bin 1024 -> 0 bytes .../3fe5295ad34640228ce7dec8a120488f0b5df5ce | Bin 1026 -> 0 bytes .../435d25dd83ae22d85ac4b2b4b100fca324c65e3d | Bin 1024 -> 0 bytes .../4977a67459382d8300d75b71b54b4ce1f40f4f09 | Bin 1032 -> 0 bytes .../4ae33f6357a1804090501f11e27d58461df9253c | Bin 1024 -> 0 bytes .../4b77c547b98ceecc57e134d52f4692a1720e3ee1 | Bin 1024 -> 0 bytes .../4f62be7d61b679a0d916b2059854de5b9cb38dea | Bin 1027 -> 0 bytes .../51b2a0ef859f67c0dca37efea91b2a2e4ddc520c | Bin 1027 -> 0 bytes .../53458e81c4f84d7b35213d40fd1a8b1cb1abc812 | Bin 1024 -> 0 bytes .../583d48c2482fd1679a98c1748b31d07a87f06b55 | Bin 1024 -> 0 bytes .../5da0471be3750ec4c44275e10344d7498c753312 | Bin 1024 -> 0 bytes .../602f5edc05570fddabd77bccfb5c73d7cee95250 | Bin 1024 -> 0 bytes .../6f52f1152b96f39858decee18afa95914a754344 | Bin 1024 -> 0 bytes .../75a68982c7fd83542649a050e52298381666bcc8 | Bin 1024 -> 0 bytes .../839ae313f042b2b2dd388634a5362c08f755f030 | Bin 1024 -> 0 bytes .../83df4b8639a2acdee98fb7a71bbc089316687b77 | Bin 1037 -> 0 bytes .../867d3eef3c25cacaff5080853ba1f8ddad3e3cbf | Bin 1024 -> 0 bytes .../90cf625aeb7846a5e9d860a9e920afb3e8657899 | Bin 1024 -> 0 bytes .../90e013b209b0881e82bce7501cbf06928c6639c7 | Bin 1024 -> 0 bytes .../9435e886552b98fa38c2e89e07392d8048d6649f | Bin 1031 -> 0 bytes .../963a99817279211d121c533b803a64de91c85af0 | Bin 1031 -> 0 bytes .../99e376668c01c6a56bd1689e5d8664587c4fee28 | Bin 1025 -> 0 bytes .../9c8e942b24add8ad2e15186bc5de91464c8b3a1b | Bin 1413 -> 0 bytes .../a5d92fddf545081b06db2a55c860d89087c3ce65 | Bin 1024 -> 0 bytes .../a80d8aae221736aa612f8a82b202f5fce0eb9500 | Bin 1031 -> 0 bytes .../aa5f590b2f8ae90f488320a5c0ce1664b6250141 | Bin 1041 -> 0 bytes .../adc80cc99b35d6e8df1f170f2a13c6bcd6d398a1 | Bin 1024 -> 0 bytes .../ae84c8f1709ff8fcefae24ebc14ffbfeebca84a8 | Bin 1024 -> 0 bytes .../b410f65cc307e42ab5966239c11439da11c0ddb4 | Bin 1024 -> 0 bytes .../b6326b0500fa509026c488db8451367ad82a737d | Bin 1042 -> 0 bytes .../b6db31b2248aeba214a6850c0702de7388ea1c24 | Bin 1024 -> 0 bytes .../baee897444cc1c2da1ebc5669aaad8a0674bf5ec | Bin 1025 -> 0 bytes .../bb0687290c9a2fcc54a22495eebc3ffe8c62fcd4 | Bin 1024 -> 0 bytes .../bfa39a45c0fbd5ef61d95ec1481854884d6a1c83 | Bin 1024 -> 0 bytes .../c25d912a45389932e11154603810b3636bd076d3 | Bin 1024 -> 0 bytes .../c75804765207820234ad3053f61007ab0e4445b4 | Bin 1024 -> 0 bytes .../c825bf09aa976e7d4d67598407a3a4f8e83c6345 | Bin 1024 -> 0 bytes .../c9b65a60fd06d4de01b8f5b83a893200073769e0 | Bin 1440 -> 0 bytes .../cd7b984e87d4fce2d267888a3253c8aaad264af3 | Bin 1024 -> 0 bytes .../ce005e480b643e822d3b99b2a21f6e6a6f448859 | Bin 1024 -> 0 bytes .../cf29845e403bee085bda2d928f49673742592e17 | Bin 1024 -> 0 bytes .../d1b8769985ac73bd8298231fb4a6e5ed5565cf9e | Bin 1024 -> 0 bytes .../d4a8a0f375b984f26f41917103584c9917217043 | Bin 1025 -> 0 bytes .../d5b7e460b128cc07b7dbe2f845e8692370f9e2ef | Bin 1024 -> 0 bytes .../d821fc593a86796b420f93296017c7cb0175dd8d | Bin 1024 -> 0 bytes .../dc720efbe4f824c52dd03cf9c06c71f9cd64e500 | Bin 1026 -> 0 bytes .../e165cf4a81fe3d993948f049fb41a300c8286598 | Bin 1024 -> 0 bytes .../e67f707ba8191170abba4703bb4f4192a0958939 | Bin 1024 -> 0 bytes .../e6e0376286b8df6332e56dc8757af060da95dd6a | Bin 1025 -> 0 bytes .../f0ba5409fa8e20e3220a2d12c9d9fe39cd2818d9 | Bin 1024 -> 0 bytes .../f18edcec12f7c8b5e1de7a43f3cb818677164e49 | Bin 1030 -> 0 bytes .../f3259e536d2e75e24770e3afabf98a70a2e08932 | Bin 1024 -> 0 bytes .../f4318383dfd035c660f6454b98e0ee85846e6f9d | Bin 1027 -> 0 bytes .../f45ab2dcdc5e5b00f36ba223500dde998ae877f2 | Bin 1024 -> 0 bytes .../f62df9a69adc6f49c64e2a993f7423b0d112f807 | Bin 1024 -> 0 bytes .../f96090789e42f4fbfb8aea8038ef56137858ba61 | Bin 1044 -> 0 bytes .../fbe2f34ae81b42b92a275db2e23d6e7fbebb28fe | Bin 1028 -> 0 bytes .../fc82def89dce7a25407e29cb6553747e9dbefcb5 | Bin 1024 -> 0 bytes fuzz/fuzz_alg_crc32_md5.c | 8 ++++++ fuzz/fuzz_config.cpp | 25 +++++++++++++++--- fuzz/fuzz_ds_tree.cpp | 4 +-- fuzz/fuzz_gcrypt_light.cpp | 2 ++ src/include/ndpi_private.h | 3 +++ src/lib/ndpi_main.c | 18 ++++++++++--- src/lib/ndpi_utils.c | 7 +---- src/lib/protocols/jabber.c | 2 -- .../pcap/ossfuzz_seed_fake_traces_2.pcapng | Bin 36852 -> 38720 bytes .../ossfuzz_seed_fake_traces_2.pcapng.out | 21 ++++++++------- 81 files changed, 66 insertions(+), 34 deletions(-) delete mode 100644 fuzz/corpus/fuzz_ds_tree/05b662515f000d83deb96ffc4583991d649cd5aa delete mode 100644 fuzz/corpus/fuzz_ds_tree/05deb1919325611cef82cdbb9a9cae2e079a35e7 delete mode 100644 fuzz/corpus/fuzz_ds_tree/0696e1fef974d3020398c0645c7f5dd946898729 delete mode 100644 fuzz/corpus/fuzz_ds_tree/111657ab9fedcc5017d6df1970230b5dddd2d981 delete mode 100644 fuzz/corpus/fuzz_ds_tree/17557d4ba17829b390c3de69535bf6ccfa2d5642 delete mode 100644 fuzz/corpus/fuzz_ds_tree/239ec011fcc8cc26627acc3714c8faf52c5e0903 delete mode 100644 fuzz/corpus/fuzz_ds_tree/241b26ca01fa5bbb08b23913607309f5063017bd delete mode 100644 fuzz/corpus/fuzz_ds_tree/24cf5c21b413b0e45721eb80edc898cf6e5f95dd delete mode 100644 fuzz/corpus/fuzz_ds_tree/274042194cc72a3f82a114918e3abdb5bd658add delete mode 100644 fuzz/corpus/fuzz_ds_tree/2cf61acbd07ae5eae2549cedfbe05bf42bd595f7 delete mode 100644 fuzz/corpus/fuzz_ds_tree/32c0c554c558ebedb342d3e70e1f023387d578c9 delete mode 100644 fuzz/corpus/fuzz_ds_tree/370f2d854e17f91097c19f2f4a1f8aa66a598105 delete mode 100644 fuzz/corpus/fuzz_ds_tree/3fe5295ad34640228ce7dec8a120488f0b5df5ce delete mode 100644 fuzz/corpus/fuzz_ds_tree/435d25dd83ae22d85ac4b2b4b100fca324c65e3d delete mode 100644 fuzz/corpus/fuzz_ds_tree/4977a67459382d8300d75b71b54b4ce1f40f4f09 delete mode 100644 fuzz/corpus/fuzz_ds_tree/4ae33f6357a1804090501f11e27d58461df9253c delete mode 100644 fuzz/corpus/fuzz_ds_tree/4b77c547b98ceecc57e134d52f4692a1720e3ee1 delete mode 100644 fuzz/corpus/fuzz_ds_tree/4f62be7d61b679a0d916b2059854de5b9cb38dea delete mode 100644 fuzz/corpus/fuzz_ds_tree/51b2a0ef859f67c0dca37efea91b2a2e4ddc520c delete mode 100644 fuzz/corpus/fuzz_ds_tree/53458e81c4f84d7b35213d40fd1a8b1cb1abc812 delete mode 100644 fuzz/corpus/fuzz_ds_tree/583d48c2482fd1679a98c1748b31d07a87f06b55 delete mode 100644 fuzz/corpus/fuzz_ds_tree/5da0471be3750ec4c44275e10344d7498c753312 delete mode 100644 fuzz/corpus/fuzz_ds_tree/602f5edc05570fddabd77bccfb5c73d7cee95250 delete mode 100644 fuzz/corpus/fuzz_ds_tree/6f52f1152b96f39858decee18afa95914a754344 delete mode 100644 fuzz/corpus/fuzz_ds_tree/75a68982c7fd83542649a050e52298381666bcc8 delete mode 100644 fuzz/corpus/fuzz_ds_tree/839ae313f042b2b2dd388634a5362c08f755f030 delete mode 100644 fuzz/corpus/fuzz_ds_tree/83df4b8639a2acdee98fb7a71bbc089316687b77 delete mode 100644 fuzz/corpus/fuzz_ds_tree/867d3eef3c25cacaff5080853ba1f8ddad3e3cbf delete mode 100644 fuzz/corpus/fuzz_ds_tree/90cf625aeb7846a5e9d860a9e920afb3e8657899 delete mode 100644 fuzz/corpus/fuzz_ds_tree/90e013b209b0881e82bce7501cbf06928c6639c7 delete mode 100644 fuzz/corpus/fuzz_ds_tree/9435e886552b98fa38c2e89e07392d8048d6649f delete mode 100644 fuzz/corpus/fuzz_ds_tree/963a99817279211d121c533b803a64de91c85af0 delete mode 100644 fuzz/corpus/fuzz_ds_tree/99e376668c01c6a56bd1689e5d8664587c4fee28 delete mode 100644 fuzz/corpus/fuzz_ds_tree/9c8e942b24add8ad2e15186bc5de91464c8b3a1b delete mode 100644 fuzz/corpus/fuzz_ds_tree/a5d92fddf545081b06db2a55c860d89087c3ce65 delete mode 100644 fuzz/corpus/fuzz_ds_tree/a80d8aae221736aa612f8a82b202f5fce0eb9500 delete mode 100644 fuzz/corpus/fuzz_ds_tree/aa5f590b2f8ae90f488320a5c0ce1664b6250141 delete mode 100644 fuzz/corpus/fuzz_ds_tree/adc80cc99b35d6e8df1f170f2a13c6bcd6d398a1 delete mode 100644 fuzz/corpus/fuzz_ds_tree/ae84c8f1709ff8fcefae24ebc14ffbfeebca84a8 delete mode 100644 fuzz/corpus/fuzz_ds_tree/b410f65cc307e42ab5966239c11439da11c0ddb4 delete mode 100644 fuzz/corpus/fuzz_ds_tree/b6326b0500fa509026c488db8451367ad82a737d delete mode 100644 fuzz/corpus/fuzz_ds_tree/b6db31b2248aeba214a6850c0702de7388ea1c24 delete mode 100644 fuzz/corpus/fuzz_ds_tree/baee897444cc1c2da1ebc5669aaad8a0674bf5ec delete mode 100644 fuzz/corpus/fuzz_ds_tree/bb0687290c9a2fcc54a22495eebc3ffe8c62fcd4 delete mode 100644 fuzz/corpus/fuzz_ds_tree/bfa39a45c0fbd5ef61d95ec1481854884d6a1c83 delete mode 100644 fuzz/corpus/fuzz_ds_tree/c25d912a45389932e11154603810b3636bd076d3 delete mode 100644 fuzz/corpus/fuzz_ds_tree/c75804765207820234ad3053f61007ab0e4445b4 delete mode 100644 fuzz/corpus/fuzz_ds_tree/c825bf09aa976e7d4d67598407a3a4f8e83c6345 delete mode 100644 fuzz/corpus/fuzz_ds_tree/c9b65a60fd06d4de01b8f5b83a893200073769e0 delete mode 100644 fuzz/corpus/fuzz_ds_tree/cd7b984e87d4fce2d267888a3253c8aaad264af3 delete mode 100644 fuzz/corpus/fuzz_ds_tree/ce005e480b643e822d3b99b2a21f6e6a6f448859 delete mode 100644 fuzz/corpus/fuzz_ds_tree/cf29845e403bee085bda2d928f49673742592e17 delete mode 100644 fuzz/corpus/fuzz_ds_tree/d1b8769985ac73bd8298231fb4a6e5ed5565cf9e delete mode 100644 fuzz/corpus/fuzz_ds_tree/d4a8a0f375b984f26f41917103584c9917217043 delete mode 100644 fuzz/corpus/fuzz_ds_tree/d5b7e460b128cc07b7dbe2f845e8692370f9e2ef delete mode 100644 fuzz/corpus/fuzz_ds_tree/d821fc593a86796b420f93296017c7cb0175dd8d delete mode 100644 fuzz/corpus/fuzz_ds_tree/dc720efbe4f824c52dd03cf9c06c71f9cd64e500 delete mode 100644 fuzz/corpus/fuzz_ds_tree/e165cf4a81fe3d993948f049fb41a300c8286598 delete mode 100644 fuzz/corpus/fuzz_ds_tree/e67f707ba8191170abba4703bb4f4192a0958939 delete mode 100644 fuzz/corpus/fuzz_ds_tree/e6e0376286b8df6332e56dc8757af060da95dd6a delete mode 100644 fuzz/corpus/fuzz_ds_tree/f0ba5409fa8e20e3220a2d12c9d9fe39cd2818d9 delete mode 100644 fuzz/corpus/fuzz_ds_tree/f18edcec12f7c8b5e1de7a43f3cb818677164e49 delete mode 100644 fuzz/corpus/fuzz_ds_tree/f3259e536d2e75e24770e3afabf98a70a2e08932 delete mode 100644 fuzz/corpus/fuzz_ds_tree/f4318383dfd035c660f6454b98e0ee85846e6f9d delete mode 100644 fuzz/corpus/fuzz_ds_tree/f45ab2dcdc5e5b00f36ba223500dde998ae877f2 delete mode 100644 fuzz/corpus/fuzz_ds_tree/f62df9a69adc6f49c64e2a993f7423b0d112f807 delete mode 100644 fuzz/corpus/fuzz_ds_tree/f96090789e42f4fbfb8aea8038ef56137858ba61 delete mode 100644 fuzz/corpus/fuzz_ds_tree/fbe2f34ae81b42b92a275db2e23d6e7fbebb28fe delete mode 100644 fuzz/corpus/fuzz_ds_tree/fc82def89dce7a25407e29cb6553747e9dbefcb5 diff --git a/.gitignore b/.gitignore index c03fd9d3c..17b2a63d9 100644 --- a/.gitignore +++ b/.gitignore @@ -107,7 +107,6 @@ /fuzz/fuzz_alg_crc32_md5_seed_corpus.zip /fuzz/fuzz_alg_bytestream_seed_corpus.zip /fuzz/fuzz_ds_libcache_seed_corpus.zip -/fuzz/fuzz_ds_tree_seed_corpus.zip /fuzz/fuzz_ds_ptree_seed_corpus.zip /fuzz/fuzz_ds_bitmap64_seed_corpus.zip /fuzz/fuzz_ds_domain_classify_seed_corpus.zip diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index 162e02864..34180a50f 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -183,7 +183,7 @@ fuzz_alg_jitter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(fuzz_alg_jitter_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ fuzz_alg_crc32_md5_SOURCES = fuzz_alg_crc32_md5.c -fuzz_alg_crc32_md5_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) +fuzz_alg_crc32_md5_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/ fuzz_alg_crc32_md5_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS) fuzz_alg_crc32_md5_LDFLAGS = $(LIBS) if HAS_FUZZLDFLAGS @@ -677,10 +677,6 @@ files_corpus_fuzz_ds_libcache := $(wildcard corpus/fuzz_ds_libcache/*) fuzz_ds_libcache_seed_corpus.zip: $(files_corpus_fuzz_ds_libcache) zip -j fuzz_ds_libcache_seed_corpus.zip $(files_corpus_fuzz_ds_libcache) -files_corpus_fuzz_ds_tree := $(wildcard corpus/fuzz_ds_tree/*) -fuzz_ds_tree_seed_corpus.zip: $(files_corpus_fuzz_ds_tree) - zip -j fuzz_ds_tree_seed_corpus.zip $(files_corpus_fuzz_ds_tree) - files_corpus_fuzz_ds_ptree := $(wildcard corpus/fuzz_ds_ptree/*) fuzz_ds_ptree_seed_corpus.zip: $(files_corpus_fuzz_ds_ptree) zip -j fuzz_ds_ptree_seed_corpus.zip $(files_corpus_fuzz_ds_ptree) @@ -741,7 +737,7 @@ files_corpus_fuzz_ds_domain_classify := $(wildcard corpus/fuzz_ds_domain_classi fuzz_ds_domain_classify_seed_corpus.zip: $(files_corpus_fuzz_ds_domain_classify) zip -j fuzz_ds_domain_classify_seed_corpus.zip $(files_corpus_fuzz_ds_domain_classify) -corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_alg_ses_des_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 fuzz_filecfg_protocols_seed_corpus.zip fuzz_readerutils_workflow_seed_corpus.zip fuzz_readerutils_parseprotolist_seed_corpus.zip fuzz_ds_bitmap64_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_filecfg_categories_seed_corpus.zip fuzz_filecfg_config_seed_corpus.zip fuzz_filecfg_category_seed_corpus.zip fuzz_is_stun_udp_seed_corpus.zip fuzz_is_stun_tcp_seed_corpus.zip fuzz_filecfg_malicious_sha1_seed_corpus.zip fuzz_filecfg_malicious_ja3_seed_corpus.zip fuzz_filecfg_risk_domains_seed_corpus.zip +corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_alg_ses_des_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_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 fuzz_filecfg_protocols_seed_corpus.zip fuzz_readerutils_workflow_seed_corpus.zip fuzz_readerutils_parseprotolist_seed_corpus.zip fuzz_ds_bitmap64_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_filecfg_categories_seed_corpus.zip fuzz_filecfg_config_seed_corpus.zip fuzz_filecfg_category_seed_corpus.zip fuzz_is_stun_udp_seed_corpus.zip fuzz_is_stun_tcp_seed_corpus.zip fuzz_filecfg_malicious_sha1_seed_corpus.zip fuzz_filecfg_malicious_ja3_seed_corpus.zip fuzz_filecfg_risk_domains_seed_corpus.zip cp corpus/fuzz_*seed_corpus.zip . #Create dictionaries exactly as expected by oss-fuzz. @@ -791,7 +787,6 @@ distdir: -o -path './corpus/fuzz_alg_crc32_md5/*' \ -o -path './corpus/fuzz_alg_bytestream/*' \ -o -path './corpus/fuzz_ds_libcache/*' \ - -o -path './corpus/fuzz_ds_tree/*' \ -o -path './corpus/fuzz_ds_bitmap64/*' \ -o -path './corpus/fuzz_ds_domain_classify/*' \ -o -path './corpus/fuzz_ds_ptree/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}' diff --git a/fuzz/corpus/fuzz_ds_tree/05b662515f000d83deb96ffc4583991d649cd5aa b/fuzz/corpus/fuzz_ds_tree/05b662515f000d83deb96ffc4583991d649cd5aa deleted file mode 100644 index 1a766f4babea124b78752e0155f54223c2f4a244..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1413 zcmexUd?PvEu3-fO5Hy=l?Vi(vBbr9LMYf&+n2O$cP*m{3# z8<4mVrYD97L|_$Myp8~XE5yZMU~oWoW_o%A2*6Y$Oi!;%ud9OzLuioy7*10R(odrr zOAHTeH8>)PQH`!f2VHNw`LkE&&h$j~);Q2GAlBq-*Ak84KXLks0|g4k)!MLOC$|5Hw5`P8wo2k~BCF zkoee{YQSVyr;4zrj`J?7FcOzcCc0&?kO9-EW)dCL$Yx*(VYroyK!tD)Is>^(K$Amu gmL$0V*${L#ntkbT57j+{0b>N#!jsWJ-+eepCyxg*M89b2-b!|VAn*k=)l-YqO882BXA}L1JzJQu$ipoC`Oac`AKLn+yMjpp~VOQb#T`6 diff --git a/fuzz/corpus/fuzz_ds_tree/0696e1fef974d3020398c0645c7f5dd946898729 b/fuzz/corpus/fuzz_ds_tree/0696e1fef974d3020398c0645c7f5dd946898729 deleted file mode 100644 index 73ebd2a4d79e5725652dc7f93dfd3cef3deee38d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzfPi!ar~`rdU=p2xDuz=CO+Xf06vV)y6Gic6q5!%nDEzlT9+H_T)?;#DDp8Ce zlLIr01UiodwNRx^jbPABrXvYyLk^;cSOAhdiEc;I$-scDcSY#&jVJ#sndH0ngD#RH mWF@py}2n8b3X$~NE5n;_{Y5*ea!K0*(bnq8d%Ud89$pS<`<6|LdNKZ#mh-x_T zJh+Jn(;k8Vf{U94(~HYCd8k%g@-Y2ix)y~;3P+uQ;-*G0XvXCXgt#+;NhKD#(@+AF bTsz=~qL_xn0mmR_B*OHe+Y3_;76)?xF;gxViVfP)1eGyGKfDsJ=4lA(<|H3ASPYl&}DyUpA4;DhGG$^c~F_jJg(9GwF diff --git a/fuzz/corpus/fuzz_ds_tree/239ec011fcc8cc26627acc3714c8faf52c5e0903 b/fuzz/corpus/fuzz_ds_tree/239ec011fcc8cc26627acc3714c8faf52c5e0903 deleted file mode 100644 index 7b5cf5b750359bd916eda0598dfc12861fcad511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexU+^~WH0w(#c{lIybRT#uer!|0Cg3~G;8o2AfT?rb#>`rREHDb_9w_S zAX$tsqJmTFK!zg&g6>3k;6H5v!XhxMNqx>#JBS#Tpo)M1f(oGOA|lYtXlew5W{3qu nkPI2OH>n~A9GtBUXA#dpu@G6?|L<@fL=Bt^XDGv24S5zm@Aq#WoiL>Qy6uo>147DQ1-83&ss zNMa~~jwDVd6U8_PCjth-U<|@ElI?_j?+a0qj-&|>(*-7n#i;~^V0y`+33~)hMO_^O d5TSrNE)*^b2j(WQAdCa2VM-N1j5;o`H~z-jUT+&W?z*sMuEO`2PQsyW|0I{~zkWPMN#I;3l?tE+p36#ykr0jk-= zTIG(a4aQp$dVJ%_KT9V0uKl2!fEmazW%y`R*THy?2mzQv9JCcS@p5c}$YSX3MDY=_ z!n!)3QWRMPrvbqPv*3oJiNm=Mp@4zm%D@4*Yak4mqq#`{r~y=02lH25-T(UHKOi0e DlnBs8 diff --git a/fuzz/corpus/fuzz_ds_tree/2cf61acbd07ae5eae2549cedfbe05bf42bd595f7 b/fuzz/corpus/fuzz_ds_tree/2cf61acbd07ae5eae2549cedfbe05bf42bd595f7 deleted file mode 100644 index 35662cb4fd568ff6c1275c669aef84ee4b0e59cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQz00BlY$snCh0ys@Qkbas3d!b4pE+$+45H|_ nKvkG#rAH{EMiFT|n1P7sN(F&B1u)>o53soBAqarI17-mLl=!k1 diff --git a/fuzz/corpus/fuzz_ds_tree/32c0c554c558ebedb342d3e70e1f023387d578c9 b/fuzz/corpus/fuzz_ds_tree/32c0c554c558ebedb342d3e70e1f023387d578c9 deleted file mode 100644 index 8a848b1cc0d1bf1f715f7dba8c2ae6ede9f20215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmZ1xdVJ%_KT9V0uKl3PfB@+vgSxu^RsV5AT@BKx`_mE4KT)k1_l_D5N!un0MrBqZ~-VEL?Jsp8JPoP!!^~_ zZN>$V)Q}V?Fgx;K4C3jgMlfhbu^Jx-Vze6E24v47g$FJsOdr?^xFQr$P#RQGMoo!` zbOj6;PHTp^H=o{s8NG#&#ZM1TvZ6iKR%p$?o= F7y&hZ>1_Z2 diff --git a/fuzz/corpus/fuzz_ds_tree/370f2d854e17f91097c19f2f4a1f8aa66a598105 b/fuzz/corpus/fuzz_ds_tree/370f2d854e17f91097c19f2f4a1f8aa66a598105 deleted file mode 100644 index 314d510792321a2930d14733d0ae66f99fc27ff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzVE7LK0t`UVY^HGvM5mJsSU}ovXe>mShOSC2y{@iK6^LPg^De6}jE#-{hfNSH z)_^R7uo1$7*b60*71q@?HG)9{gldFI!c72a0tXJV8Fg@Jk{B%5RhJ`#ku70>y5%y= zO$6x)6J{U-Xw-5dixJBP+l6o!lvM|cFDwAAkcTE9J)IF8Fs$X!@Im9Egc@#6U0huq zC{W)5ae6v#bwC-ohY*a$W^|7O<&e@gLM3V-S=S+~0+}E|0?@=%3vmR{8wmT*-G#xo MgNc;G7!aBT0D{3${r~^~ diff --git a/fuzz/corpus/fuzz_ds_tree/3fe5295ad34640228ce7dec8a120488f0b5df5ce b/fuzz/corpus/fuzz_ds_tree/3fe5295ad34640228ce7dec8a120488f0b5df5ce deleted file mode 100644 index eadbbde7206ba7a1e7dc8fe846f67b822a1f26f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmZQzc)CNbi2(%CA>b>N#!jsWJ-+eepCyxg*M89b2-b!|VAn)%(K^b39Z^O+q8wnc z2R*n@LKusBxRB=&I1__`YA7SvOxAJ~qe^zY6OF30*)b98fUO^ F0RXQMjB)?~ diff --git a/fuzz/corpus/fuzz_ds_tree/4ae33f6357a1804090501f11e27d58461df9253c b/fuzz/corpus/fuzz_ds_tree/4ae33f6357a1804090501f11e27d58461df9253c deleted file mode 100644 index 03190c90a153bc18e397748bb2bcb4341629f30d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzfP-|J1Bg{Lw+3!O9i`wc&;Yn;2u1`+0HKdu7M;S4g3u}>PcM2nk{dvH^pWQ< e9JYFbaJ>;Z;Q#=m$Ee!? diff --git a/fuzz/corpus/fuzz_ds_tree/4b77c547b98ceecc57e134d52f4692a1720e3ee1 b/fuzz/corpus/fuzz_ds_tree/4b77c547b98ceecc57e134d52f4692a1720e3ee1 deleted file mode 100644 index 6ee6cd7e50017415be71c56e34a6805404d438ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYdK#{vEi1VFf@js&2LRqb1#DBQdSa8?A-Kn06RxG}^tWya1#l7DSK;YFlUV;nITD ziNp(PqA2}OWuS~?9*RYHIp|)6hwdC83$IQblCOc{I1PoHPBa5%6b{>9!bpCHGhtd$ zXt*pAgAwQ&2p47?jQ$5>)LnwJ>YzF~5h9pAPDe5x!NlupWaBVGFg+bb8p?tB49tab cAT-EN3=FL0P%F{6AW?|37>t2TCLjU=0Nq>Mc>n+a diff --git a/fuzz/corpus/fuzz_ds_tree/51b2a0ef859f67c0dca37efea91b2a2e4ddc520c b/fuzz/corpus/fuzz_ds_tree/51b2a0ef859f67c0dca37efea91b2a2e4ddc520c deleted file mode 100644 index baaec0b68513c915c8b457ade2ca79f42bcb8d2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmZQzfP-|J1Bg|`TXUSofOwZ+S6N2@z;&gGICO!5;iJU_gp1)6r0@i(;CcfVK+y}=BLV=Al;p?& diff --git a/fuzz/corpus/fuzz_ds_tree/53458e81c4f84d7b35213d40fd1a8b1cb1abc812 b/fuzz/corpus/fuzz_ds_tree/53458e81c4f84d7b35213d40fd1a8b1cb1abc812 deleted file mode 100644 index 94f85bbe2479af92aa18dea446123728c3ed041d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmeyv$N&a{#W#}k?HX2qIL&4nr$BT%%>l?3s6GFw4X`=B5H9!?&O&DB{jqI8=7ZUu z7$OjXRdDe-0syWM7Xv9AAW9-Y0HzwnbeJHJ&WEuP-bznLQ4Hq5RN9bB3O1}Ij_v8#vK3Zf-R1rQ_QPON(f1zvp}7{DN%1W-pZr~v6ew*g`?gk&e#NT>#Uh9X-)EE{GXx$Z&M2Qv#y z|0!-*0d)k5I2oKe7N|i8%c|<~QCSm-W52`bWz0;=X^g6M~8L^YfdEXP`oVg(T# kUxXT%fy6otrXE5wFbtsOs7}Gg!{I4xO3}m&(fD||0CMAD5C8xG diff --git a/fuzz/corpus/fuzz_ds_tree/5da0471be3750ec4c44275e10344d7498c753312 b/fuzz/corpus/fuzz_ds_tree/5da0471be3750ec4c44275e10344d7498c753312 deleted file mode 100644 index c4a67fd71fae352fb6c32b0e14bbb54dab245490..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_ZI|{-;5Z%T?um~uEm4zsH39n!)1e>);86=&>nCKZig5Xg+f=!C_-XMXvyO~L5 zLR1hRWasV7+xex49=mWA-;}}Gd;#J57XZPe)fQWV*5DlN!`DmZ!fu$Sp*~XTm|Hsz z4zos7;f)0;sX1rK83YGM%L;=k6`tY+oDzpPNoJN%u+C&3d8tUC6x8AGBqYh6h_L|J znnwl6GEp~Gxow8U#5$N?(uJuBbE;x&KkW_K^+$S*Q;q&}bhjLb$Q5J=CvzPCJDH3~%gQ|{h2b&!h57}u Cxv&%f diff --git a/fuzz/corpus/fuzz_ds_tree/602f5edc05570fddabd77bccfb5c73d7cee95250 b/fuzz/corpus/fuzz_ds_tree/602f5edc05570fddabd77bccfb5c73d7cee95250 deleted file mode 100644 index 9e82458b5ca131382b38cce7acd7b4a94a5f7d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexUd?PvEu3-fO5Hy=2PPYk<`0Kj4fsw36Y zBR~MA4#hZ_AdCjzW$DprNr*8N`4|!gQvCbP2$;!st4kHSOa001mwdjJ3c diff --git a/fuzz/corpus/fuzz_ds_tree/6f52f1152b96f39858decee18afa95914a754344 b/fuzz/corpus/fuzz_ds_tree/6f52f1152b96f39858decee18afa95914a754344 deleted file mode 100644 index 484cd28fd5690ee753bb452a251e1a768247806e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexUd?PvEu3-fO5Hy=61Ok|HnD%s#qyUOKAg2y4O_-4nQ&I?H0O`8A{}3Pm zvk*ojDZMHuQV6fqbFp%UhJ6dL3;sK@-F z03sg&0x+d@$N(moo?ZoJGO$7nK_QVf)YUaLf^De6}5|>QoR8(8i zQ9=sUOw^E;hpI#bB}f1*q=5m2l(f;T!p%hvX*5;HPLjkA{?`}(fvb>!vXJ!y*$r^# nbG{Kd0kR9~t=|lF51|081b>N#!jsWJ-+eepCyxg*M89b2-b!|VAn)Q^f@5~B+A!O4(y0B z;t}Nli#_PRMG0Xn>fu73N8n5h2CAWqU^7|EQH;jmRFMoYj6fIoPfdVoxG#bW^DJs8 jz(naoLxLFSCZN0SfB}`f4l#@*l7SIJIRi7$Y3YmrMadHi diff --git a/fuzz/corpus/fuzz_ds_tree/83df4b8639a2acdee98fb7a71bbc089316687b77 b/fuzz/corpus/fuzz_ds_tree/83df4b8639a2acdee98fb7a71bbc089316687b77 deleted file mode 100644 index 8381f94e8a4d6697357b0349d001e004c7c7c0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1037 zcmZQzxbYth7>vp}7{DN%1W;E8(L){yv#5>=0A?1L{!`qr0_r3baWXh{EKq|GZmg=S zvqSJmW1+hMIpEOcNafSfsSHH>x^35@Vvu59CWu#|8d3em2$o|lM-B~Q*uDrwFawEo d7)(8cW?&dV%Tb+zjfcZi*p#A)8KUv=asf0^VaNag diff --git a/fuzz/corpus/fuzz_ds_tree/867d3eef3c25cacaff5080853ba1f8ddad3e3cbf b/fuzz/corpus/fuzz_ds_tree/867d3eef3c25cacaff5080853ba1f8ddad3e3cbf deleted file mode 100644 index 26e1705bfde6d1405f6e39a2bc1a760588d075b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZ4SXNfKY0;JOpBoH!slJD9N_|?>r2ON;K*&%bVvj0N>CrA?L9$4V~Y5LXlzrOfS z6E=X=Anbz5ScTt0EJODHiqPX5PySf~3KmEd{rC@Z3$hZtY^XngRC)vqgaH}2G}YDp zuR`cSX2EnrXl(umi5bB_9hd=hDv-Vf69mzWkg$|S79*XF#r}whc|f;8Ovgp~LL}0m z!4FmD0Ho{cKnMlYaiMUb9PFYHN$kc0<%l+&fq?_89O6K*sc1~r)qh;X_BQ2rMz TbU^y+xPS(L1Rx|#3Yi7~Tt{$a diff --git a/fuzz/corpus/fuzz_ds_tree/90cf625aeb7846a5e9d860a9e920afb3e8657899 b/fuzz/corpus/fuzz_ds_tree/90cf625aeb7846a5e9d860a9e920afb3e8657899 deleted file mode 100644 index 260adb925c84a77529e6f3fe13823051462a0da8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzU|=xQP}#NX$SEL;A)V#`WD8+?AgYi^u)FI16A$X}0fN4S*o>ofC&HK$!oW euoBW$Ams-H6T=v!C;_SBdIJ_fXaKU{dPD&3Ug7`% diff --git a/fuzz/corpus/fuzz_ds_tree/90e013b209b0881e82bce7501cbf06928c6639c7 b/fuzz/corpus/fuzz_ds_tree/90e013b209b0881e82bce7501cbf06928c6639c7 deleted file mode 100644 index 9d6aabc9b0ac398f95931786364709dbc15099cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexU+^~WH0@A?%%K88Qe=P$;9Tosl1||)FBqLY@YdM(Wg6bxM@x7-k-bMwKCj_Zp}e*(4Af z;Si!&b#+aRjg4?ixkv(9M5~5dfWkm^J4)JMU_j$Se1oh5#VBA31OpU7Bo0_(B#1;3 q#9$&DkA+>1MGRF46qrEJjA1f10aUG2<6*OkpcppWA)1=15t;!-FkHd_ diff --git a/fuzz/corpus/fuzz_ds_tree/9435e886552b98fa38c2e89e07392d8048d6649f b/fuzz/corpus/fuzz_ds_tree/9435e886552b98fa38c2e89e07392d8048d6649f deleted file mode 100644 index 0c59f763ae2ddf7ab0a8d1ec09a38e82d6c5bb7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmexUd?PvEu3-fO5Hy={@fcYMx9cmA1yPKPge!$G^#0g3q-UWCdZO`R z+*L3}dL01(SBQ%NaUMd}C_MrM5CQ~Q`7jlQ?l4v=7I(qqaMI{5A<`jgAiGqNf`Ric zt1uFmOeVTBQKAvm%%;Z1#`XaKKx-Qs8`UXXoZp}D(jjW!JwhBQ5nR5Ny2odgER@C=m&D@;L?N{`Cuh8=cX4T zsfAgCpphi8Ga+t3l0)%6k~k_;EgfiwD#D&R&bzF_NL(_RsFtLIg9#o=sAiH8!s+RC oSdt^Uofv%N5JrtO035~w5K){Xzc0ID6V5!om>8^sv7 zC?>;`iU8AekjO{EfC)Q*1t^MNfE*NiV2Wr$l?Vi(vBbr9LMYf&+n2O$cP*m{3# z8<4mVrYD97L|_$Myp8~XE5yZMU~oWoW_o%A2*6Y$Oi!;%ud9OzLuioy7*10R(odrr zOAHTeH8>)PQH`!f2VHNw`LkE&&h$j~);Q2GAlBq-*Ak84KXLks0|g4k)!MLOC$|5Hw5`P8wo2k~BCF ykoee{YQSVyr;4zrj`J?7FcOzcCU(n^L{ZEg=`mOL5DLJd0%ijXQ2am(Aq@b$D{GSg diff --git a/fuzz/corpus/fuzz_ds_tree/a5d92fddf545081b06db2a55c860d89087c3ce65 b/fuzz/corpus/fuzz_ds_tree/a5d92fddf545081b06db2a55c860d89087c3ce65 deleted file mode 100644 index 9b9ccef2808fe112f19b7d3a12ac339ea497dc7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZ4SXNfKY0;CThnB=?m1Ago4C@Aq#WoiL>Qy6uo>147DQ1-83&ss zNMa~~jwDW)$$(AC&~ZLC*Ms5;9YnxD7>q%fMlzdl1_2TsFODu5VuTwrkk8r4uy diff --git a/fuzz/corpus/fuzz_ds_tree/a80d8aae221736aa612f8a82b202f5fce0eb9500 b/fuzz/corpus/fuzz_ds_tree/a80d8aae221736aa612f8a82b202f5fce0eb9500 deleted file mode 100644 index 0d98f2019e6f5e861710aeaaa2c58b042ada4075..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmcIfK@Na02&)GZ<0E(V3Eup=nrTBY3|KNrwhrh@0f6Z~z`QRNvHc!0=Ln?Abp=5AijwHuD=z3sg(U#U}Y6OF3bnB_i#|TU=0L7!0od5s; diff --git a/fuzz/corpus/fuzz_ds_tree/adc80cc99b35d6e8df1f170f2a13c6bcd6d398a1 b/fuzz/corpus/fuzz_ds_tree/adc80cc99b35d6e8df1f170f2a13c6bcd6d398a1 deleted file mode 100644 index 5e0efb8f855f85833c538f8e852de94b02859367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzfP-`}aKsHD3P>O~kf0V#DbQ7DB2?xwvOqkZo?b^ffV(9E1pfd3UkhfCN&t;9 zhZ{va!w8R3()~ge9q2BCCn^wwWE)-sb>KA-#dzX4Q1eJ}%OgyHMLS-HVo?tl@;m}( UVlYq*WdwT>LlN-;ID?1_0A}-wFaQ7m diff --git a/fuzz/corpus/fuzz_ds_tree/ae84c8f1709ff8fcefae24ebc14ffbfeebca84a8 b/fuzz/corpus/fuzz_ds_tree/ae84c8f1709ff8fcefae24ebc14ffbfeebca84a8 deleted file mode 100644 index 6a2695883af601c7a8882680b788a9fa86978e8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexU+^~WH0@8^A-f%^ASOHYp5v~l(z^W8Y5T*m_8VH4^2FgumVA#UIfL#ukD9m^u zZ2-iKVDnka!4wyYop?FE2w9kkxNJlhhp9)SXIG_gq6s0mATuCNWe`L+56DL-L}p=8 z2oXZK9aBkDV`C#+l#2=gZWuZP*{Ns|!N7nLFEIBa>p(H>KNO${B5}YPBS9pRAO;iJ icr5I4EMllaps)jiW(OdOazMosD_2M0Pc!BD61VzlNAo=n&4(57^q><)P#^Bi-lqw zgmVW57#Nv>4gv~B-~b34(H)M-_k{?hL-imO0Fw+_s^MZ_z@3a>c7hFnao{w}SOpNH IjteXf09M&0^#A|> diff --git a/fuzz/corpus/fuzz_ds_tree/b6326b0500fa509026c488db8451367ad82a737d b/fuzz/corpus/fuzz_ds_tree/b6326b0500fa509026c488db8451367ad82a737d deleted file mode 100644 index d1bd11e7b3daa6bedbb4f85d3585fc9d45f74363..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1042 zcmZQzfP-|J1E5tL3=BYP?xro)C)T#w)>(Y%5Jx(ID4@PHta_EPiXsWlpD|+w5*IfU zVjC8Dbu40}3B>}HLyQNLq-lnzb|*;_PQQ?33h|2TNCKGV!nD`G7(~%;fvPagN{>*E npa8%OM8sDrCmMMMAqfT({h diff --git a/fuzz/corpus/fuzz_ds_tree/b6db31b2248aeba214a6850c0702de7388ea1c24 b/fuzz/corpus/fuzz_ds_tree/b6db31b2248aeba214a6850c0702de7388ea1c24 deleted file mode 100644 index c9af8ec36d43fca61442f1198c0bb9b64704d1c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQz0E1>TjZ+{-I?VyZKAhGR!ezd~S;!2%Kei3Xe4^NO1OP!pFdQ8L0tB_Gr2{Qi zMY5dpE~_vSw{6#=Vk9mpOmw>;E`*Y(1~oN;K?8(pgh|3p0BI6H(GTR*!KF!Jut3bg uss|CZ7}78|VbWlw

Q>cVa4}wg|#X5?GDR)OH3j=Akz-bf^i^79*<}gEyhYR3mq@Tv-25oGDa50Dla4v}q9TL?8mDgbb zsHR{w6h)UOh!;T&Ks6b~5PY0Se3E3!0iD9YAO%k^gc&Gq2P>z?9hk`C2`&`?(g3}OTq#H!;$ cTjZ+{-I>~?qVgOcsg$PlIDmZxo%0eiBun*h=w03yHuCd>%t yv6e%H(YR1iLR4KG#J0CUDm@*qYM8x9bYnBjtq^)NVW5Twj5mlA2F!_sX%+xyGEc1l diff --git a/fuzz/corpus/fuzz_ds_tree/c25d912a45389932e11154603810b3636bd076d3 b/fuzz/corpus/fuzz_ds_tree/c25d912a45389932e11154603810b3636bd076d3 deleted file mode 100644 index 1453014ca5d05c9aeddd9c32d10f26f129e0886c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQbrvhLA1MCLXQ3~E-HGqQ@@E-=S8bv)p1_pA?LJvDgh=Rz6Ab{ZFX2Fag!wI$+ zdSHfu=~NURF&wBX<%m%WRMXT52F)1GpoKtsx&hc(aI?`Ji4w$cRU|N81J$A$T9443 ko{nNZDIAy~pd0}*ACfk(B@dYGFdZ-&oS1+Fm=ERv0N?A7jsO4v diff --git a/fuzz/corpus/fuzz_ds_tree/c75804765207820234ad3053f61007ab0e4445b4 b/fuzz/corpus/fuzz_ds_tree/c75804765207820234ad3053f61007ab0e4445b4 deleted file mode 100644 index 6b13721078c93061e22320e28dfc6e4a1d243b5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexU+^~Xyfnk#G+7Ia@gIOf$09peCBx#{YaUBZ4G^(xvtf01a79WaAk~nXHsxggD zUlV}^JOlwqD8PdPi3?={4XnrG1ej%Yb;JhcXe`wYWGn%rbv`6&@x&@#DR7ii$rxDj KNoNGRi4_3l$eC#X diff --git a/fuzz/corpus/fuzz_ds_tree/c825bf09aa976e7d4d67598407a3a4f8e83c6345 b/fuzz/corpus/fuzz_ds_tree/c825bf09aa976e7d4d67598407a3a4f8e83c6345 deleted file mode 100644 index e3ae559eba9c527c53088df356b5919bdf716de6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzfC57XhICRuKQ_fp*aUHlH8p}ka~(QR-p>{Ya~P0DGeHxL59Q7P0_-wSQGF}C z(&_0>amk~(1&PbR@R91^Id&6KY()eLdf4IMufZV>76$p72@j~N!xd9Vjslv2H-KkO z#1*{h1Y-tWC(!$Fn?Z6=P6L?69(+_1mGdFkp_v7t+Xb_@X2ZWEh?pVS*V1 RvlK|fgb2_;$HG;J005@n-WmV^ diff --git a/fuzz/corpus/fuzz_ds_tree/c9b65a60fd06d4de01b8f5b83a893200073769e0 b/fuzz/corpus/fuzz_ds_tree/c9b65a60fd06d4de01b8f5b83a893200073769e0 deleted file mode 100644 index 65c7b290af88ed3f237ff2dd0c2b9bfeffcf3053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1440 zcmexUd?PvEu3-fO5Hy=l?Vi(vBbr9LMYf&+n2O$cP*m{3# z8<4mVrYD97L|_$Myp8~XE5yZMU~qsq6Br^Ozynhl0Rk`%!j|;9^tw8jFoXvAli@VQ zApJC|vBdDeR)Zsy7}e-%bkGHG@&jQqh=4$_U~&)|tDy+RK$a(n2M%6B1hUBxuQD*8 z7**HQ2nG#}jmjVfOcJKC855*~3=#kl@E8MeU;r&{K?cp7F=GMDKp33@V&ubkpoFXl z<-nYPpkb6_Z1)3bPvn0s{$cCV^(d+~J4D6}8hfo040cJxA5pfc2X!c*sSyks5E?+zRVZpu zIWU!Vb^pPDm6a7H1fd}|A&EtR0E~}f7)%gMdy)Wv8sHuRF;GmcgL$g4Q5obrm?Ydb zkPZP5feh;4(s&q0(d7z}1VHwfn3&p_kPToih0sVwr>7xvU~Gu6NdQQ|H` diff --git a/fuzz/corpus/fuzz_ds_tree/d1b8769985ac73bd8298231fb4a6e5ed5565cf9e b/fuzz/corpus/fuzz_ds_tree/d1b8769985ac73bd8298231fb4a6e5ed5565cf9e deleted file mode 100644 index 1cfe082b4913545827e7683135d6ad436db2f5eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexUd?PvEu3-fO5Hy=rentCJ7ISMv;RXh?N1c z0ZA$X1Ymr0TVdj08tym{14U(BQzIBOG&U-O7%)k=c90GM5P=Np;L?N{`7kAj@Jdgw ztNRZD0x%0e6CgI!TfZ6V9zp?F Q8JG=?a~Smy#vp{#)g1xi= zXmOaG~&+ zn2_U}Xf~P|5H2w8PvCR} BTLl0B diff --git a/fuzz/corpus/fuzz_ds_tree/d5b7e460b128cc07b7dbe2f845e8692370f9e2ef b/fuzz/corpus/fuzz_ds_tree/d5b7e460b128cc07b7dbe2f845e8692370f9e2ef deleted file mode 100644 index 9c2b44e2b386f052a552567ed22659bd6fe46c1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexUd?PvEu3-fO1f-J;>L>?xBpCs6C>{+U4=~{YFs1!u#xv4dC)a4v)aRt7O?;7GVz$zlNA o&4BJLG+*N30^ diff --git a/fuzz/corpus/fuzz_ds_tree/d821fc593a86796b420f93296017c7cb0175dd8d b/fuzz/corpus/fuzz_ds_tree/d821fc593a86796b420f93296017c7cb0175dd8d deleted file mode 100644 index f56a9364bbd2559e434489ae30638401ed370b16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQz00BlY$si4;(&-4A8o{8sj%)yNIaM7FG7J(TtmPaK^RWj>K2#XH_? zT8N@M0pdjv36}X!eSokLXbB-NArwPc2Mcc452! diff --git a/fuzz/corpus/fuzz_ds_tree/dc720efbe4f824c52dd03cf9c06c71f9cd64e500 b/fuzz/corpus/fuzz_ds_tree/dc720efbe4f824c52dd03cf9c06c71f9cd64e500 deleted file mode 100644 index ea21b90bcf07f80ae26a494c148932743540c6c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmexU+^~WH0@BgJ4RirY_;mcZUS3b1+f@G;te8X q^H75r>`4@9CU zK+zB6)WM|*GxA|d3SkT&U03%X0t8?d!e}H#*qIE!L9RiPLkR{Xaa5)n(9Swlm@Pn> z^De6}5|>QoR8(8iQ9=sUOw^E;hpI#bB}f1*q=5m2;#D-uaB-1C8chwdlO*wj|MkUx vu&O{d1I&im!TCny1c(jw+HZ!shfn}k24+L!9Y#HbG0{#)g1xi= zXmksNp0A1~iMHt}6%9*dj#<0I0`Wr~m)} diff --git a/fuzz/corpus/fuzz_ds_tree/e6e0376286b8df6332e56dc8757af060da95dd6a b/fuzz/corpus/fuzz_ds_tree/e6e0376286b8df6332e56dc8757af060da95dd6a deleted file mode 100644 index 13dcd940480bd5c8e4b1ddd7bf677e2a7dc2c464..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1025 zcmexUd?PvEu3-fO5Hy=lc(Y}>V{7|G^BB(~lk+Xf^qgz1SP z0ufjR7q24#;0kdu7#JK7?gS}{00Ee4gz4#Z>2-B5VF(TKARHi6f>=$BV9?Oms0?Dj zB;oo&+63Twp$s(RL5gS2n6Ut^37L@(!_W&c%GB^jFft)1KLwDvHNY7E85lrJ zbPHk9KzcJSfTRZ5gr-I?XhxNW^KQUdPzEU6)6@0-*fyX$f*>E=D0DtS13-2oVhN}` zA|e7QB+<>QgN7D{I2HjrxEN3q7{CR?+oKu=~?KCv;X|M*6f@Hq!KSj7BOCsZFhEw0i|vb$fZ0imBSC6l Z>WQUsm`j9q96Eu*4ES|}JO@?*qyTJ8k~jbW diff --git a/fuzz/corpus/fuzz_ds_tree/f3259e536d2e75e24770e3afabf98a70a2e08932 b/fuzz/corpus/fuzz_ds_tree/f3259e536d2e75e24770e3afabf98a70a2e08932 deleted file mode 100644 index 200b24b814a265f6c500e05e76301ec46e293e0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzfP-|3!88IUfUE*3fsj}f>!6Fl9Y+oW-7up0brA4w00Gnq_$gIf(pY>NK@mV0 zh|NlbEQCc)WFhPEhZ=~@F4Dvr(49sbK533ZQvDwc7>tm8Pa0ba4y@oToD2zs48#^L E07NK@bpQYW diff --git a/fuzz/corpus/fuzz_ds_tree/f4318383dfd035c660f6454b98e0ee85846e6f9d b/fuzz/corpus/fuzz_ds_tree/f4318383dfd035c660f6454b98e0ee85846e6f9d deleted file mode 100644 index 9db6b5690cbd72a464207fbb2cca37cd67fe56ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmexU+^~WH0@5h~bvOa4sf=K|Sj(YyqH&?3cqrfh*a1Qd%s!kBLX&{0$3rt=fu&ksa66I0G(?ERHQE=n=u# z10Nv@a;!Ss#c&2J2Ea6`Kj6IoP(^ih#DzH2aJYU@kf7Lu!a+C@I}2o*dO9OSk2Kuj aFb0ZQNLC^<5gw?k!=6{5ra%mhhyVa#GX=i@ diff --git a/fuzz/corpus/fuzz_ds_tree/fbe2f34ae81b42b92a275db2e23d6e7fbebb28fe b/fuzz/corpus/fuzz_ds_tree/fbe2f34ae81b42b92a275db2e23d6e7fbebb28fe deleted file mode 100644 index d9aa6ecce1f2971d41ad8c27b4299f7345f4bcab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1028 zcmexUd?PvEu3-fO5Hy=2PPZYb303c`xhNB}u zfS@+DbfCqmNS1TnWfex^lF3B37vef7iE3t3BN#M5s79D1+ysy&0Tlf}P90pD1O_7F xFf_qz#iYSX%Mlt-T!N{b+9C*xNnkZLQ`;HDn1}8_cu3VfgaWWBVD^9F0RV{#!@vLl diff --git a/fuzz/corpus/fuzz_ds_tree/fc82def89dce7a25407e29cb6553747e9dbefcb5 b/fuzz/corpus/fuzz_ds_tree/fc82def89dce7a25407e29cb6553747e9dbefcb5 deleted file mode 100644 index 9941e837900130708bd72406f88394be97f148a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmexU+^~WH0@BgJ4RitO@aqtu9KpoOf?AjWqM@#YQxSLpb)1S~3RV}ADfpjufOr?7 z_zpdUi8ltJ@->i&*HC!m5ygNRg|GlC3tLdaw4%`16e7gX&He`$xCCdRFi^|}aS&!9 rvGDp7zj^5>(ohb}RxlUFfzXU#yI9MiR-$o1q7Zj67z3G1Km-H;RdL&w diff --git a/fuzz/fuzz_alg_crc32_md5.c b/fuzz/fuzz_alg_crc32_md5.c index 265bc0417..15c817989 100644 --- a/fuzz/fuzz_alg_crc32_md5.c +++ b/fuzz/fuzz_alg_crc32_md5.c @@ -1,7 +1,9 @@ #include "ndpi_api.h" +#include "ndpi_md5.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { u_char hash[16]; + ndpi_MD5_CTX ctx; struct ndpi_popcount popcount; char *str; @@ -14,8 +16,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_crc16_xmodem(data, size); ndpi_crc16_x25(data, size); ndpi_crc32(data, size); + ndpi_md5(data, size, hash); + ndpi_MD5Init(&ctx); + ndpi_MD5Update(&ctx, data, size / 2); + ndpi_MD5Update(&ctx, data + size / 2, size - size / 2); + ndpi_MD5Final(hash, &ctx); + ndpi_murmur_hash((const char *)data, size); ndpi_quick_hash(data, size); diff --git a/fuzz/fuzz_config.cpp b/fuzz/fuzz_config.cpp index daf2b561c..69fdbeeb6 100644 --- a/fuzz/fuzz_config.cpp +++ b/fuzz/fuzz_config.cpp @@ -12,7 +12,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { FuzzedDataProvider fuzzed_data(data, size); struct ndpi_detection_module_struct *ndpi_info_mod; struct ndpi_flow_struct flow; - u_int8_t protocol_was_guessed; + u_int8_t protocol_was_guessed, unused; u_int32_t i, ret; u_int16_t bool_value; NDPI_PROTOCOL_BITMASK enabled_bitmask; @@ -34,6 +34,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { char cfg_proto[32]; char cfg_param[32]; u_int64_t cat_userdata = 0; + u_int16_t unused1, unused2; /* To allow memory allocation failures */ fuzz_set_alloc_callbacks_and_seed(size); @@ -71,6 +72,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_load_protocols_file(ndpi_info_mod, "protos.txt"); if(fuzzed_data.ConsumeBool()) ndpi_load_protocols_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename"); /* Error */ + if(fuzzed_data.ConsumeBool()) + ndpi_load_categories_dir(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : (char *)"./"); + if(fuzzed_data.ConsumeBool()) + ndpi_load_categories_dir(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : (char *)"invalid_dir"); if(fuzzed_data.ConsumeBool()) ndpi_load_categories_file(ndpi_info_mod, "categories.txt", &cat_userdata); if(fuzzed_data.ConsumeBool()) @@ -484,6 +489,19 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_dump_risks_score(fuzzed_data.ConsumeBool() ? NULL : stdout); ndpi_dump_config(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : stdout); + char buf[8]; /* Too short in same cases... */ + if(fuzzed_data.ConsumeBool()) { + ndpi_ssl_version2str(buf, sizeof(buf), fuzzed_data.ConsumeIntegral(), &unused); + ndpi_get_ip_proto_name(fuzzed_data.ConsumeIntegral(), buf, sizeof(buf)); + } else { + ndpi_ssl_version2str(NULL, 0, fuzzed_data.ConsumeIntegral(), &unused); + ndpi_get_ip_proto_name(fuzzed_data.ConsumeIntegral(), NULL, 0); + } + ndpi_risk2str(static_cast(fuzzed_data.ConsumeIntegral())); + ndpi_severity2str(static_cast(fuzzed_data.ConsumeIntegral())); + ndpi_risk2score(static_cast(fuzzed_data.ConsumeIntegral()), &unused1, &unused2); + ndpi_http_method2str(static_cast(fuzzed_data.ConsumeIntegral())); + /* Basic code to try testing this "config" */ bool_value = fuzzed_data.ConsumeBool(); input_info.in_pkt_dir = fuzzed_data.ConsumeIntegralInRange(0,2); @@ -537,10 +555,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_search_tcp_or_udp(ndpi_info_mod, &flow); } if(!flow.is_ipv6) { - ndpi_network_ptree_match(ndpi_info_mod, (struct in_addr *)&flow.c_address.v4); + if(bool_value) + ndpi_network_risk_ptree_match(ndpi_info_mod, (struct in_addr *)&flow.c_address.v4); ndpi_risk_params params[] = { { NDPI_PARAM_HOSTNAME, flow.host_server_name}, - { NDPI_PARAM_ISSUER_DN, flow.host_server_name}, + { NDPI_PARAM_ISSUER_DN, (void *)("CN=813845657003339838, O=Code42, OU=TEST, ST=MN, C=US") /* from example/protos.txt */}, { NDPI_PARAM_HOST_IPV4, &flow.c_address.v4} }; ndpi_check_flow_risk_exceptions(ndpi_info_mod, 3, params); } diff --git a/fuzz/fuzz_ds_tree.cpp b/fuzz/fuzz_ds_tree.cpp index d06b5b19f..5e561e2e6 100644 --- a/fuzz/fuzz_ds_tree.cpp +++ b/fuzz/fuzz_ds_tree.cpp @@ -46,7 +46,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { *entry = fuzzed_data.ConsumeIntegral(); if(ndpi_tfind(entry, &root, __compare) == NULL) { - if(ndpi_tsearch(entry, &root, __compare) == NULL) { + if(ndpi_tsearch(entry, fuzzed_data.ConsumeBool() ? &root : NULL, __compare) == NULL) { ndpi_free(entry); } else { /* Keep one random entry really added */ @@ -65,7 +65,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { for (i = 0; i < num_iteration; i++) { e = fuzzed_data.ConsumeIntegral(); - ndpi_tfind(&e, &root, __compare); + ndpi_tfind(&e, fuzzed_data.ConsumeBool() ? &root : NULL, __compare); } /* Search of an added node */ if (is_added) { diff --git a/fuzz/fuzz_gcrypt_light.cpp b/fuzz/fuzz_gcrypt_light.cpp index 043a90d0d..0186c93a2 100644 --- a/fuzz/fuzz_gcrypt_light.cpp +++ b/fuzz/fuzz_gcrypt_light.cpp @@ -125,6 +125,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { gpg_strerror_r(rc, buf_err, sizeof(buf_err)); + gpg_strerror_r(static_cast(fuzzed_data.ConsumeIntegral()), buf_err, sizeof(buf_err)); + ndpi_free(enc_out); return 0; diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index a88b0c43a..432b829df 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -465,6 +465,9 @@ char* ndpi_intoav4(unsigned int addr, char* buf, u_int16_t bufLen); u_int16_t icmp4_checksum(u_int8_t const * const buf, size_t len); +ndpi_risk_enum ndpi_network_risk_ptree_match(struct ndpi_detection_module_struct *ndpi_str, + struct in_addr *pin /* network byte order */); + int load_protocols_file_fd(struct ndpi_detection_module_struct *ndpi_mod, FILE *fd); int load_categories_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd, void *user_data); int load_malicious_sha1_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 96c7e7cb5..d05032b57 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2603,6 +2603,9 @@ ndpi_risk_enum ndpi_network_risk_ptree_match(struct ndpi_detection_module_struct ndpi_prefix_t prefix; ndpi_patricia_node_t *node; + if(!ndpi_str || !ndpi_str->ip_risk_ptree) + return(NDPI_NO_RISK); + /* Make sure all in network byte order otherwise compares wont work */ ndpi_fill_prefix_v4(&prefix, pin, 32, ((ndpi_patricia_tree_t *) ndpi_str->ip_risk_ptree)->maxbits); node = ndpi_patricia_search_best(ndpi_str->ip_risk_ptree, &prefix); @@ -4918,11 +4921,15 @@ int load_category_file_fd(struct ndpi_detection_module_struct *ndpi_str, */ int ndpi_load_categories_dir(struct ndpi_detection_module_struct *ndpi_str, char *dir_path) { - DIR *dirp = opendir(dir_path); + DIR *dirp; struct dirent *dp; int failed_files = 0; int num_loaded = 0; + if(!ndpi_str || !dir_path) + return(0); + + dirp = opendir(dir_path); if (dirp == NULL) return(0); @@ -11102,9 +11109,12 @@ char *ndpi_get_config(struct ndpi_detection_module_struct *ndpi_str, NDPI_LOG_DBG(ndpi_str, "Get [%s][%s]\n", proto, param); for(c = &cfg_params[0]; c && c->param; c++) { - if(((proto == NULL && c->proto == NULL) || - (proto && c->proto && strcmp(proto, c->proto) == 0)) && - strcmp(param, c->param) == 0) { + if((((proto == NULL && c->proto == NULL) || + (proto && c->proto && strcmp(proto, c->proto) == 0)) && + strcmp(param, c->param) == 0) || + (proto && c->proto && + strcmp(c->proto, "$PROTO_NAME_OR_ID") == 0 && + strcmp(param, c->param) == 0)) { return cfg_ops[c->type].fn_get((void *)((char *)&ndpi_str->cfg + c->offset), proto, buf, buf_len); } diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index b80485c96..17e15b839 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -2955,13 +2955,8 @@ u_int8_t ndpi_check_flow_risk_exceptions(struct ndpi_detection_module_struct *nd return(1); break; - case NDPI_MAX_RISK_PARAM_ID: - /* Nothing to do, just avoid warnings */ - break; - default: - printf("nDPI [%s:%u] Ignored risk parameter id %u\n", - __FILE__, __LINE__, params[i].id); + NDPI_LOG_ERR(ndpi_str, "Ignored risk parameter id %u\n", params[i].id); break; } } diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c index 552d2618f..53ec251c5 100644 --- a/src/lib/protocols/jabber.c +++ b/src/lib/protocols/jabber.c @@ -53,8 +53,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_ struct ndpi_packet_struct *packet = &ndpi_struct->packet; int i, left = packet->payload_packet_len-x; - if(left <= 0) return; - for(i=0; jabber_strings[i].string != NULL; i++) { if(ndpi_strnstr((const char*)&packet->payload[x], jabber_strings[i].string, left) != NULL) { ndpi_int_jabber_add_connection(ndpi_struct, flow, jabber_strings[i].ndpi_protocol, NDPI_CONFIDENCE_DPI); diff --git a/tests/cfgs/default/pcap/ossfuzz_seed_fake_traces_2.pcapng b/tests/cfgs/default/pcap/ossfuzz_seed_fake_traces_2.pcapng index 2606339323c9208253aa46c02f9e280c2b52a033..5b387db9a0d041d12399c34957d3682f074ccd2a 100644 GIT binary patch delta 2006 zcmbW2Pe|KP9LHa4tJ0xVd)a9gL81p^?ZOV$Iw$yNg9*Yw6sDv#w4F9BX)2u?rVNIs z`3FxsDRUPY>)37Xw99rGE1p^pV_y6NGC^>9*|d9q^4gcy7PbeErb&38e15<8O@6JJ zKc&o8TV0)PdBxh|cee*5SyDoNU;)G6zN7>szZiA4j)oK|78I4~HmAV5dAGB5Fr+$X z$#GQlPm2L*$|=Uk)%MQ$xGyfNakq^!I|^>e{#lfCo}*Uh=?r3(PFC6~3BYi*vf?U(4h zsj8}mFp62efrM581^|L}f21(0Bcq(&+kzU=A;)P1>5i$2B!;`lk24XTkz-!&k?8YDN|%2oB*`jA&g!>#xuB{>yE-}~ zH7F?wp4`eult2erBgQ#rB_$S$$X>3KcX65;@p7RsuPX6qFd|F5KN9A8;G-ieWXG1U zYVzoc64DBed`5Ohf2f__u0<%AN!m@hLIsiBaT>3!l|arvfc?@wQHU^vOE^a%dYdx1 zO$}_DP8af!62{mTWx#dVLH5GP7i{vILKu^5vIKIvK&n(+t#}^767nK?*tq8G!~5mqy4!;w51&xR&WY9GIs0~o9*D#hUdiWmyygMAV2lt8yU|by z21??(bMkhm^A!Z1m&6saJaC#c!^?r)Y_}k+{65&djm@4FnVm!6hM{^osL&!duG{rm zYQKD5cY86!b|r+3>v+>4viXm=YX6v57}w^axHgxI>(BaBg$iz_kes&apmtUV?$?Ir zEFCuF727o(7D~vrY2)JgL4`Km!4*tW2HAk=Fm4k{l15*vg06;KRD^84Ly*-* p3SmTKLtHUqlxG?E%SApA*DfoX^kEZ?LUa=un!Gk{I3z+Le*tTY3lucMGmBD-GZKrk zH5E+s4D`$tG~6>w6v`m%g2d$P#Prk@g~Vcrtgc~QYDK}sLSYU=O$HE{vavV09{|!1 BA9nx% diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out index ecea4b379..fd4520ec4 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out @@ -1,10 +1,10 @@ Guessed flow protos: 1 -DPI Packets (TCP): 30 (7.50 pkts/flow) +DPI Packets (TCP): 38 (6.33 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 1 (flows) -Confidence DPI : 5 (flows) -Num dissector calls: 956 (159.33 diss/flow) +Confidence DPI : 7 (flows) +Num dissector calls: 982 (122.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) @@ -22,19 +22,22 @@ Patricia risk mask: 0/0 (search/found) Patricia risk mask IPv6: 0/0 (search/found) Patricia risk: 0/0 (search/found) Patricia risk IPv6: 0/0 (search/found) -Patricia protocols: 12/0 (search/found) +Patricia protocols: 16/0 (search/found) Patricia protocols IPv6: 0/0 (search/found) PostgreSQL 10 689 1 Usenet 12 1099 2 +TruPhone 16 1326 2 TeamViewer 59 31448 1 WireGuard 4 592 2 -Acceptable 85 33828 6 +Acceptable 101 35154 8 1 TCP 192.168.0.1:8787 <-> 10.10.10.1:32177 [proto: 148/TeamViewer][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 12][cat: RemoteAccess/12][25 pkts/14755 bytes <-> 34 pkts/16693 bytes][Goodput ratio: 90/89][2.12 sec][bytes ratio: -0.062 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 79/59 277/257 105/90][Pkt Len c2s/s2c min/avg/max/stddev: 60/54 590/491 1514/1514 585/593][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (XDsiBZ)][Plen Bins: 0,19,2,5,2,0,0,0,0,0,0,5,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,15,5,0,2,2,2,0,0,0,0,0,0,29,0,0] 2 TCP 172.16.20.244:59038 <-> 172.16.20.75:5432 [proto: 19/PostgreSQL][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Database/11][6 pkts/416 bytes <-> 4 pkts/273 bytes][Goodput ratio: 2/0][0.02 sec][bytes ratio: 0.208 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 4/9 17/18 7/9][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 69/68 78/74 5/3][Plen Bins: 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 3 TCP 172.26.235.166:55630 <-> 172.30.92.62:119 [proto: 93/Usenet][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Web/5][4 pkts/293 bytes <-> 2 pkts/264 bytes][Goodput ratio: 7/47][0.02 sec][bytes ratio: 0.052 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/17 6/17 17/17 8/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/74 73/132 87/190 9/58][PLAIN TEXT (200 Leafnode NNTP Daemon)][Plen Bins: 50,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 4 TCP 192.168.190.20:55630 <-> 192.168.190.5:119 [proto: 93/Usenet][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Web/5][4 pkts/278 bytes <-> 2 pkts/264 bytes][Goodput ratio: 2/47][0.02 sec][bytes ratio: 0.026 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/17 6/17 17/17 8/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/74 70/132 74/190 4/58][PLAIN TEXT (200 Leafnode NNTP Daemon)][Plen Bins: 50,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 5 UDP 10.9.0.1:43462 <-> 10.9.0.2:51820 [proto: 206/WireGuard][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 2][cat: VPN/2][1 pkts/190 bytes <-> 1 pkts/106 bytes][Goodput ratio: 77/60][0.00 sec][Plen Bins: 0,0,50,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 6 UDP 10.147.205.42:43462 <-> 10.45.123.132:51820 [proto: 206/WireGuard][IP: 0/Unknown][Encrypted][Confidence: Match by port][DPI packets: 2][cat: VPN/2][1 pkts/190 bytes <-> 1 pkts/106 bytes][Goodput ratio: 77/60][0.00 sec][Plen Bins: 0,0,50,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 TCP 127.0.0.1:54898 <-> 127.0.0.1:1299 [proto: 101/TruPhone][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: VoIP/10][5 pkts/457 bytes <-> 3 pkts/206 bytes][Goodput ratio: 26/0][8.94 sec][bytes ratio: 0.379 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/7477 2235/7477 7477/7477 3085/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 91/69 185/74 47/4][PLAIN TEXT (stream)][Plen Bins: 0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 TCP 127.0.0.1:55536 <-> 127.0.0.1:1299 [proto: 101/TruPhone][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: VoIP/10][5 pkts/457 bytes <-> 3 pkts/206 bytes][Goodput ratio: 26/0][20.44 sec][bytes ratio: 0.379 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/6290 5110/6290 14151/6290 5817/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 91/69 185/74 47/4][PLAIN TEXT (stream)][Plen Bins: 0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 5 TCP 172.26.235.166:55630 <-> 172.30.92.62:119 [proto: 93/Usenet][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Web/5][4 pkts/293 bytes <-> 2 pkts/264 bytes][Goodput ratio: 7/47][0.02 sec][bytes ratio: 0.052 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/17 6/17 17/17 8/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/74 73/132 87/190 9/58][PLAIN TEXT (200 Leafnode NNTP Daemon)][Plen Bins: 50,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 6 TCP 192.168.190.20:55630 <-> 192.168.190.5:119 [proto: 93/Usenet][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Web/5][4 pkts/278 bytes <-> 2 pkts/264 bytes][Goodput ratio: 2/47][0.02 sec][bytes ratio: 0.026 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/17 6/17 17/17 8/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/74 70/132 74/190 4/58][PLAIN TEXT (200 Leafnode NNTP Daemon)][Plen Bins: 50,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 7 UDP 10.9.0.1:43462 <-> 10.9.0.2:51820 [proto: 206/WireGuard][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 2][cat: VPN/2][1 pkts/190 bytes <-> 1 pkts/106 bytes][Goodput ratio: 77/60][0.00 sec][Plen Bins: 0,0,50,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 8 UDP 10.147.205.42:43462 <-> 10.45.123.132:51820 [proto: 206/WireGuard][IP: 0/Unknown][Encrypted][Confidence: Match by port][DPI packets: 2][cat: VPN/2][1 pkts/190 bytes <-> 1 pkts/106 bytes][Goodput ratio: 77/60][0.00 sec][Plen Bins: 0,0,50,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]