From d577508727226d44a713f1af38b08769546edd2a Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 24 Jan 2024 21:16:58 +0100 Subject: [PATCH] fuzz: extend fuzzing coverage (#2281) --- .gitignore | 3 +- example/protos.txt | 1 + fuzz/Makefile.am | 29 ++- .../04d093aff831ee1f106282b79281614b8142d91f | Bin 1024 -> 0 bytes .../080eefec3d658696f6fdaf478e5ac1739c74e87b | Bin 1366 -> 0 bytes .../090a521b47c35bf722a930e4432aa2d730ee8332 | Bin 1032 -> 0 bytes .../0925b0ebe5718061127a9644b6b7d93980d14e3d | Bin 1024 -> 0 bytes .../0c4d7507f7afda93d5676b0756e4903fb3dacf60 | Bin 3073 -> 0 bytes .../0cde5ac31a755afdcdbb10c139831665a36dda75 | Bin 1026 -> 0 bytes .../0d001e9c537a1cf7da294ea889f4e2e9ce3c13e0 | Bin 2201 -> 0 bytes .../13ed262cfca6f60fe738ef6cdfa2b56e5dc2d8da | Bin 1024 -> 0 bytes .../14518d096ece2abb8a2dd7327514f24d6cd48b58 | Bin 1074 -> 0 bytes .../15eb3eb3d65eba1b2a8cb71c2148766114962ac7 | Bin 1873 -> 0 bytes .../1b33c6dae5a35eee9358136515bbe1ee207a3d49 | Bin 1024 -> 0 bytes .../1e7eb80c8e1d8f9b7314b470d92c6be020b97e68 | Bin 1027 -> 0 bytes .../206d5c79d04ccdb3b0d946abbc94d4b637039107 | Bin 1059 -> 0 bytes .../219cdafc24a0ebab673b49203f3cbbd6efde7000 | Bin 2095 -> 0 bytes .../21b1e04ce1c6eb7bdf43328e5c47b15fa44d6f4f | Bin 1024 -> 0 bytes .../24ccf941ae8c4b95303a148da73d2348619eab9a | Bin 1024 -> 0 bytes .../29afd7f67f6a46c398d71cd9e5ecce787d7f1176 | Bin 1027 -> 0 bytes .../2a286cbf9d32f6de497f91438b0f93c831893d06 | Bin 1024 -> 0 bytes .../2be813450d93a51bd5f047adb730c7929820f643 | Bin 1591 -> 0 bytes .../2c1289ca6c27b79cebb54dc39a55a3fe9fc6bbf9 | Bin 1028 -> 0 bytes .../2c48dce4e16ebb7bbeaa65a5cf0803baa3925a06 | Bin 1024 -> 0 bytes .../2c8502a8cc05c9877c0292567494678a54ee1e38 | Bin 1024 -> 0 bytes .../2cefff96a3039cdbef3c3a6ba41d0b2fe1a24dde | Bin 1024 -> 0 bytes .../2dbc0e121b164c9ef8cc50247c2fadc3aae9360c | Bin 1024 -> 0 bytes .../31416f580807982a721aa329e749589b643bde35 | Bin 2077 -> 0 bytes .../31accd2800389b82f8dc68979878c6556982bbb1 | Bin 1772 -> 0 bytes .../3676c7c3052ee8bf7202ab9cdd06f678d8c47266 | Bin 1024 -> 0 bytes .../36b3014210a0794308ae1181d4a8ad08e98f28fd | Bin 1026 -> 0 bytes .../3ace63222163540c03cd16910add24236483139d | Bin 1024 -> 0 bytes .../3cd758923493dc4269e956dcd2275cacb70b3d06 | Bin 2233 -> 0 bytes .../40225fbb10ed02053853ce61f3561a1c2eaadd8f | Bin 1355 -> 0 bytes .../414970dac4e5e56fce119eee76544cf64a14dfe9 | Bin 1098 -> 0 bytes .../41525d340f74f45d774491a3ff3cb09b5c40ae96 | Bin 2002 -> 0 bytes .../4257941232d8d6fd686dc09b71405dfd24aef634 | Bin 1759 -> 0 bytes .../442d5de73c8b73fd39975a5bd03c8d81c9397f2f | Bin 2098 -> 0 bytes .../47ed8baadac2f946a298d232123e4e84684e9564 | Bin 1024 -> 0 bytes .../49b434649dca7dfd496b4dcaa4367804c526abce | Bin 1027 -> 0 bytes .../4faa575adf7479a26e898cc388d43bfc56abc3ee | Bin 1085 -> 0 bytes .../50973022d553441dc116887c25f6dc84912ba703 | Bin 2110 -> 0 bytes .../521991a268c2e02c6f7be45c9526cfe88b2e3f7f | Bin 1024 -> 0 bytes .../530bdb11fe9270a52123f0faeed18c46b5f94fd9 | Bin 1024 -> 0 bytes .../54b73015a7a5041d00f84d67d51832d48c2b9907 | Bin 1024 -> 0 bytes .../599faaa27c2503b734bcd44fd3de9c9adb388bbb | Bin 2193 -> 0 bytes .../59a871d0625a68595b0e676966b003e5d9bb2cf3 | Bin 1024 -> 0 bytes .../5bbea5577dd3884eae9bb1e1979f2794d591f250 | Bin 1024 -> 0 bytes .../63fd84fdb4c93e5051b131e7283d1edbf2346d97 | Bin 1539 -> 0 bytes .../6420e92ebf6d3056821f7e7dd2e12d0d2dfb716f | Bin 1272 -> 0 bytes .../68765021cb1305cb14753ce1ffb2e6b0ca98f670 | Bin 1027 -> 0 bytes .../68aa130fbb2ffb67d937d0726e6335332039beb2 | Bin 1024 -> 0 bytes .../6a5d9322d42293dbbed245169604641ddcc6c736 | Bin 1024 -> 0 bytes .../6b9d2fb5531fdf9064209020a9f28487f94b7ad2 | Bin 1758 -> 0 bytes .../6eebb0b657faa02d74cbe782acb06014a09e1681 | Bin 1026 -> 0 bytes .../7218671551e49d714af5c9a0363debc41f69b07f | Bin 1024 -> 0 bytes .../74cc48645729d7afccc86b88ebdc525ec8e8639e | Bin 1024 -> 0 bytes .../75bfb98cd2a35dc1af93c58279ea057d45ea09e6 | Bin 1024 -> 0 bytes .../789b485a90d58fdb8817484cd8d0fb125d1ccbeb | Bin 1024 -> 0 bytes .../791eeff6a8158407fcf41885f5114b42576bdc5e | Bin 1710 -> 0 bytes .../800207865abd6b8e974f7d8ca1165f88fb706da7 | Bin 1061 -> 0 bytes .../80d1a9bbd11a273f303b92ca65e2eca5221274c7 | Bin 2180 -> 0 bytes .../82b0d13945b9d20c7b91ed26645f1e4b0b4e5a67 | Bin 2009 -> 0 bytes .../83a6b52b1116271058025d5d622cf1412dfa5701 | Bin 1058 -> 0 bytes .../83c0a0d3cf3f29cddddeb7c355138ae236bf5727 | Bin 1025 -> 0 bytes .../8b3d2f65163ff2351bf9a5bbf7dfbaeace054246 | Bin 1024 -> 0 bytes .../8b3fa51f3ea12e0ab1f2e4338f0bbdd167995c98 | Bin 1123 -> 0 bytes .../8dc1dd8e66922ff701c798bbe91d19b37f58495f | Bin 1024 -> 0 bytes .../8e77a1ae0ef5ee0974856f2a0318b46e98f0e4f9 | Bin 1024 -> 0 bytes .../8f2f7f037ede54b9812983536b8a973db7dfe5ec | Bin 1024 -> 0 bytes .../8f7756178046d60be6bf9eb02d2920c208aa7a7d | Bin 1040 -> 0 bytes .../921441816405adb82a95beb9e829eb2d07364e39 | Bin 1025 -> 0 bytes .../94cfe0c7f792ee42ff43e5559fe0375323b9b68a | Bin 1026 -> 0 bytes .../95107e7dc7612da1d0905556f401953c06b3507e | Bin 1024 -> 0 bytes .../9764794fc2c7bcb80ca3f42525e4d4e8e32a088f | Bin 1076 -> 0 bytes .../99a846729e1fa67dde649843fdf554d3d5c14d1e | Bin 2180 -> 0 bytes .../9ba1d8c0a69decdd9035db4c60a2aaf66daa9fc1 | Bin 1025 -> 0 bytes .../9c3e465891504c1549a8f2d82dc9416c6f029d00 | Bin 1024 -> 0 bytes .../9cb9002b518cf7158ddd8023b9559f629591cf56 | Bin 1038 -> 0 bytes .../9cc3c1a480c0872bc2f3e8e9539a46951436c1c3 | Bin 1043 -> 0 bytes .../9cd8475553e593641897c96d7abd7463f49c2682 | Bin 1024 -> 0 bytes .../9d598f7fa3cdf08e373f27caf61c012aae75ce4d | Bin 1024 -> 0 bytes .../9fa60713c5ae1f3726ae70fd4e8c230c27e10a7e | Bin 1024 -> 0 bytes .../a7302ca6b5de89a8840072d6bc28184881e7e5c7 | Bin 1024 -> 0 bytes .../a7780546d30ae4eb791b6cef858b87dcf915307b | Bin 3825 -> 0 bytes .../a91405def886e3eccd8ee813609ef32d0b02815b | Bin 1503 -> 0 bytes .../aa0a7045de571ac72c4bef04373965d3c062a802 | Bin 1024 -> 0 bytes .../acadff503aae63ba452f693f9b1af75beeb871c2 | Bin 1031 -> 0 bytes .../ad11755d5c38e9b4f78b89ea0115891f1e503512 | Bin 1104 -> 0 bytes .../ad56cf4fbb246dbfea16651702230fda3e0c9c83 | Bin 2163 -> 0 bytes .../ae2ee75e6177727ac0387e2c99ae3a761827d68e | Bin 1688 -> 0 bytes .../b042b35030eb170c6507e14dd6f00a6e1b670612 | Bin 1024 -> 0 bytes .../b41236f1031a78544a0cbed30399f5c63810c858 | Bin 1050 -> 0 bytes .../b688eaaf60534a0470b8a153c71dd52f6acde043 | Bin 1024 -> 0 bytes .../bafbbb41dfbb7cc1be135d34ad282d54d14fb308 | Bin 1203 -> 0 bytes .../bcd8153bc8760c12dccfc81e6fce1cee6dc2c1b4 | Bin 1024 -> 0 bytes .../bff088bb8cea1b5dd229632d70941de8c9415889 | Bin 1235 -> 0 bytes .../c4b1f93b79ffcc468bf487d36c12a53f2e20f5be | Bin 1025 -> 0 bytes .../c550a457be7c8589680c0d0eb3a36f3e48d96b17 | Bin 2178 -> 0 bytes .../c8d112d02108163b41a166b147a7a44922d7ab49 | Bin 1284 -> 0 bytes .../d0b0b56e3a3b9092ab75b212aa07777c48013050 | Bin 1024 -> 0 bytes .../d35119bcdc064dfd438dd5dc943a7d6e64b118bc | Bin 1024 -> 0 bytes .../d47ffc046a3a67b46138121d4b0752cb770380ae | Bin 2266 -> 0 bytes .../d5c613293379f84fd9d30da74953c74336b3efc7 | Bin 1024 -> 0 bytes .../d9ea126774547be83e8514cf14bfc46b90e04ae1 | Bin 1025 -> 0 bytes .../e0b35272e42e26f2396fb30f2601afebeec4760b | Bin 1024 -> 0 bytes .../e0f738b7cc91b246885c5055c7a16ab716053186 | Bin 1039 -> 0 bytes .../e1c65b55e6f0e0f9c878b4127205943903b311c0 | Bin 1267 -> 0 bytes .../e47cab0e163f9522bfd4bc1f3a4f4ef170fe96fd | Bin 2111 -> 0 bytes .../e77f0ad2aede947e4557ca77181c17cfe628e8f9 | Bin 1601 -> 0 bytes .../e9ae65ef89f69cde2b8e5b3e2ce14ac98b2c2289 | Bin 1024 -> 0 bytes .../ea7d1ce3b3df957829182925f48735fd70e28d1c | Bin 1027 -> 0 bytes .../ef6a236812a8235565a4c606ea2c5a9341e4aa41 | Bin 1024 -> 0 bytes .../f10e4c67ca64bdce1cd394fd829bf0b5aeed7071 | Bin 1033 -> 0 bytes .../f24cf8ce6cf0a9e00e9fcef913843d439792379c | Bin 1223 -> 0 bytes .../f415309e92385cbd8c7d1c6a9a7505e933cb2acf | Bin 1024 -> 0 bytes .../f4d7ba52332b71166ca952780db341c5645f04b3 | Bin 1024 -> 0 bytes .../f5f68d29ff553b4e63a3f0bb69e4c940bc46c291 | Bin 1024 -> 0 bytes .../f6fd7dd2bb4542f3d8d253768b6d63777d048afa | Bin 1040 -> 0 bytes .../f9cce96c161f401d73f04ef031404a885eb5da37 | Bin 1024 -> 0 bytes .../fad5cb6b51a97763038b58addeaa2bd725293ac8 | Bin 1040 -> 0 bytes .../fdd08d361bc7e016b6ad2e41d8b167bff2178777 | Bin 1024 -> 0 bytes .../ff72929db2b1fdacd24b1aed103bb307bbac7d7f | Bin 1263 -> 0 bytes .../ff82aaaf9375f24492e1bc709bf1518b827fc83d | Bin 1219 -> 0 bytes fuzz/corpus/fuzz_filecfg_category/comment.txt | 1 + fuzz/corpus/fuzz_filecfg_category/example.txt | 1 + fuzz/fuzz_common_code.c | 1 + fuzz/fuzz_config.cpp | 76 +++++- fuzz/fuzz_ds_ahocorasick.cpp | 6 +- fuzz/fuzz_ds_patricia.cpp | 64 ++++- fuzz/fuzz_filecfg_category.c | 27 +++ fuzz/ipv4_addresses.txt | 1 + src/include/ndpi_api.h | 17 -- src/include/ndpi_private.h | 7 +- src/lib/ndpi_domains.c | 4 + src/lib/ndpi_main.c | 228 ++++-------------- .../default/pcap/custom_rules_ipv6.pcapng | Bin 4456 -> 5396 bytes .../result/custom_rules_ipv6.pcapng.out | 27 ++- tests/ossfuzz.sh | 1 + 139 files changed, 259 insertions(+), 235 deletions(-) delete mode 100644 fuzz/corpus/fuzz_ds_patricia/04d093aff831ee1f106282b79281614b8142d91f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/080eefec3d658696f6fdaf478e5ac1739c74e87b delete mode 100644 fuzz/corpus/fuzz_ds_patricia/090a521b47c35bf722a930e4432aa2d730ee8332 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/0925b0ebe5718061127a9644b6b7d93980d14e3d delete mode 100644 fuzz/corpus/fuzz_ds_patricia/0c4d7507f7afda93d5676b0756e4903fb3dacf60 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/0cde5ac31a755afdcdbb10c139831665a36dda75 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/0d001e9c537a1cf7da294ea889f4e2e9ce3c13e0 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/13ed262cfca6f60fe738ef6cdfa2b56e5dc2d8da delete mode 100644 fuzz/corpus/fuzz_ds_patricia/14518d096ece2abb8a2dd7327514f24d6cd48b58 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/15eb3eb3d65eba1b2a8cb71c2148766114962ac7 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/1b33c6dae5a35eee9358136515bbe1ee207a3d49 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/1e7eb80c8e1d8f9b7314b470d92c6be020b97e68 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/206d5c79d04ccdb3b0d946abbc94d4b637039107 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/219cdafc24a0ebab673b49203f3cbbd6efde7000 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/21b1e04ce1c6eb7bdf43328e5c47b15fa44d6f4f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/24ccf941ae8c4b95303a148da73d2348619eab9a delete mode 100644 fuzz/corpus/fuzz_ds_patricia/29afd7f67f6a46c398d71cd9e5ecce787d7f1176 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2a286cbf9d32f6de497f91438b0f93c831893d06 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2be813450d93a51bd5f047adb730c7929820f643 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2c1289ca6c27b79cebb54dc39a55a3fe9fc6bbf9 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2c48dce4e16ebb7bbeaa65a5cf0803baa3925a06 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2c8502a8cc05c9877c0292567494678a54ee1e38 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2cefff96a3039cdbef3c3a6ba41d0b2fe1a24dde delete mode 100644 fuzz/corpus/fuzz_ds_patricia/2dbc0e121b164c9ef8cc50247c2fadc3aae9360c delete mode 100644 fuzz/corpus/fuzz_ds_patricia/31416f580807982a721aa329e749589b643bde35 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/31accd2800389b82f8dc68979878c6556982bbb1 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/3676c7c3052ee8bf7202ab9cdd06f678d8c47266 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/36b3014210a0794308ae1181d4a8ad08e98f28fd delete mode 100644 fuzz/corpus/fuzz_ds_patricia/3ace63222163540c03cd16910add24236483139d delete mode 100644 fuzz/corpus/fuzz_ds_patricia/3cd758923493dc4269e956dcd2275cacb70b3d06 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/40225fbb10ed02053853ce61f3561a1c2eaadd8f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/414970dac4e5e56fce119eee76544cf64a14dfe9 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/41525d340f74f45d774491a3ff3cb09b5c40ae96 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/4257941232d8d6fd686dc09b71405dfd24aef634 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/442d5de73c8b73fd39975a5bd03c8d81c9397f2f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/47ed8baadac2f946a298d232123e4e84684e9564 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/49b434649dca7dfd496b4dcaa4367804c526abce delete mode 100644 fuzz/corpus/fuzz_ds_patricia/4faa575adf7479a26e898cc388d43bfc56abc3ee delete mode 100644 fuzz/corpus/fuzz_ds_patricia/50973022d553441dc116887c25f6dc84912ba703 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/521991a268c2e02c6f7be45c9526cfe88b2e3f7f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/530bdb11fe9270a52123f0faeed18c46b5f94fd9 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/54b73015a7a5041d00f84d67d51832d48c2b9907 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/599faaa27c2503b734bcd44fd3de9c9adb388bbb delete mode 100644 fuzz/corpus/fuzz_ds_patricia/59a871d0625a68595b0e676966b003e5d9bb2cf3 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/5bbea5577dd3884eae9bb1e1979f2794d591f250 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/63fd84fdb4c93e5051b131e7283d1edbf2346d97 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/6420e92ebf6d3056821f7e7dd2e12d0d2dfb716f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/68765021cb1305cb14753ce1ffb2e6b0ca98f670 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/68aa130fbb2ffb67d937d0726e6335332039beb2 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/6a5d9322d42293dbbed245169604641ddcc6c736 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/6b9d2fb5531fdf9064209020a9f28487f94b7ad2 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/6eebb0b657faa02d74cbe782acb06014a09e1681 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/7218671551e49d714af5c9a0363debc41f69b07f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/74cc48645729d7afccc86b88ebdc525ec8e8639e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/75bfb98cd2a35dc1af93c58279ea057d45ea09e6 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/789b485a90d58fdb8817484cd8d0fb125d1ccbeb delete mode 100644 fuzz/corpus/fuzz_ds_patricia/791eeff6a8158407fcf41885f5114b42576bdc5e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/800207865abd6b8e974f7d8ca1165f88fb706da7 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/80d1a9bbd11a273f303b92ca65e2eca5221274c7 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/82b0d13945b9d20c7b91ed26645f1e4b0b4e5a67 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/83a6b52b1116271058025d5d622cf1412dfa5701 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/83c0a0d3cf3f29cddddeb7c355138ae236bf5727 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8b3d2f65163ff2351bf9a5bbf7dfbaeace054246 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8b3fa51f3ea12e0ab1f2e4338f0bbdd167995c98 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8dc1dd8e66922ff701c798bbe91d19b37f58495f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8e77a1ae0ef5ee0974856f2a0318b46e98f0e4f9 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8f2f7f037ede54b9812983536b8a973db7dfe5ec delete mode 100644 fuzz/corpus/fuzz_ds_patricia/8f7756178046d60be6bf9eb02d2920c208aa7a7d delete mode 100644 fuzz/corpus/fuzz_ds_patricia/921441816405adb82a95beb9e829eb2d07364e39 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/94cfe0c7f792ee42ff43e5559fe0375323b9b68a delete mode 100644 fuzz/corpus/fuzz_ds_patricia/95107e7dc7612da1d0905556f401953c06b3507e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9764794fc2c7bcb80ca3f42525e4d4e8e32a088f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/99a846729e1fa67dde649843fdf554d3d5c14d1e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9ba1d8c0a69decdd9035db4c60a2aaf66daa9fc1 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9c3e465891504c1549a8f2d82dc9416c6f029d00 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9cb9002b518cf7158ddd8023b9559f629591cf56 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9cc3c1a480c0872bc2f3e8e9539a46951436c1c3 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9cd8475553e593641897c96d7abd7463f49c2682 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9d598f7fa3cdf08e373f27caf61c012aae75ce4d delete mode 100644 fuzz/corpus/fuzz_ds_patricia/9fa60713c5ae1f3726ae70fd4e8c230c27e10a7e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/a7302ca6b5de89a8840072d6bc28184881e7e5c7 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/a7780546d30ae4eb791b6cef858b87dcf915307b delete mode 100644 fuzz/corpus/fuzz_ds_patricia/a91405def886e3eccd8ee813609ef32d0b02815b delete mode 100644 fuzz/corpus/fuzz_ds_patricia/aa0a7045de571ac72c4bef04373965d3c062a802 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/acadff503aae63ba452f693f9b1af75beeb871c2 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ad11755d5c38e9b4f78b89ea0115891f1e503512 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ad56cf4fbb246dbfea16651702230fda3e0c9c83 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ae2ee75e6177727ac0387e2c99ae3a761827d68e delete mode 100644 fuzz/corpus/fuzz_ds_patricia/b042b35030eb170c6507e14dd6f00a6e1b670612 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/b41236f1031a78544a0cbed30399f5c63810c858 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/b688eaaf60534a0470b8a153c71dd52f6acde043 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/bafbbb41dfbb7cc1be135d34ad282d54d14fb308 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/bcd8153bc8760c12dccfc81e6fce1cee6dc2c1b4 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/bff088bb8cea1b5dd229632d70941de8c9415889 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/c4b1f93b79ffcc468bf487d36c12a53f2e20f5be delete mode 100644 fuzz/corpus/fuzz_ds_patricia/c550a457be7c8589680c0d0eb3a36f3e48d96b17 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/c8d112d02108163b41a166b147a7a44922d7ab49 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/d0b0b56e3a3b9092ab75b212aa07777c48013050 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/d35119bcdc064dfd438dd5dc943a7d6e64b118bc delete mode 100644 fuzz/corpus/fuzz_ds_patricia/d47ffc046a3a67b46138121d4b0752cb770380ae delete mode 100644 fuzz/corpus/fuzz_ds_patricia/d5c613293379f84fd9d30da74953c74336b3efc7 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/d9ea126774547be83e8514cf14bfc46b90e04ae1 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e0b35272e42e26f2396fb30f2601afebeec4760b delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e0f738b7cc91b246885c5055c7a16ab716053186 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e1c65b55e6f0e0f9c878b4127205943903b311c0 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e47cab0e163f9522bfd4bc1f3a4f4ef170fe96fd delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e77f0ad2aede947e4557ca77181c17cfe628e8f9 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/e9ae65ef89f69cde2b8e5b3e2ce14ac98b2c2289 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ea7d1ce3b3df957829182925f48735fd70e28d1c delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ef6a236812a8235565a4c606ea2c5a9341e4aa41 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f10e4c67ca64bdce1cd394fd829bf0b5aeed7071 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f24cf8ce6cf0a9e00e9fcef913843d439792379c delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f415309e92385cbd8c7d1c6a9a7505e933cb2acf delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f4d7ba52332b71166ca952780db341c5645f04b3 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f5f68d29ff553b4e63a3f0bb69e4c940bc46c291 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f6fd7dd2bb4542f3d8d253768b6d63777d048afa delete mode 100644 fuzz/corpus/fuzz_ds_patricia/f9cce96c161f401d73f04ef031404a885eb5da37 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/fad5cb6b51a97763038b58addeaa2bd725293ac8 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/fdd08d361bc7e016b6ad2e41d8b167bff2178777 delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ff72929db2b1fdacd24b1aed103bb307bbac7d7f delete mode 100644 fuzz/corpus/fuzz_ds_patricia/ff82aaaf9375f24492e1bc709bf1518b827fc83d create mode 100644 fuzz/corpus/fuzz_filecfg_category/comment.txt create mode 100644 fuzz/corpus/fuzz_filecfg_category/example.txt create mode 100644 fuzz/fuzz_filecfg_category.c diff --git a/.gitignore b/.gitignore index 5f46fb3bc..c03fd9d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,7 @@ /fuzz/fuzz_ndpi_reader_payload_analyzer /fuzz/fuzz_filecfg_protocols /fuzz/fuzz_filecfg_categories +/fuzz/fuzz_filecfg_category /fuzz/fuzz_filecfg_malicious_sha1 /fuzz/fuzz_filecfg_malicious_ja3 /fuzz/fuzz_filecfg_risk_domains @@ -105,7 +106,6 @@ /fuzz/fuzz_alg_jitter_seed_corpus.zip /fuzz/fuzz_alg_crc32_md5_seed_corpus.zip /fuzz/fuzz_alg_bytestream_seed_corpus.zip -/fuzz/fuzz_ds_patricia_seed_corpus.zip /fuzz/fuzz_ds_libcache_seed_corpus.zip /fuzz/fuzz_ds_tree_seed_corpus.zip /fuzz/fuzz_ds_ptree_seed_corpus.zip @@ -115,6 +115,7 @@ /fuzz/fuzz_tls_certificate_seed_corpus.zip /fuzz/fuzz_filecfg_protocols_seed_corpus.zip /fuzz/fuzz_filecfg_categories_seed_corpus.zip +/fuzz/fuzz_filecfg_category_seed_corpus.zip /fuzz/fuzz_filecfg_malicious_sha1_seed_corpus.zip /fuzz/fuzz_filecfg_malicious_ja3_seed_corpus.zip /fuzz/fuzz_filecfg_risk_domains_seed_corpus.zip diff --git a/example/protos.txt b/example/protos.txt index 3020cc094..85d335830 100644 --- a/example/protos.txt +++ b/example/protos.txt @@ -62,6 +62,7 @@ ipv6:[247f:855b:5e16:3caf::]/64:100@CustomProtocolE=2048 ipv6:[247f:855b:5e16:3caf::]/64@CustomProtocolF=2049 ipv6:[fe80::76ac:b9ff:fe6c:c124]:12717@CustomProtocolG=2050 ipv6:[fe80::76ac:b9ff:fe6c:c124]:12718@CustomProtocolH=65535 +ipv6:[fe80::76ac:b9ff:fe6c:c124]:12719@CustomProtocolI=65534 # # You can use symbolic IP addreses if you want diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index a0cfc501c..162e02864 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS += fuzz_libinjection fuzz_binaryfusefilter #Internal crypto bin_PROGRAMS += fuzz_gcrypt_light fuzz_gcrypt_aes fuzz_gcrypt_gcm fuzz_gcrypt_cipher #Configuration files -bin_PROGRAMS += fuzz_filecfg_protocols fuzz_filecfg_categories fuzz_filecfg_malicious_sha1 fuzz_filecfg_malicious_ja3 fuzz_filecfg_risk_domains fuzz_filecfg_config +bin_PROGRAMS += fuzz_filecfg_protocols fuzz_filecfg_categories fuzz_filecfg_malicious_sha1 fuzz_filecfg_malicious_ja3 fuzz_filecfg_risk_domains fuzz_filecfg_config fuzz_filecfg_category #Reader utils bin_PROGRAMS += fuzz_readerutils_workflow fuzz_readerutils_parseprotolist @@ -576,6 +576,19 @@ fuzz_filecfg_config_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ $(fuzz_filecfg_config_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ +fuzz_filecfg_category_SOURCES = fuzz_filecfg_category.c fuzz_common_code.c +fuzz_filecfg_category_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION +fuzz_filecfg_category_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS) +fuzz_filecfg_category_LDFLAGS = $(LIBS) +if HAS_FUZZLDFLAGS +fuzz_filecfg_category_CFLAGS += $(LIB_FUZZING_ENGINE) +fuzz_filecfg_category_LDFLAGS += $(LIB_FUZZING_ENGINE) +endif +# force usage of CXX for linker +fuzz_filecfg_category_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_filecfg_category_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ + fuzz_readerutils_workflow_SOURCES = fuzz_readerutils_workflow.cpp fuzz_common_code.c ../example/reader_util.c fuzz_readerutils_workflow_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) fuzz_readerutils_workflow_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) @@ -640,10 +653,6 @@ files_corpus_fuzz_is_stun_tcp := $(wildcard corpus/fuzz_is_stun_tcp/*) fuzz_is_stun_tcp_seed_corpus.zip: $(files_corpus_fuzz_is_stun_tcp) zip -j fuzz_is_stun_tcp_seed_corpus.zip $(files_corpus_fuzz_is_stun_tcp) -files_corpus_fuzz_ds_patricia := $(wildcard corpus/fuzz_ds_patricia/*) -fuzz_ds_patricia_seed_corpus.zip: $(files_corpus_fuzz_ds_patricia) - zip -j fuzz_ds_patricia_seed_corpus.zip $(files_corpus_fuzz_ds_patricia) - files_corpus_fuzz_alg_ses_des := $(wildcard corpus/fuzz_alg_ses_des/*) fuzz_alg_ses_des_seed_corpus.zip: $(files_corpus_fuzz_alg_ses_des) zip -j fuzz_alg_ses_des_seed_corpus.zip $(files_corpus_fuzz_alg_ses_des) @@ -712,6 +721,10 @@ files_corpus_fuzz_filecfg_config := $(wildcard corpus/fuzz_filecfg_config/*) fuzz_filecfg_config_seed_corpus.zip: $(files_corpus_fuzz_filecfg_config) zip -j fuzz_filecfg_config_seed_corpus.zip $(files_corpus_fuzz_filecfg_config) +files_corpus_fuzz_filecfg_category := $(wildcard corpus/fuzz_filecfg_category/*) +fuzz_filecfg_category_seed_corpus.zip: $(files_corpus_fuzz_filecfg_category) + zip -j fuzz_filecfg_category_seed_corpus.zip $(files_corpus_fuzz_filecfg_category) + files_corpus_fuzz_readerutils_workflow := $(wildcard corpus/fuzz_readerutils_workflow/*) fuzz_readerutils_workflow_seed_corpus.zip: $(files_corpus_fuzz_readerutils_workflow) zip -j fuzz_readerutils_workflow_seed_corpus.zip $(files_corpus_fuzz_readerutils_workflow) @@ -728,7 +741,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_ds_patricia_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_config_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_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 cp corpus/fuzz_*seed_corpus.zip . #Create dictionaries exactly as expected by oss-fuzz. @@ -762,6 +775,7 @@ distdir: -o -path './corpus/fuzz_filecfg_malicious_ja3/*' \ -o -path './corpus/fuzz_filecfg_risk_domains/*' \ -o -path './corpus/fuzz_filecfg_config/*' \ + -o -path './corpus/fuzz_filecfg_category/*' \ -o -path './corpus/fuzz_readerutils_workflow/*' \ -o -path './corpus/fuzz_readerutils_parseprotolist/*' \ -o -path './corpus/fuzz_is_stun_udp/*' \ @@ -780,7 +794,6 @@ distdir: -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/*' \ - -o -path './corpus/fuzz_ds_patricia/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}' + -o -path './corpus/fuzz_ds_ptree/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}' all: corpus dictionaries diff --git a/fuzz/corpus/fuzz_ds_patricia/04d093aff831ee1f106282b79281614b8142d91f b/fuzz/corpus/fuzz_ds_patricia/04d093aff831ee1f106282b79281614b8142d91f deleted file mode 100644 index 4dfb06a99a6924dad1d1bd946f6daa7f07be23e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8MF#&NAQ4LAp^$Z9VPon9E2?6E0Jsh)p8-=nZV{Ls1{F99!r+1%OMro5_CFLJ zl{orj11t`}XBLuj#=#sQNbV$oiO=Vh%b_J7D3`0b6>suEI9~#Hb)tTiXEg8`S<VkDK8@ zB2~P0;ZP{axfOi z7%m_ONWp|K=)x!53?G1zg(iV%Jk>0v#@&%E{zf2 JAoYx_{{eFaHC+Gz diff --git a/fuzz/corpus/fuzz_ds_patricia/0c4d7507f7afda93d5676b0756e4903fb3dacf60 b/fuzz/corpus/fuzz_ds_patricia/0c4d7507f7afda93d5676b0756e4903fb3dacf60 deleted file mode 100644 index d534e347d71327ca42f74ec9b1c012ea6e2cb0bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3073 zcmd^BJ5B^K3>^s79)My+L65{4Xt)5y*0daej!4_lK?jH73fzNcr7e)C&0GKlq)13SuE8St7ySto;SMio%D zdx$zWa%b2S+h9tOs8x?bx~JYFz#_qrlmtwaG3weHN~6?_q_m%j+dsujwF6`@c@S$c zp2k|CC~)%xH#|&a8!4*>v1%hY?eR5Gq=VIi=DL4)IX=III(OexGGRXeuLIvy;5T7) zH%*`uuQ(E6-vH6iVczZB;6!Actc7MA%(*creG!y-4*%#O4flqfk*Wa`<6qX%)!+Fl z$2{zT<3fBtVYMRN*X``Q+w3DYq~3*?(7VpL__MGCNRsWLxxvL+gy}EHv?G%*^v}+# O{|e{8kK<*BzhytG1S+rq diff --git a/fuzz/corpus/fuzz_ds_patricia/0cde5ac31a755afdcdbb10c139831665a36dda75 b/fuzz/corpus/fuzz_ds_patricia/0cde5ac31a755afdcdbb10c139831665a36dda75 deleted file mode 100644 index 1d8983877b4f62f48011b0cffa6b8bf1d3e18e01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmcgqI}XAy40Q!89Dxh4a)C;WTnee`&QUl6cVc5Qey(5hQ7Q@pmg2nF?>UZ@{nc!M zTW|V5Ti=v1rIXyg(i&McSGTcNMdQXp6|RnQ-?3bgVelz(-jv1>2PMgvNV`2;WDqF} zv`(o?hEkym;KLRQ!cOiH&G-rSgkYGxY`Nl-^Nxe$N_Sg}0PsC|m5Fs!BRB^++zyGz zIC`EzwiWxN%{|`-L0m~qPw>+omn;qfpNu1F4#7K`o!;VqEsw+=O=W E2Gg<2BLDyZ diff --git a/fuzz/corpus/fuzz_ds_patricia/0d001e9c537a1cf7da294ea889f4e2e9ce3c13e0 b/fuzz/corpus/fuzz_ds_patricia/0d001e9c537a1cf7da294ea889f4e2e9ce3c13e0 deleted file mode 100644 index 6583bb7859b3396a601c93e92a481f1af179fb4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2201 zcmc&!I}XAy3^g5l2*dy*cj_g&5eW&Y+<*hHuyYAk?!r!Reyu|qD^`hcrP{Hd-A1PNZnMw%p{3Sf}}Pg&H1;4rJc7cui{e(R7y?^x7VYbX3)@{$95$IX)% za(eg2?iQBqgeZOMpfLH=@k2W0O)`H@Q z`zSmraWF&1j)B1tQxr{v5sgoP3y#SK-2SYcj42mJ7H}h47jgh1+YS_m`KGoOq6k?U zgUw7d_>Ws9%rQ`#5thIt;55`p|9=8SVD3cFNb!<5fkAu&Cj&!mEkYV@3Ro+M2bOI> fr~t8Gs(=hI8zcsD5lD)Gp{WTh4-y0^g{S}kTbl05 diff --git a/fuzz/corpus/fuzz_ds_patricia/14518d096ece2abb8a2dd7327514f24d6cd48b58 b/fuzz/corpus/fuzz_ds_patricia/14518d096ece2abb8a2dd7327514f24d6cd48b58 deleted file mode 100644 index 24b97cccb212b38cd76acb1b279b9ea22e43ba5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmbVKF%H5o3@oq#&tOGznxsj^KO!L}9uh{rfLM47Gh;slu2UH|N)d3Cs;g@|=lGT} zo?;0>qUy1}t*ZNx=0~8ZE6RtwW?7zz5wZ~ BtOEc5 diff --git a/fuzz/corpus/fuzz_ds_patricia/15eb3eb3d65eba1b2a8cb71c2148766114962ac7 b/fuzz/corpus/fuzz_ds_patricia/15eb3eb3d65eba1b2a8cb71c2148766114962ac7 deleted file mode 100644 index c6ef675b6bc0dd95f8dbd188630c57062a0db10b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1873 zcmd<8MFRivf%o_%L2`G90)$L~$|JdocqWl%Q>qN;ATETXaF~WrfRFVYD#-vfMUsIC zpaD^X&s;2WINXU__#bX5%4IMd$dEXJL3{%znmAf$u%hvST#o?)P?w;&7Z+E&mVzJy z8A_UUU}unKqdqapB?y67xPt$ zM{(ZJayr68D4u|DU;*_P#=uE~0wN3yrh`eiLWm$1G6Yr302?s3FfueTGBh_dGq5l< zurN0^wuI^3#zJ!_ig&}nT0z0VRa;wHGmS|h0hrhs{(u!R002xbFd+Z{ diff --git a/fuzz/corpus/fuzz_ds_patricia/1e7eb80c8e1d8f9b7314b470d92c6be020b97e68 b/fuzz/corpus/fuzz_ds_patricia/1e7eb80c8e1d8f9b7314b470d92c6be020b97e68 deleted file mode 100644 index 46041c9a8d51b170414767db1bb57e592d04ef9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmd<8B@O(?4$`p*gAA^0YHGq_0RsaABM>t%z~!2onwsI9+6ODu7$+n`q_LPxKb_n`LcxqobZvCy|AW}ZfZ{APFS9^WA)G`= X)5xh@2pce1_Yoq{Ob2lnFsTCoRYCa)Oj$cN%d9Ffi0IpgIiQH>k4Mc_0@+Wfm-`s;Yviy1)u?1&ohI{|5#h2H@J# z(f_dlO(iH^G?A5BBRI$owg>4$7C<$JfgwSGWr~;ylBgIIU=KtbqJPoFfrjXbAqy^8 zV7~wc7A;tSkm@88K$AAY+gMqhnw_2h|8F|3x*TC6oQ0H7fB{esN}{*{wzvTYEJoBI g%zy+X+&=0tzy<@2Ls$i7;f`n&g<`d}Vjx@#03l2uHUIzs diff --git a/fuzz/corpus/fuzz_ds_patricia/219cdafc24a0ebab673b49203f3cbbd6efde7000 b/fuzz/corpus/fuzz_ds_patricia/219cdafc24a0ebab673b49203f3cbbd6efde7000 deleted file mode 100644 index fe1c06fb99dba070f499df64314d5be1dc6580a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2095 zcmd5*yA1*{426c`3TC3Bqk#sAhApUa8%3gF19qTc2L?bW*uH#>ET0nzPP`(1v0rS* zx$7K57{g;Mh_QPWtSm9kx{|aqhar=BRnM#yC6m!a2rE-jDJV57Slfj_{rTEJ~qs6Qhidd7+RXpbBsjNO7bmm1Nx;Bcj#_ diff --git a/fuzz/corpus/fuzz_ds_patricia/21b1e04ce1c6eb7bdf43328e5c47b15fa44d6f4f b/fuzz/corpus/fuzz_ds_patricia/21b1e04ce1c6eb7bdf43328e5c47b15fa44d6f4f deleted file mode 100644 index c5db9d0ddb8ea40c18fd4c75c8202d7b8fdfb1e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_YTMob=2=m)J>~uQ^KRfh(T|$t~7_c$+$6}#8s*I>(NJT9}A@Km29ihSKEF%}$ zNW+!q^`LcT4SLAFv$g%O1LK;Z6(_)mVpoR1A=wG{3a8cTP~8x`=PhF8$%L^aDyf?% Mx%ZE_xFB!&06Sjn!vFvP diff --git a/fuzz/corpus/fuzz_ds_patricia/24ccf941ae8c4b95303a148da73d2348619eab9a b/fuzz/corpus/fuzz_ds_patricia/24ccf941ae8c4b95303a148da73d2348619eab9a deleted file mode 100644 index 12d51dac630fb75debf71dff58e229cae95e705f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B^~_71VkIcKosC4N)=oY!gfrTVG&V87ONx?{QqBDyOtGVHQXF2Y5@t5L2zTC z47fk3%0SqH;&_BGHWr2pV2T(SAgog$3K1X3tTo7-+S+;;7iuPqi=e?0wY6Z11xTW} z6T*R6k3@(6v0=E7$N+T@k_3@VEViHtiGul9qY7aMiXMb8J{I-D@HadVk;4$oMi6QY HO-&2{!-UTt diff --git a/fuzz/corpus/fuzz_ds_patricia/29afd7f67f6a46c398d71cd9e5ecce787d7f1176 b/fuzz/corpus/fuzz_ds_patricia/29afd7f67f6a46c398d71cd9e5ecce787d7f1176 deleted file mode 100644 index fe6050b3e14cdebe44f48d77059ea3c5cce836f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmd<8#R2|9!46dL0+ox02Q#1^#sJc`aJD1^1i%GwF>p8!s2hh2x-i(_)${^by@BE+ zsK=>78Ny8QV}-IDU?Lba)Mb*tK{6m0sUV!iNK{~A^&63b2)iIGBXj{IK3*d;NC9w@ zK&GoAS%HHI4Ky6GIECTX02w=(A%=j&aB2WcAnAhIi;wz_EQzEQg^8pFBCd!g4a;^& G3K;+z-YO^n diff --git a/fuzz/corpus/fuzz_ds_patricia/2a286cbf9d32f6de497f91438b0f93c831893d06 b/fuzz/corpus/fuzz_ds_patricia/2a286cbf9d32f6de497f91438b0f93c831893d06 deleted file mode 100644 index 1bf7effaed8c086ea9d2089802746132f1985057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8g@XTZ@EyWpV1P*>(KSs?O-Ni+Cd`CCFb0V>^dXph5zvm!3Fs;J^dSkr!0r1swM;h&S+n{vddr ztYfF8Di?&9L*hy7*q$UcWc2;rEn(Rc@(x*R=8y2qHiQzpE7}7?S4YC^gKrz_8td() zX)jFc=kxBsaTQ_mk_#@ZGByVANZua=V~y#&Gu}2SC^ZJ;jh5*evV>6c|9mb zB!p4QV!kSPHO*SX=>X&vPD;_J>i4p&FlfjtdRb5%V&Ia*S~fAmjZDd9=I;St<${rm diff --git a/fuzz/corpus/fuzz_ds_patricia/2c1289ca6c27b79cebb54dc39a55a3fe9fc6bbf9 b/fuzz/corpus/fuzz_ds_patricia/2c1289ca6c27b79cebb54dc39a55a3fe9fc6bbf9 deleted file mode 100644 index 0edbf0af5de837ce96b712995c8f8684bb0500fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1028 zcmbtTy-ou$40aEuz5!c@&gkxX<IUnLX)A5rthyj$?_A4;;-+1+ zAqI2eJmP=1Vahhpq!FlXWN<0~H>1yJz!NtS0MAT$x4_au4kG*SW67TkkBg?vH}}ug m>?;0>FQ08pg`pjdif0VWheQuVv(ZhP^fPxfIOMBF3w;Ad2+>ji diff --git a/fuzz/corpus/fuzz_ds_patricia/2c48dce4e16ebb7bbeaa65a5cf0803baa3925a06 b/fuzz/corpus/fuzz_ds_patricia/2c48dce4e16ebb7bbeaa65a5cf0803baa3925a06 deleted file mode 100644 index b663fb5e727cabe4766054efd2f72082254dccc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8t*x)c2L7Xf+FAy@04)EXfuX4htPP|Vi=ik+f;lM0f%+ljWcWb^@Dqm_pnzv>!E_s@V;so=+~jD&t_RsgaQ8CI2d5kd SFo{e6Rs4nVab(}7CI$fISu2nL diff --git a/fuzz/corpus/fuzz_ds_patricia/2c8502a8cc05c9877c0292567494678a54ee1e38 b/fuzz/corpus/fuzz_ds_patricia/2c8502a8cc05c9877c0292567494678a54ee1e38 deleted file mode 100644 index 0816e402e5285b03758d819f1c5745b921bcffea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8t!2OiqEX~(u>b~!|3H960=E#0oPauWT7}6ALl1TdSS NmZA1P0|O)Le*m?QRCoXY diff --git a/fuzz/corpus/fuzz_ds_patricia/2dbc0e121b164c9ef8cc50247c2fadc3aae9360c b/fuzz/corpus/fuzz_ds_patricia/2dbc0e121b164c9ef8cc50247c2fadc3aae9360c deleted file mode 100644 index e7991e4e2a3b7241156376ca17ecda8f8336570e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B?kN_7C4|QL^r+g2{*$BbVW#fboI5h3_!pI6b4c#l6tfPU|UdZLvkOKiQ*EN z2CUAkoljqYE|KAwa;$kT`+SJ^w6-%~cBkR4WN< diff --git a/fuzz/corpus/fuzz_ds_patricia/31416f580807982a721aa329e749589b643bde35 b/fuzz/corpus/fuzz_ds_patricia/31416f580807982a721aa329e749589b643bde35 deleted file mode 100644 index b6d28ca14a260c29663d0d78f2db77c2997ca971..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2077 zcmc&#J5B>J5M9zBLX(<;DkVs^*WlfPGtjxA;s_kT5>h0tfM|09j)LguIRFwR62ZS2 zkBu>`Kw*l^d-nW1>v86$C7Xs&KQQb5Qc{99h>tq$0dkq=mRJQ#r9QiQ-tS&6!JuC2 z^}%6xZ*981zW5&rJJRP)2z^2w}mkVrYi?5|4KMZp};5Uw5RojC%66=yGspPxSC!Kg3F#O ze#(XuHmJTI8!V4zt6hX_6owi z`F`5js3cQduk0I7-HR HdNDo#KkMgi diff --git a/fuzz/corpus/fuzz_ds_patricia/31accd2800389b82f8dc68979878c6556982bbb1 b/fuzz/corpus/fuzz_ds_patricia/31accd2800389b82f8dc68979878c6556982bbb1 deleted file mode 100644 index ad7862b3bdea6dc96adcc0ba838c8eba41283601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmd<8B?kN_60HC4fUXkV_`)aLP$k^RQs~-n@)ms!ka&QB?e4q(|A}`bP$dJ@4G@QkRov~5Q9(zNw8^z!?KnO9)!K50=Q0s g43xA;dGrwqDFy~b6eSKQJWP%zrVvmBEu#Si0Iy_rEdT%j diff --git a/fuzz/corpus/fuzz_ds_patricia/36b3014210a0794308ae1181d4a8ad08e98f28fd b/fuzz/corpus/fuzz_ds_patricia/36b3014210a0794308ae1181d4a8ad08e98f28fd deleted file mode 100644 index 311dc779a31e4f83174ee65d2574f81e9435a7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmd<8#RdKkLSPGa6D}8n#sB|Dmu7&2OgIaJ0n+sUKZY>z0y3<`tA(mWIF$IHW(4ZR zt2z;{EaC721p_)jI26Q!`4e3gK0Ztjg9@AlVQ`_Ejhlzhbn3|I(-ffj8_MNsZpH0o opbWxiDi9`e{D)yR(-11UZ_;i-AX5oR5je0LKo&v;Ynd1r0Q6Bfp8x;= diff --git a/fuzz/corpus/fuzz_ds_patricia/3ace63222163540c03cd16910add24236483139d b/fuzz/corpus/fuzz_ds_patricia/3ace63222163540c03cd16910add24236483139d deleted file mode 100644 index 6d4021771fb0ed1c3c4618f9d5d0db49f87b0193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B@&d@Ok+|=U;u*uBm#s57ZFT!7RX=}0JVe}MUXIuksfvP4Zs6giYY-(!4Vjj>zj9^E><(iwCn&BK21~FEls=2@f z@i3|=As&jQ40qkBL3{%z zm;)vvVcKxe{}INav7$kIkS>Tg*k5Q$FuAC{hr1b+yD$}_i!hjg9SPEfW)3dRsLB{> L8ES!=8CjbEUk&2t diff --git a/fuzz/corpus/fuzz_ds_patricia/3cd758923493dc4269e956dcd2275cacb70b3d06 b/fuzz/corpus/fuzz_ds_patricia/3cd758923493dc4269e956dcd2275cacb70b3d06 deleted file mode 100644 index 34ff5eb1f5c0a18de9dc85610b5c8b3c5f5f3861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2233 zcmc&#tq#IK3~oR%K~P|^2vEELuYdu`uxK0?9GVcqb71j2020NkjN9F|UVA^guq8Ah zv|qorU%L?!;WHq%%(yMGjFobR88fO7$$EOxpr(;&&R}4p*IKh{{*B-z%=>5`b1u*1 z?}mMVEr7(Vg&tiC;=prtGU_Hg?T-2Lc4>^oj)dq~!Yx6gq?QEci5mK|ntC#~E(mS& za}I~rNNq8#W_lHe6k)FPiZ*2!`|aPx*MU`3@+IyoK^*3apZ{EnJ_#miXT&4C*0-lx zBBDlbctn3ip_edDCqSI#N2D;i_b983st47!lfK~d&YQ+=QNAZOKT4YY*OjlhKioRw l4agh#EUI~!gspAum~(lYAD+`VD^v$1r0S(*p^!W-qA!In@9+Qs diff --git a/fuzz/corpus/fuzz_ds_patricia/40225fbb10ed02053853ce61f3561a1c2eaadd8f b/fuzz/corpus/fuzz_ds_patricia/40225fbb10ed02053853ce61f3561a1c2eaadd8f deleted file mode 100644 index 45ac04667952f8507550068ddba8d48bd6fd2ec8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1355 zcmcgr+Yy5>3`_qwc4307diKSf9Pq4Qvdsb`pa%o!E%tjIi z)QFnsJ3u;*ZB*kv=O-Td#)#*MbWvKYQ6Hd^2Ps5 qWEl*=q!5;}60jZdzYOz8m^pA^dhs7sy7`?T3PHTnaMT=Kc`7r+t`M^T diff --git a/fuzz/corpus/fuzz_ds_patricia/414970dac4e5e56fce119eee76544cf64a14dfe9 b/fuzz/corpus/fuzz_ds_patricia/414970dac4e5e56fce119eee76544cf64a14dfe9 deleted file mode 100644 index 3a71d98261770096f821505e2dd3354face3594d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmd<8B^UfB8OW2YgP?}~Jk?ULqB>kk33`u#B!J5r62xKlVbwy=xnKpqumUbL%@7Mz zAQU6eT4Wn9FoE1501=bI0CO-zh!#M$1(j`L5QYh$!NCEg$)pfoN3{}(2R0drPbL## zQ*A9MP?7l{Ho^la7W_rwp>yid1(5g%1A&%-IbbW{!f*$~LRdfvBn7pYA&wz}k(yvC Z3=rU#$**4s9-L)lU}$M#VQBKp2mqZVh&=!R diff --git a/fuzz/corpus/fuzz_ds_patricia/41525d340f74f45d774491a3ff3cb09b5c40ae96 b/fuzz/corpus/fuzz_ds_patricia/41525d340f74f45d774491a3ff3cb09b5c40ae96 deleted file mode 100644 index d510e3f26bf7440fd13a0ac6f713ecd37cb09b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2002 zcmd<8#RV8pK+u15;Q0SPF0Hj7t&9-;(m)EQIvf({Rw4K(8Xy*cNv4lT90c<(^YIh} zk8~EoVjL_K_kcKD5xSEgf)E{q?Gzxa1e*$k&6rL@$YEn4tIrnWV_-;PU;v6?ShABD zLkL~qNO&8PK23CK?0nqG2AgZ~i`An@WAOxbCqP6|^rCQ(g9tfjfNT_XSUC(PVB~`iTpP%TPO^7MPb48N@emA_?PS!o5Lt25vtQWz~S@ zINWZhy3Fv;+|hXA8&|TdtwjrHxEVlk+?t>=HUCdTv;%danS-PmZX|UXD6WIs{tLun N0Om|!iNnbH9{@MFADI9E diff --git a/fuzz/corpus/fuzz_ds_patricia/4257941232d8d6fd686dc09b71405dfd24aef634 b/fuzz/corpus/fuzz_ds_patricia/4257941232d8d6fd686dc09b71405dfd24aef634 deleted file mode 100644 index 95f8933cfb395e824dc308b04a0ab1b2f3c89aed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1759 zcmbtVu};J=3=Joy;|thsxD_es71~bx1H&yW@Bs`6u@T(~BsLZXPJ94ggM<(pJ0HNr zgaok@J5E~C0T0Q0j_uk`tWGV+JFd9=NZC?KN&Y%<3f8^cZ!Y91fo}J8+bkAcA%?GWayytPD05%$z$^N_CGwasBwSe;;ERAK z!39;?bam_Msq;KiZmo!nIfVr-lK5T#oO}erJA-r2%OjHcL|P9$l=#_*qDw&MA3N&v zv^P@G!_|cZi()m^8g`tZYj-+obq3K=@3h55#uw(nQ^w14^UrzdCzgF(>qDo>=R&w) z_ngTeX{KF4CY+Zv!h8qHh6(T;g>0mK4?{$7o?3f(^)Q*8z}0^9i&z1I^DlWpe9XYw zZKc*=800yBJ*aoF*hPRN@^U*rEJ!`b_$1O_qgV`nF?VzJs#uHq E1>yb-@c;k- diff --git a/fuzz/corpus/fuzz_ds_patricia/442d5de73c8b73fd39975a5bd03c8d81c9397f2f b/fuzz/corpus/fuzz_ds_patricia/442d5de73c8b73fd39975a5bd03c8d81c9397f2f deleted file mode 100644 index c39bf4f5ae9162dd4ea4e54c5950837fd20f2f70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2098 zcmc&zOA^8$3`O1b93I7^cmk>f-Uns203}F zD~Y>k1Z%itF3HcQ*Hw!3;SFL+N}9&jVf$O8=uwey-xy$>nT-$3BgB-_ODqIU8qQW%Ya^%ed3GY#uzG&9hztHgf} F-~-uE7IFXp diff --git a/fuzz/corpus/fuzz_ds_patricia/47ed8baadac2f946a298d232123e4e84684e9564 b/fuzz/corpus/fuzz_ds_patricia/47ed8baadac2f946a298d232123e4e84684e9564 deleted file mode 100644 index f10228edd255655225c2bb50795d7f1941667986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B^~^y5nvz)NU)eBZxOVZBn20kpvon2Xp6-mj#C)n8O#ts$iY}3W4M4EAO#b` zpbMXHGki$IP=IMX)kM%e2X-Gq5W|H)0dnldW)4mnCjCYMy(+W#5vG#gK!woLXjXBW+r}m6MkvjvS{{$6(Wm4T}^;8MfGZJEy$Y% zP;(HLGcqv35)(E95%yw}#SlX%hqIo-Sr7)$Y7A`*NKpWD8Uq6;Ei)peWmY)&4rk$F YSi&S&{=itMG!{3|RS4BJ$h@Dd0D{i9EdT%j diff --git a/fuzz/corpus/fuzz_ds_patricia/4faa575adf7479a26e898cc388d43bfc56abc3ee b/fuzz/corpus/fuzz_ds_patricia/4faa575adf7479a26e898cc388d43bfc56abc3ee deleted file mode 100644 index cf9dcf9515fdd9dd2f2e9688d3ae32582bf068c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1085 zcmc&yQ4WJJ2*qi##lv_%O}Z@jy#sj*<8@4QrI>&drTg0ZXy5_w(X@5Qz)(U$Y6YlX zJhNtiI$K2K33avxLWnknSW$bA*sC!WX1ME?Hw#1L##{2B@CPXCxM;IWorLZD^XWl+ zjK#|-2b)BkPm#BjIG#n93irz@K^DkM7zBq=xoZJN~<9DsrYn1(~_3AhiUqlN>}BMA1`^U20` zSnY}_GH=G?H_xAVWpXxTOwPlyg|&{$OD{s^BDkVvs5w&f|0xvXygR0F4uB{k z>81b(RlbCW0Euxq($ASv3hSR7uyM+?Qe9K4Mwe4kBNCRLHIg0#_*`J@{bB!Ri96*Fg1bAk8He)`k;$_Oa(N7qbe;&Ia Y$o+^Q;{CdqJyPOR`9)X)`AP@AUxUD1$p8QV diff --git a/fuzz/corpus/fuzz_ds_patricia/521991a268c2e02c6f7be45c9526cfe88b2e3f7f b/fuzz/corpus/fuzz_ds_patricia/521991a268c2e02c6f7be45c9526cfe88b2e3f7f deleted file mode 100644 index 95ee0a99b821c46f81b20240dbf9b8e17febfd97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_Zw-JCa3=~JlG}Kf~!43?eJ37V|3Ixdn8x9rrzjA1>NB|n~n{Y-1m7*}`L=G#2 z$`bLLnsS_I4?V!zU@o@YURGrgAty-zZ7b0|QkUuqzRt(R&Uucth4r5uGa8-ba#5ke zH}cO#ZGzSf61uTlIBN>Su|91-WEcZea=X7Sbjrl_hP4PQK*9D%#EMDm9AeZy=iaM+ E0mqBW8UO$Q diff --git a/fuzz/corpus/fuzz_ds_patricia/530bdb11fe9270a52123f0faeed18c46b5f94fd9 b/fuzz/corpus/fuzz_ds_patricia/530bdb11fe9270a52123f0faeed18c46b5f94fd9 deleted file mode 100644 index 72d1cec2dad70d870ba8b892a581cf604bdfe33f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmc&x!4ZHU4C5;UxQ~PJ;pal`<0J@Z8i8{1@HC&KfwUE^dq8MV1)B4YA+c3dPpBPm z*_=Q*#%f2HYKv>ko%TN=i*Q@)Pv#j^irH91f;Gx)D{A`&GEWnu>*sHlSEHCIvzn?p hmD=3GQ!=o)Uy*pP;DDsk&vh;Yj90jRi3NAOHwSh6dSw6r diff --git a/fuzz/corpus/fuzz_ds_patricia/54b73015a7a5041d00f84d67d51832d48c2b9907 b/fuzz/corpus/fuzz_ds_patricia/54b73015a7a5041d00f84d67d51832d48c2b9907 deleted file mode 100644 index 5b2e13204f61ee9a51f1c21d5a3565687dfabc39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8{SO4SPyk{B0Rsl;M~J}Gf<t#9NP~ayJqi9>L~|NZ|kl@2flkVaQqaNTPULJUb^Z7n!lKyr`}V)_W7p(H{AMHtFK7=$n! z#zM%!SRhSYKn{?C38BzXLy;swj*5i|BhfHBh@t(lDMGOq%wb^A!tXjvEpU-=Y*t{1 zsenb0d;w%)D8eH^v`5JH2Oi6jq#*u)3+#roa4<+!4^Pm*@TFI*z@1Kg-@uK=#;Bao zu@IX$0Wna(WQ*}JFeG8gO2m{q1l2$s08ilv29*mYghvrpfa4vSIUv~urBFg>!NNig zP*7QeA7C*6w-CHg#cw8>EHuBPi4x@Eb_PV|FZ1yfLTZSUC+HMp1yJ8mmjYT)3bBMZ W7gMYX*+&G~So{jDDv@MBP67ZU@VcG= diff --git a/fuzz/corpus/fuzz_ds_patricia/59a871d0625a68595b0e676966b003e5d9bb2cf3 b/fuzz/corpus/fuzz_ds_patricia/59a871d0625a68595b0e676966b003e5d9bb2cf3 deleted file mode 100644 index 0d747622e64d6df42b500a6255d7b944c407d770..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8#RvZ50m%Ab${2t^9YjzWAnf`LvkFclFgC9LhuX9uqPLp&E-j1i)fU wSY+@DAjSPTrcwLl|a zTw-ZVqw$OU!Y_?SmN*wZhbqGe4GIKcHUk~khzoom1h8tv<6UB(T&P@Nj3!QC U5Z}OwCX9_sK>$%lYf}>g0AQBU>;M1& diff --git a/fuzz/corpus/fuzz_ds_patricia/63fd84fdb4c93e5051b131e7283d1edbf2346d97 b/fuzz/corpus/fuzz_ds_patricia/63fd84fdb4c93e5051b131e7283d1edbf2346d97 deleted file mode 100644 index 9aceece25ebd32ed0246b186dca185aa1fd50931..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1539 zcmcgsJ5B^K3=JbBq@|*y+hSWJCp(atYf#Y8z!5k=1OkZz(5&_VoC1jp&>%W`4!{8r zL*m5FXO;}x;9~M#Vmr@HGBe}s9l!V)*cKk`2qAdRg4f1Q6m#i%z=~6P_dLmlfd82y zF>W+SP$y5bY7Z8)N~3qIdhz1flmP%a-#K9UZzchH-GY{CoRo6JG4(k|vcfO-ICZGu zjdFCSWUHi>C(s>3rIZD)3;D2TTuaP_e-J}*blGe-RVq1@Ua>;MN- zV`$8KT4j7f9y~@qb(fp@h12{+6%N-91x=(RJI~;0%&rhOEMAD0vMsn~bA^CxI86e_ o_Y7eArqQp}VE8O8VR(LcI&j;CO|Xo^Kr$J_KxNEHP_+#418kZ6RR910 diff --git a/fuzz/corpus/fuzz_ds_patricia/6420e92ebf6d3056821f7e7dd2e12d0d2dfb716f b/fuzz/corpus/fuzz_ds_patricia/6420e92ebf6d3056821f7e7dd2e12d0d2dfb716f deleted file mode 100644 index 232c7b6cce69b0d678cc8093d9a3db432a9bcd8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1272 zcmd<8B^~@9lz=3EFfb712aqZT5a?wDQ^*8YCD6u(+ICXxC15Gkcm)E=NRcMRb+rs& zUy@=xRBf$3VSA9n4w>zM%)!Y9S%fA@oI43S3`qqf0KoPjiDEFVI3P{|O4OrEVmK4c z)l}wkf$VR9Is#%g(?@hSVeng;Ktf^k07$Wf;fz|4gMmIMt(nH8kifuD%kT$DIU>dp b8d0S|yjqYU4M2<~lcK5ys{uw2NR$BpBCoPE diff --git a/fuzz/corpus/fuzz_ds_patricia/68765021cb1305cb14753ce1ffb2e6b0ca98f670 b/fuzz/corpus/fuzz_ds_patricia/68765021cb1305cb14753ce1ffb2e6b0ca98f670 deleted file mode 100644 index eac99a3245b373ec2c96f8f30317e57acbcb266d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmd<8#Si|&feM7h$iTn=6AJ^f*%-bb=4F_W2xQ^_22gRBE_51;HiVnd6~p;pU2q=7 zjBo!DcGlK{JPF~WI8F(Lhn<5k2B(|A8ga^!EP>1E2$x`SDa@9?Fb0T*M)7};-^0LQ zI+%p3fe2zDLr}#GumN)mBSRA-Lvuqj0}E3F3v***ONg#TE0J^~TwPmBth?dvLuN35 zwIhoV$wqQaSQx;b! z&O>G~LO5a&$^%)76gI+6xHB-lf{-GCwVMRBaHYTijfQd%E+c|9xC0dKz5i=2jNyqLQ$KV$G=BoIC%)kZ@~Ckl!m*$WMkheUIO*FFJve azg-$sYDUd&(KC&Ky{Eq;AH*;`&AtKQPmN9h diff --git a/fuzz/corpus/fuzz_ds_patricia/6eebb0b657faa02d74cbe782acb06014a09e1681 b/fuzz/corpus/fuzz_ds_patricia/6eebb0b657faa02d74cbe782acb06014a09e1681 deleted file mode 100644 index 985c59bfbebea9cb3c2dfd8b707f71982cc2a80b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmcIiy-EW?5MF~-DkZfb;seYc(LF1%@e!`kB89JzE{lTX1uSA?A&8BotzaXFU?Yc( z@1mSDvpY9)CM1;uyYub*e!H{%%V}IDO)I+ztvTn!Rw14j$foD3r%i-A8qp&t-Kr!_ zGrDzmvzvTOUQKb3#or4;y@AUE9E2eRU*uF#(m=I%NT2ZGn)iGU#+}Wy0yw7AA+Ass zepvXh<@cf7gEE*LW{fc&K3?BG7qH^k7`?JufK0)bsJ;az)FP)Mb)DXnNZRx{Ozo&v zKgRK7*4rN8DBQP(OfU;*6^1qj281Gn-+?iQ6jiK5gF~#AaJ5`O zgLM#wBeReV{|B}87s7VxvY4K==|355@H4F$C7!oHih;QHou?Yf# zijkd)a1@LMavU&JOKT=EDI@?Rj^PiodaRL)QU*uvS83=jYpz{SAf5~y|@vN(lt+4BECiWaEpRG|!ErueZ! zSq?A}3>xY@$=@Iu6c?d!FmxgbAe6#=3lyqD2qUrJDoA4>*~Wpy1~F?((F8!;rY1Ds zfCRaK?f_CquEEblc49P$1JMsMr?h4olR^T}EQUWYRS2^{b|C;l9HtUv4kC2;z<>ur n@tuIuXcSy4h=DL0gN39`idsMp%^*Hv9Rmz)6s0&gz_4FQHrbv#X_2LkZmQ%hWduO6v9@TdKATQu$?%)fzL$m1mWMp7qfLR>|WHT@@G9*r5bk9Ev<^Tx;7z08pp>k1p2rt5n#Gp~s z(~X1S47k8UA^==5kn!z5!jrYNpwL6+gV=CS!Lul#Gs3`NI+%njga~3GLr}#G z43J|9;Uc&}2nI;wqLoP65vq~g4)+8+aS-DRkS>Hxgjqy{{X?iJFb89L9O!pkz|hjn z$k4>x#KaJ$9gVK7H3WNq6LKIRv(eN8xo9zj@MIWRA1Da8YHLetrZFib022qpAFv7r E08Xqq=>Px# diff --git a/fuzz/corpus/fuzz_ds_patricia/791eeff6a8158407fcf41885f5114b42576bdc5e b/fuzz/corpus/fuzz_ds_patricia/791eeff6a8158407fcf41885f5114b42576bdc5e deleted file mode 100644 index 7b5fd54716af7a972819b1864ff4872f50626dad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1710 zcmd<8B?d6?%;RP_kjQ`pz}haMfSD*fFy}vUpcZT}&`1LqFfuT-G_f!=F)|4Yiw*;U z>0lCM9+E4_XM!CDGLqkkk>LT*YhdGX5HME(X-}w?2qAL|BcMAC%?-^AEKCh7%#DpL z!N!E9S$-!7hzlRmRUroqJalUzERY;ptgC?eFmbqMysF@mI06kJ3=Au%;)dFGxHc$* zpx@xGK`@|N85rS0=%y0jV@*U{AWaQOIteQ;7SO&pMfFq0>k1}d0=%dP}K|&fTov$0Zjmt3$%6%+-g(? ziejh*Ad2ZD5{CpP)bt-DXaOl@gs2z8sf`&VgK#X8C*DKY2stndY7m+zK`zYPKQIOn zbQl__ttCPerAkU`rZFib0E2{qc&9?c1P6sLY;3`j5I3W$TfNGVVL~DU16mm1;MUf{ a-8~_u608v#5L~FnLU|;F5~{CiYZ(B+VQ#Yk diff --git a/fuzz/corpus/fuzz_ds_patricia/80d1a9bbd11a273f303b92ca65e2eca5221274c7 b/fuzz/corpus/fuzz_ds_patricia/80d1a9bbd11a273f303b92ca65e2eca5221274c7 deleted file mode 100644 index 58da9a664c352b8cd3b231f7aa2404acf2ecc395..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 zcmd<8B>?{a_)h~sz*1Cc1_p*+Mj!zNAW0Y>RUrzGD?)b?iU5d%>=lTSz6{7>Aa*X* z0lE!9KAOuQD$oRhT#%Q!AT*{VR34-TA&F@hLJr2lZL07<0+{n^Yugb_OxATIP>aMS ziHR9Z=puY102IBz&~>9CzzhIn5l~bzFo8*e#9!v)DG)`T1l59*R4K$J6yH&U1I&5R z*v#p~CP;!9&{v4C`OgB?i4cOYAo-rP1!nLKFoP3BqARVfbsSKD>>ikN|1-?T5qm%t ze_>M1-7prI1{WmI(1A-Jn+{~FfcZdKRPiuEz`(!&rlT3e0P=AGLjwa#a}xt|LnBN> zVP+s`WHr%X&U7#d4+&%i_}EyTV{TytH;6F9(8S2l+|bOx!qmXR+}PL>k9CmnWokos z1ju@W#6#1oId?9@g+vC1FnGkkO>U?&By=~htdrH0UN9-!2kdN diff --git a/fuzz/corpus/fuzz_ds_patricia/82b0d13945b9d20c7b91ed26645f1e4b0b4e5a67 b/fuzz/corpus/fuzz_ds_patricia/82b0d13945b9d20c7b91ed26645f1e4b0b4e5a67 deleted file mode 100644 index 46799067ebc397fcd0a74d7ec40c5609506b88e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2009 zcmd<8B^~_727X`@q*RO~w=pm<^fCeoC;;h&@$s0$6`?x`LmKMt6(qVJ!yJ49Fn1E7 z|1uv>fvE8$q!cI*w6PRoD~WC=Pk9(A+JNptR*o-lFy!!g-4P`D5CU+hQ^O&SENqL+ zA>txZ?KT2qQEvK<-f=77z08}5M4!$jopekG!5 zE4iv;7PD&kHr(cd)zW(c)wU|-0~ l1GUMlTqK_;vb`gw5k>Y756qoGv@JiN=ipd4F7uuo-~)<2(9Qq= diff --git a/fuzz/corpus/fuzz_ds_patricia/83c0a0d3cf3f29cddddeb7c355138ae236bf5727 b/fuzz/corpus/fuzz_ds_patricia/83c0a0d3cf3f29cddddeb7c355138ae236bf5727 deleted file mode 100644 index b1f89eb8c4157c674860e14874188f7f722dcb6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1025 zcmd<8MS!(ygM+}pcP$t|WsJ68m;z!(BUB=>{!<-X0t2A2mxwXCmH`BS4l*z>$YW14 z1X4g?WMCME1Zryyk(>-+no|k%GJ;*eV2*4<*rJti>!ZP}>0lD*BakvKWVOib^|%30 z+5i6#t3clULLvZa85mnZ-h+e%)bTJ1BvA{AY#2Ec#z4^j|HA_k#(+dIoLmZL0U5yf ow=_2~FgG*;ss`HtByf5hrT|P22}dHim>6%uQVg2k5Fu6z0FLD$ng9R* diff --git a/fuzz/corpus/fuzz_ds_patricia/8b3d2f65163ff2351bf9a5bbf7dfbaeace054246 b/fuzz/corpus/fuzz_ds_patricia/8b3d2f65163ff2351bf9a5bbf7dfbaeace054246 deleted file mode 100644 index acaab6e6afb19130df16d419c5cda33fd31f5d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_aOA^8$45edNJq^%U@B$v8H*sgq;YFP3@sI==N~KUo-zItayd<;(HZW(9RcNU$ zU=?V{nl=PcRcCI>J$-PNBc)x{c>--=gi$Lam4V6Fa(9USylh;W?aYS@j{)&^ z7x_E*iIl1!)n~GiaGJ>V6hvYovz*Ez-;=ZmV&?_doczKK2Zn^Mq_x}fj}x4G589m) o5@{Xs1YH|Il>g-AximnfN8nr(Z`-8TI3S3oa_@Eg(S+#x7Z?30;Q#;t diff --git a/fuzz/corpus/fuzz_ds_patricia/8b3fa51f3ea12e0ab1f2e4338f0bbdd167995c98 b/fuzz/corpus/fuzz_ds_patricia/8b3fa51f3ea12e0ab1f2e4338f0bbdd167995c98 deleted file mode 100644 index a799ddcce39569616adb3af29ce0e2f55c43df59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmd<8B^EF+urxr_{wD%}R8}@MHDNKGfq{V$h#45*a?MRm&2UcbgOzHG6A~fPMA(F; zU)*+hGo)geJ}D>I};W0(28Si3EsT2ldbY|L~xPiop5UqJpFl J0V-x-000Y!W|RN` diff --git a/fuzz/corpus/fuzz_ds_patricia/8dc1dd8e66922ff701c798bbe91d19b37f58495f b/fuzz/corpus/fuzz_ds_patricia/8dc1dd8e66922ff701c798bbe91d19b37f58495f deleted file mode 100644 index 6084afb474bb3299032027ef23566ba63ca7d0dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmcIi%MHRX41JZwg)!KG9+8k(g&nvWRpHht*n%B6vyX|}G_pe~ibUVReb4gqC+e0X zIt|Mqs{k3Ye3e*UrFRM4C%l|0cJFlA|^19DQJ1(Ld5(s*L+ad cdrqW(wAqlv`O}>7J4&;|N%M1^{+*}Y8wIf#QUCw| diff --git a/fuzz/corpus/fuzz_ds_patricia/8e77a1ae0ef5ee0974856f2a0318b46e98f0e4f9 b/fuzz/corpus/fuzz_ds_patricia/8e77a1ae0ef5ee0974856f2a0318b46e98f0e4f9 deleted file mode 100644 index c3a15d37a98e6e289767449e1f796d9ede8b671e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B?kQe&qa(fG&SG<69X7oaH?XUKKPGrB*M*@&Ope)SPTrcwLlYKTriDpA}&6P zCNKwNBZyH0lfrZYevx1JrSZtZY{XALhf3q}5;@{98-b2%)M&&3KInhI50Lfk{{KH= z0>c99%H4PY2NKXlVgs3B=m6+Ah!AoR!dwobf#O&^k5B>AheZ)qA#~G#CP7mL%p?Sj fum#2f841dvKnf-VqY>JmE(TH{F$M;pzZn<+C`IFC diff --git a/fuzz/corpus/fuzz_ds_patricia/8f2f7f037ede54b9812983536b8a973db7dfe5ec b/fuzz/corpus/fuzz_ds_patricia/8f2f7f037ede54b9812983536b8a973db7dfe5ec deleted file mode 100644 index f6ca2f3d286a0c93bc4b55a6d34e315fee2cab15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B@O(?4$`p;14Y@f$SA%C36f$lQ1So!SWNnVfr$YOu*nS;v40SUFfbrH2+j8_ z5O2Uqgfy}yDzdo{Hej&sV~9WnNVOl$9Jud@X219^w{yf!EkQ@ZSWNK^w|No0@AdroagRww*Fnj>giU43^f!0t0IIw9Z7&5zX+>7&NHjpR6ekyGQ#3ZoPHciC zhygu-aQJ@~s7{0sgoW%+kdhl=3|L`kPuMrFHEYr L8^%JRo0=E^8&}{Y diff --git a/fuzz/corpus/fuzz_ds_patricia/921441816405adb82a95beb9e829eb2d07364e39 b/fuzz/corpus/fuzz_ds_patricia/921441816405adb82a95beb9e829eb2d07364e39 deleted file mode 100644 index 7a9455885b242eb6ea6005bd16fdc597e9c3d4cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1025 zcmd<8B^~^S0|p4tg$tlExX{c-l?CxI3}6APfeH^x3eAHJ3_yWjV4nuz@-J8mlwbs@ zM+eFvfm`UJD15Z2z|UoX*aC8oHXPvAf?^R-9Be+dV_-1ECJqq`0|Pe*MFffL3}lxB z#bK7z)zVakflHh=z$cL%`09h@5;Q#;t diff --git a/fuzz/corpus/fuzz_ds_patricia/94cfe0c7f792ee42ff43e5559fe0375323b9b68a b/fuzz/corpus/fuzz_ds_patricia/94cfe0c7f792ee42ff43e5559fe0375323b9b68a deleted file mode 100644 index e6a86cf92af29f2fcbc18fb986c1d3c6e5dc5a88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmdT=ITC;{2*k0=b1ZH275;`9JD-h#T$sbeQi^1OT}am8PyiU_op>RF#E?vpNMV66 zxk2{KTfLkpN)zx8>}f-P37~zCtvNVIMK)00mDOHTHL3n+a diff --git a/fuzz/corpus/fuzz_ds_patricia/95107e7dc7612da1d0905556f401953c06b3507e b/fuzz/corpus/fuzz_ds_patricia/95107e7dc7612da1d0905556f401953c06b3507e deleted file mode 100644 index 3c2fe90dacbb9796da06da205ad41e1233a19b8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_au?+$-3=EVhn1o-0js}{S7=$V{J$poA8^)kV0uwuN>?9wdmvTjX=ZhV`_0|cz zKc5IkPY{RLrP5JC4Ry&K7p~Ny6#>hT%#RY$?VdPJ9A(@&Er7d+L7eMO zQya3kb}QmB!)hBu2%KuR`+{s`vQ(GNL~eCL^wm8T3Ze3UY5Rqo`6RMi0j|Y;>}A#- jv-5N>J#Mhs0(_IeMUBLpAHj%?wN@Obi#PZ;8XVyV)5_hZ diff --git a/fuzz/corpus/fuzz_ds_patricia/9764794fc2c7bcb80ca3f42525e4d4e8e32a088f b/fuzz/corpus/fuzz_ds_patricia/9764794fc2c7bcb80ca3f42525e4d4e8e32a088f deleted file mode 100644 index 9dc4ca1f2d3fc84e4a19edd40c3a024426575b3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1076 zcmd<8r8@Wz1%F@+a_N60YwTrY00R;<67oI+L*fO7#jEmA)In@vKoP60Wk44|ldr|) zEQC6!!61t1BNB%MCe)H2BxnICg@&9MPHoH}8H7tQ{eqAKv!Di{iDGbJ=KT4u1!EGX z!_Yu&ZE4LkCWQn-I?=R+!Sn$=#z1^>#Ti6k31lDEAamesE}**q|KVIPWA!RSh6#xb k4CpQl3)`>~Q;bZ9qXiG9KVCtFjspQGvN2UKG&L~*0JB_6;{X5v diff --git a/fuzz/corpus/fuzz_ds_patricia/99a846729e1fa67dde649843fdf554d3d5c14d1e b/fuzz/corpus/fuzz_ds_patricia/99a846729e1fa67dde649843fdf554d3d5c14d1e deleted file mode 100644 index 91662c870917075b30116e8f479c4181f3caeeb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 zcmd<81%d_;K|J_R3}9pc0~TV`5>ms!ka&QB?e4q(|A}`bP$dJ@4G@r141QRO@nyCKZ1Q@oV2xN=#F)$>d2$9PX2Lmw(MUVvBf}VA;_>c=O z)=MgY>mc^3a}OK@fw~i27$2YXUSwaDmh{)V9~wGJpY5+K?3eM`DAS42%$i7#J!ibSz{*m&V1ff=T@U57UoC zgIx($Q4dvT1XGWj{{J8D6b6v1m_Pn^f)(NP903>6AgB;w1#}vH0EvMG3^gQo)iQ$sP=Eo< ffDxdug|h#HpaM7IfFEIH zkFY91@d^^Bww3|KDX1KTdkM2pbRyXRVnS>IhhQfx9C6Yp2EjNm)lh?BT!Qof#1Yo; f$0zs{MRG{QpEACHhs7E3G&t|T(+ntwK|n14*=@6* diff --git a/fuzz/corpus/fuzz_ds_patricia/9cc3c1a480c0872bc2f3e8e9539a46951436c1c3 b/fuzz/corpus/fuzz_ds_patricia/9cc3c1a480c0872bc2f3e8e9539a46951436c1c3 deleted file mode 100644 index 940db7966def3b8e8d07c7ad5c5f6a48f70ea750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1043 zcmcIiI}XAy3471$UfHa5gbaz#RH*NM|oAtCS(Kl?qurgaOO z!nyqpW9u*ygXlP@sr18`Xb)u{>SyH9k1ixm5BMY+&Uueg9K6qG7|{g)wfd8;X{`#; zv_?P9%gf5>M%SuctG21C?l2u>vbeE}4UJ9joTVtR*;TM$E(|ctG8?6)@VF9A93z-2 zLIJKq@4aCKP#78greGaroI;D(j)nwEW;v5ks7B8aT((OnaK)ng-F~&HRae#PKkYYu l3kK67t diff --git a/fuzz/corpus/fuzz_ds_patricia/9cd8475553e593641897c96d7abd7463f49c2682 b/fuzz/corpus/fuzz_ds_patricia/9cd8475553e593641897c96d7abd7463f49c2682 deleted file mode 100644 index 886a24de0e18862a27e3d8d27dd87daad61bf95c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B?;_eW&nf#D4_ZO|L<^tdN>O^gOLThI8YQ~Hf|E9Mj|AL^X7A?G88wgd-;iDV@hzY@NV@#>REr#?l#_ASRdN2%zzD=QlhA{vi$v^vnU6TLv%> z9$>0>;i4vk#@+y>MQLS~2J!dSyfV2J(H__7^KyO$ni`43_}rVSMH3=0`iuD|V-ah_ zZ^V+Ei%ASr5|Qk<_=jpz+gQ@F;|JJ9b;UP8%+jws#Q2q>RVEFFUQ8;dx=U>`3#}{M Den})` diff --git a/fuzz/corpus/fuzz_ds_patricia/9fa60713c5ae1f3726ae70fd4e8c230c27e10a7e b/fuzz/corpus/fuzz_ds_patricia/9fa60713c5ae1f3726ae70fd4e8c230c27e10a7e deleted file mode 100644 index 0dcd71b1a50de47309a8ab914e9cdb69a9c6ac61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B^~^y7l1mAfnvZ2F+mK!L5PsR^dMXgzY)}xrJ}RJ?#J{NJ`uQ=iD57>GJwni z`Cl6jaBD=d_dW`bN*v6Xuw!5_#1usnfd)C6C{8XH$cqiQ{aHI1Q!b1w;D$>Vh6UIh MixQ}C1x-y10F-CH>Hq)$ diff --git a/fuzz/corpus/fuzz_ds_patricia/a7302ca6b5de89a8840072d6bc28184881e7e5c7 b/fuzz/corpus/fuzz_ds_patricia/a7302ca6b5de89a8840072d6bc28184881e7e5c7 deleted file mode 100644 index 6d257363b2af02acd1cb411b51006f2631240ac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_YTMmFA3?qJWCC}nfh=~_R$Ey}W2XQ}ZN7s#6cMq=$BPyc^SgU+Vq_Cfm(1=LF zZyI$f;U^t5v5UGTj#SJ45pJV4I1F7b5WHn1?)D;2Emg9-o!6?IR<5c&N`r_{hnUjq a5J@Y2C(QJK`vKfSueQ~mrC-jTVsR%G@28aj diff --git a/fuzz/corpus/fuzz_ds_patricia/a7780546d30ae4eb791b6cef858b87dcf915307b b/fuzz/corpus/fuzz_ds_patricia/a7780546d30ae4eb791b6cef858b87dcf915307b deleted file mode 100644 index bd64e4d9fffcf9ef535d3499228fb97a6b936e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3825 zcmeHIElxx+5Pne99sofQBq&0{888?mVl_w{20=oTbsz|!K&{{aoB%FBf&j%4FzYr! z5W+GuZQo2g-N)-oHe?et*xpaDhKw=+9d+3 zP7awTl01lVVo#Ah3B0B_WxO#QRxbzjxr%kQ_ZLN4+_Y3g2zRHvB6Yvu%3Zb=8AJ)D zU?kX}%FG(vj8UVipeXI9W%x^9sdj)GEFLJg=$~Y25CPm-z<}*D`@DEv7bzBHHj>ou zKq7FC)gEu1ii{CGxLn7lH;ZfgfOGXlkmVf3x*aEW0{B7fI&4R96Sp}5vA+Y0e%hZc zM=d8tGP|H0&?SDf@nTGuk8SyD2+nL$fl}Ml%B86>Qy;_)E-78Fu(@PEsP9Jj10{U z%?vC|4J^!!jVXn>Pom6yQ4z|g?J(%i(r+|USJ6Nq11Ylvhl zCKFjtG?+6TOhSVPSsKE|@Vq@x1l{*=ZHQ2=1v?(-0Js5028Na<7Qj$5fh#A10oM*; zEJfub>;tn@Abduk-N-T*m>?mEEQW<`f;B|LP;G?r&_iG}{=spH2-N|Kf0W3gD662Q zO>he0f}|rDiSR9yRrrLP;X@*7;sZ*-)FWrdOk@s(jZg^F0Hv+a_zWBfn`@at0AvY} qLUS|z;vfvD31l%B!X>r{CWHld61oJK546r7*-EH0Sr`zpPzwMZ$Y5Xq diff --git a/fuzz/corpus/fuzz_ds_patricia/aa0a7045de571ac72c4bef04373965d3c062a802 b/fuzz/corpus/fuzz_ds_patricia/aa0a7045de571ac72c4bef04373965d3c062a802 deleted file mode 100644 index f21af4514f262ef82b82231d7cb2a5d3b1720d82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8t*zAoVv@jrB=8T){)HqqU`z%EoK_R-!BUVyh&c=wSQ$tFToAS4e{2{oBx2Kt zZ~{(OQdi;)93ZU5#lq%bpjZ@KoC~D0p|%~D0dVnpFpHp190;l)Rsq~*6b9Vk#54Z> zhpB~`R9XviL>L$_FeFZ35Z}NF;SnH_6<@*&kPHH*I|c?|IG5H;Vp2$8V5nvIgBk`f U=MkbCP!%8>0!rHOY{JX{0C5jnr2qf` diff --git a/fuzz/corpus/fuzz_ds_patricia/acadff503aae63ba452f693f9b1af75beeb871c2 b/fuzz/corpus/fuzz_ds_patricia/acadff503aae63ba452f693f9b1af75beeb871c2 deleted file mode 100644 index e5f5a67ee5e9ac535627470e6664e91cf88e9618..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmd<8t*zAoVv@jrB=8T){)Hrlo2iIf3M|6_0Zasx;g)7#z$r(p7fV43A?84xLx|#n zCj`z@Q+%6T7-MP=GKG=uiw01sCB0DQrk+M^cZ2Sq~OR zx3!lMVicNqJ(v$6(WKD1L@7eo^#4E9l^WPw3sQ|C4)Zbxi~*rhf@0Hg)#bq8s6`Ks z|Nq0l037z>8(^+MN!cg?4>lXcXd;Z|Yybm@RX9ng8#qxE#3AuuuEPk0=BB2mW{}H( ckzQIeiAf=WfdMsjAZrDsZ=hNr0TN{Z0L-*tf&c&j diff --git a/fuzz/corpus/fuzz_ds_patricia/ad11755d5c38e9b4f78b89ea0115891f1e503512 b/fuzz/corpus/fuzz_ds_patricia/ad11755d5c38e9b4f78b89ea0115891f1e503512 deleted file mode 100644 index 66a26c7f8e50f0741da015edfde13332e2252052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1104 zcmd<8t*zAoVv@jrB=8T){)Hqqa7+dUoOToI!%~n!h&c?z0WOHL@IN*T7ZR~)L0FB` zb<~x30|yAJaj~#D7$_D67v}=$Y^ZI=WdK6F9?T@@6$gSUh){sA6_bUmeNd%OoXIl` z2Vh`GoWLNyffGr3)ykC%5L{%hVg>{#4uR2ES~H1BA%TIRmf;Vw`v3poaZG^GfGUq{ O2*^u7Ss(!tWdHzVzV+7t diff --git a/fuzz/corpus/fuzz_ds_patricia/ad56cf4fbb246dbfea16651702230fda3e0c9c83 b/fuzz/corpus/fuzz_ds_patricia/ad56cf4fbb246dbfea16651702230fda3e0c9c83 deleted file mode 100644 index 335e795f61449942b46be4b3e9617871e89ee63c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2163 zcmcIlI}XAy3=NE3H~YRsM(_$@|rKr)>6MUxi_L`4(3)rA`%eoxNGBpQ-e_}5>2U8Pp` zln`(0Pj@9+AIgX+If1+I(hbsl@+9Jt|C%K^VF@i4O97m4n4>WP)!{mvtQm{dq~}N~ zI`Q62x28s@Dzr5G=k8fhlZjDBIGc%GPP(AF4z{Xy3tz?T>!xdQJCBala%^oMy6HW3 zpYP3NSOS#tQ-+qjD;%MaoJw#!d5LN8<-{X>lp~OT9ICcOYOn8v7^7B;p~4-1|Bi=Z r9zXNuNd)#1^^7f$TP^|xv;9p@6bzXgWN5q&=SJtHAa(srk=_0Q`45AY diff --git a/fuzz/corpus/fuzz_ds_patricia/ae2ee75e6177727ac0387e2c99ae3a761827d68e b/fuzz/corpus/fuzz_ds_patricia/ae2ee75e6177727ac0387e2c99ae3a761827d68e deleted file mode 100644 index b1573f0886d7eeb3e53968c371fa82e8256384f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1688 zcmdT^J5Izf5H%kOX<3P@*oilBTJAuEM1g3yg(WJsr2^4#29B^7pxJ%}x1coRaqP^* z30fj3n8KN{=S|*x?1kM+gjjgLJG-`4pjg{ZNH{;dpA0<2Az=A(DmFI(8&(!~+lbK351I%=5RZL7VbPja;|+){k~#e>}+Rm#28Dw9IE30 z?EJbY3B?sYp0lQvbfjhD5RLyl7I_b_)imc39enJO7vEv{WG>Jp-iLuj0mG~QJ%Lzs zsbsC-8XBpKl`g9)TtynV*F%=@0KN@){Ov1x0{bEe atMhb@IxsyI40lr{SRohyjKn8_rTqddXwc38 diff --git a/fuzz/corpus/fuzz_ds_patricia/b042b35030eb170c6507e14dd6f00a6e1b670612 b/fuzz/corpus/fuzz_ds_patricia/b042b35030eb170c6507e14dd6f00a6e1b670612 deleted file mode 100644 index cf2b6370a09a9b118dddd7f4a3b5db7b2e8c00cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8MFF`eJRF?=Fu=$F1`RO&V4-2|mV~&E0met8p|T`WKtquH>BkDujwD1n6U_z9 zO-)T8L(qhAb4j-mrXvVyD2z`OjU0@8$Q-O}xU;R`EUGXNmJ#J>(iI^rsIBEf=HO;y fT7se0i9CQ}4%C{TK$@tatgXeOjG2LZMOzq85Uo4rSXs*#FV%C^!t*3?ZX%BWx1)#roT5;d4D?QkL=%7yh&oL% zOoQ%BUvxN-G3LszM!%;lAS`sUAu8g^%B`F?=E=vm?M`BU-EJj~^R~gaQKweCuH36S lBD{gRoU<;to8_@tUIk_oL*EvUPMG}vQ2SloxG;cuhA#uU<_Z7+ diff --git a/fuzz/corpus/fuzz_ds_patricia/b688eaaf60534a0470b8a153c71dd52f6acde043 b/fuzz/corpus/fuzz_ds_patricia/b688eaaf60534a0470b8a153c71dd52f6acde043 deleted file mode 100644 index 84a29ac970372c836ef54b5210249d3da71fdde8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8t*zAoVv@jrB=8T){)Hq)4wI1q1Xx>0*1I3BgMk6gL}w7;J&10QBeXyS14E@7 zAH#t}2pd6iL73rxY#1(JNP^@LR-rqBD82(eRd*=__{>Jg{RT4;{vgCc1P+J=)*OZ^ z2IU!|h$1WmvcNJZBGl#(@&!U3#g$0@L3Po6R4zW=xBm#kYimI%9hnbeLq$L~bJf+`&(fJ-K$?Dsl^({I%9BLkc6 zD+^thP`z=KO^!2%eIr~CDqZV3*qyG)(L+rztScKx1ROV%l9}b*(Ft0}?r!1UFlowE l>raJG(J^aHf?avL;Wa5DE-2FsO> s3J2dIEQA60Ekc$>=z*}Fq6q*kM^+AHBNP$mxK_ARu`n#Kh!HCU0HlISI{*Lx diff --git a/fuzz/corpus/fuzz_ds_patricia/bff088bb8cea1b5dd229632d70941de8c9415889 b/fuzz/corpus/fuzz_ds_patricia/bff088bb8cea1b5dd229632d70941de8c9415889 deleted file mode 100644 index 6ac14e54064b94ca4f11ad2ee5a275df4dd2d966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmd5*+X}-l2+d$G?FZ~3pE{N=@4$Jll4O*!L4Bx4J!)d(+DPEEaQe|t5dlzeQt@HA zCly!`p~`2_``o0%y}KSI9hELQIi!Pp-_bCf*l3u)6etqgJriUl`V)^6b{+r^C(*W- z$GNaugLe>O22-uy8CHJ!7GtYx4m!;b?_b#(A>b#+{Db>0%TNt7%P3j|NqD#Qp>==0_1~(3@#4l z0hOTyDaf%vf5F6>K@4pEgo+s&7+9K{7?>Lxfi$85m>CEfS)LX_Zv>A+!VE(bULct}{P=ID_2XBxNf*v7(eQBk!uX_cAR618> zt}1m3dIGvCifONBU1u!Am(HX}nfh7>zp~$_khc#(iKNB#aKp#qk-nfD)U?!CPnqT+ zxiQg^oKv$5@JPpx9iUzMyGCqYR}@dcKdZr~8bFi?Rw$>?no4B64z}x2y3mtSYgl)$ zu)SN&BoyIMe^z7riDnxcEr-@O)^*@APiK#uJWsNbJ;1Fk=cn(3?B`xaMI&cVyYH8= zh;{MBGiFTmnQTeOfQ4CD$m)^41{I->-1}7i6)budHf%*3K!34sd~*^k?PWLhF4){Q;Z)6#QWfygPxzt3mdKX#*r(32_* zU?&6M+Gf1|rvbDYFT3F`+sJ_}_LZ=G5R8d@u+8hE?JU9!_rrBCdnCv++~mzdw(hmm c=tOa&TFyC-Xz?jUx&Sf2O&rpv8Saz$1*$;J761SM diff --git a/fuzz/corpus/fuzz_ds_patricia/c8d112d02108163b41a166b147a7a44922d7ab49 b/fuzz/corpus/fuzz_ds_patricia/c8d112d02108163b41a166b147a7a44922d7ab49 deleted file mode 100644 index 5172aac07b3b06c14101c3767f382c36cf0b8675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1284 zcmd<8B^~@n2KSLUbYnC8|NjDyWhD8D0SDl~Ax>BrVLcu4<{;Ryj9|MeNC6CD z|Nld@F^Gkc0brV$fzCkq1I7ZmhpWD}v}PKULIMLrEyEv#Ye6iqdkGOR!%(%7!~+}g z|9`wDqkFsum>z`5V5k58|3NrjYiogOP)!DF0w!0GC<6fGv#^8! diff --git a/fuzz/corpus/fuzz_ds_patricia/d0b0b56e3a3b9092ab75b212aa07777c48013050 b/fuzz/corpus/fuzz_ds_patricia/d0b0b56e3a3b9092ab75b212aa07777c48013050 deleted file mode 100644 index 8d68c7ff3779c5b5560804328c0ef4f65e5390ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_a!41PO2=o(qmF&|kI)eY5tFvT_s&Wqu%2jb=rwR`njsp%Sxy)FtHE5}8(nY61 zZ;mk&b~9sQXww^bXRI;ap6AkQd~5%8sD}Lb$JRj+#-KM3yCdK|Y=1n1Vo5{>X)sP& z`vRkrC9zypwYQDIb`B=2=@X4aU^tIG_O8J#g1D%*PRTKox&s OQs8U~;~?m!CI$fVu8lMR diff --git a/fuzz/corpus/fuzz_ds_patricia/d47ffc046a3a67b46138121d4b0752cb770380ae b/fuzz/corpus/fuzz_ds_patricia/d47ffc046a3a67b46138121d4b0752cb770380ae deleted file mode 100644 index 388654c130774c1efe082b3863b53f022e7e7ba2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2266 zcmc&#J5B>J5Dk$)BDqEc4TZhytTzRRpxGuB2cX~pmLehG2oVRMAmRud0@2ZP0D6kW zzZu)RUN5_#Fj6vaett9dD4B_r)CuwHAZ;S$bp3d>Rp9yf_C@JG6vz1ml&D<{kRqN* zLn?4J_4)P3eDZk-2_3EG9sXaqg?M+p;0&tUc%)vKqyx!`=@Pt7O%uK^f-@w8o+C;7 zcR@2st7o$Bpb=Wwx>#s9EDNivJ|TqIAuG-Zr&;^pU`8{d zm$cS+tG|)iizi{U9bRUXWt7u`luJ_bJYOXaG3zkBYj%aHJ9E7zvT{a*RVCNYik=PuMBnI^;NCd@8j1V;}a8FDJvA}|GAz~O| zU=RYKV59*U5ThNd8iYf^tR|uWLKDmtMAHlmi4z#aH*n(7fb33$O+eN!5Dye=T(z~O kHPe_B5`Y2C@CR8vYNCV&JUFD$i3U^wEQSEh0*NvJ03P#n-~a#s diff --git a/fuzz/corpus/fuzz_ds_patricia/d9ea126774547be83e8514cf14bfc46b90e04ae1 b/fuzz/corpus/fuzz_ds_patricia/d9ea126774547be83e8514cf14bfc46b90e04ae1 deleted file mode 100644 index 91866bdf6c3fbbfa3cdc55378db3f978323cd505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1025 zcmd<8B?kN_7C4|QL^r+g2{*$BbVW#fboI5h3_!pI6b4dQB@u#1#z2_}IT#D4Y4hm| zVD16Z;2=rF@ExXaC=vmA94kP$1e^J55I}jjfHfeGGC_P>TMMLXYtP;O`wbEhs)+DF zV?BrRv4$c{5Mn9?B$}l_F34yc8K53hHB1EI1ei!I$Pgf4WJsLA=$?NT#OA6607pM3 A7ytkO diff --git a/fuzz/corpus/fuzz_ds_patricia/e0b35272e42e26f2396fb30f2601afebeec4760b b/fuzz/corpus/fuzz_ds_patricia/e0b35272e42e26f2396fb30f2601afebeec4760b deleted file mode 100644 index 378cbfeb144ae7e05273da6ed68ec61485577ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B^~^yGC*+w0|GF8M6k(Xd6T4z5u#cQzb1rZF+u?$1!IAX;(~ENG=?711!`lF z4aCVN-C+DWP%J_UB0Q0VqNTPL78VU?;`q7vT}7@e!UO;DTaPBo08J!7{U8}b5V4&g c0I4Dd{Qr+|7tt()!2|;XWF|s6ki}RF0Kg_Jg#Z8m diff --git a/fuzz/corpus/fuzz_ds_patricia/e0f738b7cc91b246885c5055c7a16ab716053186 b/fuzz/corpus/fuzz_ds_patricia/e0f738b7cc91b246885c5055c7a16ab716053186 deleted file mode 100644 index 610bf4fda12e041d734ff0c49d6a33d7d76a7a03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1039 zcmd<8MS!(ygM+}pcP$toWY}m5!1hEVY(rxGM+Zo9Yu6%iz)S`P1~)MH|GySpBZ+*V zQD6Yl24X~P0D}Zf0FeNa5Dhpj zc?-XhsIo9U=rk9|!iL&*g7$`{Su#vWWMDv2h-w1{4`h`B5Q8PcFaWZ8BttW(0ifoA zTmbZ7Y0Weyg#@6}8U7$!`u{&j9texJ5EL^wzzrBWpbT1}07_6m2b4lWH{^sAKp-qx(uuS0(OAO;);;UpJZ7H!(08cOsYDhFF(6hl2%6hgFYiD}ll6=>TALC?ii=3pMXO~Bnqroms83)N9iK#m5&)WtOuY#S1QE(#dR0bJ3>E!P#%@O4 kP=IdC96g$0bK@aK{sE+gXJ_`-Ch6RNK3RVUewT3CFMyitv;Y7A diff --git a/fuzz/corpus/fuzz_ds_patricia/e77f0ad2aede947e4557ca77181c17cfe628e8f9 b/fuzz/corpus/fuzz_ds_patricia/e77f0ad2aede947e4557ca77181c17cfe628e8f9 deleted file mode 100644 index 6a8b48ea43f95bf6350405e2713afd1d52baa05b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1601 zcmd<8g@XnuIff013=D7qT#WzNzz=MKq>ACP5vw=@14Az(LoE=40ai6Q1W9!lR6P#U zunR+6g_Fdt2`-A&g`;5%4<85vXXs*)_{)4e1yi^dD1>Gxs?i8Z%qT&~!B`**xPTm7 zrh?S9!xUqquTueFIuu=mj|70C7ZFwnVHF4ylntSRpin>qpg^f@K=Seb|6vd%^)Qow bk|>%+BMcTY|NoN^UwjB%Ko*T7thN>aLne}; diff --git a/fuzz/corpus/fuzz_ds_patricia/e9ae65ef89f69cde2b8e5b3e2ce14ac98b2c2289 b/fuzz/corpus/fuzz_ds_patricia/e9ae65ef89f69cde2b8e5b3e2ce14ac98b2c2289 deleted file mode 100644 index 311f152632c7252a3cd672ed56fcecd53a37a3d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb_YISzm@4C}%`Cs-KzRHQzMA0k1oC~>LUfbc-<98QY$dR*_YN(@I8XP}2-fLlxk zCv*%qN(J-gn970_PAPydpnetdxG|TjbGOViIhn%ClW4XZ?xRVLTq71eY!F7wQLP`@ tHLx8NioQ)%ZNI6`&UK=%c?VwhLHVt$N}lo05gukPA*Ow%`5XJ4zX7}V_g4S_ diff --git a/fuzz/corpus/fuzz_ds_patricia/ea7d1ce3b3df957829182925f48735fd70e28d1c b/fuzz/corpus/fuzz_ds_patricia/ea7d1ce3b3df957829182925f48735fd70e28d1c deleted file mode 100644 index 1f3efb89b4d66871d1dc011235359191e8d4c66d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmb_YISv9b3^c_Sq+%P2rRI}Jeh(GReu9c0AwgotvK^uv5>u>ae2kq9IF8R8Rz-Vo z-~w+jFrY2K(8L(?8?AEl@L2K!3U4bMKRNY3@dB{N^|@Wm-8NI@V(MN_qS_AHCzBer zCM(1wS?$ MA*GQie^dX4UxiHbY5)KL diff --git a/fuzz/corpus/fuzz_ds_patricia/ef6a236812a8235565a4c606ea2c5a9341e4aa41 b/fuzz/corpus/fuzz_ds_patricia/ef6a236812a8235565a4c606ea2c5a9341e4aa41 deleted file mode 100644 index 116c41f384d15e15417dd7738a0a54e029bbc59e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmcgq+YQ1n47>{XVFVW7mj#gcWGSSo`*a58;>-A4yLk{q;DeLmxX#_hvAVx0MuvXK z|Ipu*GBF^>S6U^D6Il0TiI*JmE!!!0l2{27|9>uD` uMVrTX9tD17XwH%RwEHDpgJ=%HI$DEGlb-KKV)JN@WOXSM{^bfU%77;xZ^>%_ diff --git a/fuzz/corpus/fuzz_ds_patricia/f10e4c67ca64bdce1cd394fd829bf0b5aeed7071 b/fuzz/corpus/fuzz_ds_patricia/f10e4c67ca64bdce1cd394fd829bf0b5aeed7071 deleted file mode 100644 index 0a9d7567a427e5a0c783c71c09334f5ccf729ca5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1033 zcmd<8B^~^yGC*+w0}SA{1f~L$?q$Rj1B!TK6~!e8HA4)SJVYGfXbguUq+l$N7A_bE zL}Tb7U7$7=*+86Z(hbJ11H~ewAY%H6#DO#KfmtYeYHNXF;J|1=6UWcR?<}HZQ7nMF bk%3_-xE+fJ5kB~j;xodj3#1c83u7$+Y65Gb diff --git a/fuzz/corpus/fuzz_ds_patricia/f24cf8ce6cf0a9e00e9fcef913843d439792379c b/fuzz/corpus/fuzz_ds_patricia/f24cf8ce6cf0a9e00e9fcef913843d439792379c deleted file mode 100644 index 67fe193c4892bbb49398e0f8ee72c4b4a3fce235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1223 zcmd<8B^~^S0|p4tg$oQa1{S{&a3R!337%?D|KL07cDukr4G`mAIy*~e zyVJ6)$HR7!dKdvfM_T)gkr;5Y&Nx?P7y!K4OOSA*-fJ>nuuU7 z{nKh`)$jOxxy7rBEk*wb;S9dn)Ro&Uca~GT_b79RxxuDw1h45}?e~8oaIo*EQtgF1 j`+aYR=EP8n^1@{JdUT-=%IuYCM}G|8KUMIza6RDzmwhk| diff --git a/fuzz/corpus/fuzz_ds_patricia/f4d7ba52332b71166ca952780db341c5645f04b3 b/fuzz/corpus/fuzz_ds_patricia/f4d7ba52332b71166ca952780db341c5645f04b3 deleted file mode 100644 index 643e1c6577f5a86a27b3232cb0a0efeba6589a1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<8B^~?+0hl&0hX?|uzP1z2!o|R98cZ<*1i-k&(O6A{31T$@Y7H{=ka_@SHFg@= zQYahYMocXTIT#D1i3`X9QZON6X-wmZ5`j7sjY3$8X~=s_Aruj)QOqcU6k diff --git a/fuzz/corpus/fuzz_ds_patricia/f5f68d29ff553b4e63a3f0bb69e4c940bc46c291 b/fuzz/corpus/fuzz_ds_patricia/f5f68d29ff553b4e63a3f0bb69e4c940bc46c291 deleted file mode 100644 index f67a60d06545a8786399aec3e150da22ebe694af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd<81%d_;0SEty1aJ+twG5055FiewkYtEr{{IivP6@?|RkImZQ3?cqqv>sc@@vt= ziQ+3G6*9BAiR#1 zg=yk+h!9vcCbmsgRwxyj7AKhh(S&{pit#Q0F*$6M+z)>F=-U_|Np~v02!Ld9NcVRVwsO= ME;w%iHPzMv0FD?P4*&oF diff --git a/fuzz/corpus/fuzz_ds_patricia/ff72929db2b1fdacd24b1aed103bb307bbac7d7f b/fuzz/corpus/fuzz_ds_patricia/ff72929db2b1fdacd24b1aed103bb307bbac7d7f deleted file mode 100644 index eefeedb2ee10a1c16b40311ceee150637e560eb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1263 zcmd<8MFJ8?Y&^{WBmx!^)q|8XzyKb1V3k7B3NwNnT85PzU0C%XoJo8*Fak{?UNv@= z2z#-zFg2kngZTwh9c~er9(0-u)o9#2+(uJd2I_|9CNSv4?Ie&411LTq0KY(_h^by@fP<|M701ne(!kCs!hX{ccfP4dVaB0mnCWQnBhFXR{sF4hk j2LhO3wY8|yARaJk7#JErst^EG6$8UZpcF73K*9_FDLICq diff --git a/fuzz/corpus/fuzz_ds_patricia/ff82aaaf9375f24492e1bc709bf1518b827fc83d b/fuzz/corpus/fuzz_ds_patricia/ff82aaaf9375f24492e1bc709bf1518b827fc83d deleted file mode 100644 index 648a4f0521ec3cd38633e1a08af9dc60dd1c6f89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1219 zcmd<8B^~@H6-eO$LU`l|N|EZ2{}`VA&By=-ND}o>_W%D06Bsx{wjj707$lGPAgP2g zxxkFIV9)@e@R7kmVBiZ;12Y6KO|nM`YN)OKiPuK3BrGUu85p49#K3?{7lx1jV~DK% zj~M~jje|rAPP?#cs;$NCYZM(&(?Jx|M&0HhC;?-&>W8NqUh diff --git a/fuzz/corpus/fuzz_filecfg_category/comment.txt b/fuzz/corpus/fuzz_filecfg_category/comment.txt new file mode 100644 index 000000000..99e8589b5 --- /dev/null +++ b/fuzz/corpus/fuzz_filecfg_category/comment.txt @@ -0,0 +1 @@ +#comment diff --git a/fuzz/corpus/fuzz_filecfg_category/example.txt b/fuzz/corpus/fuzz_filecfg_category/example.txt new file mode 100644 index 000000000..a4bb082c2 --- /dev/null +++ b/fuzz/corpus/fuzz_filecfg_category/example.txt @@ -0,0 +1 @@ +lop.programtts.top diff --git a/fuzz/fuzz_common_code.c b/fuzz/fuzz_common_code.c index 4dbcf3018..d4311b1b6 100644 --- a/fuzz/fuzz_common_code.c +++ b/fuzz/fuzz_common_code.c @@ -44,6 +44,7 @@ void fuzz_init_detection_module(struct ndpi_detection_module_struct **ndpi_info_ ndpi_set_config(*ndpi_info_mod, NULL, "log.level", "3"); ndpi_set_config(*ndpi_info_mod, "all", "log", "enable"); + ndpi_load_domain_suffixes(*ndpi_info_mod, "public_suffix_list.dat"); ndpi_load_categories_dir(*ndpi_info_mod, "./lists/"); ndpi_load_protocols_file(*ndpi_info_mod, "protos.txt"); ndpi_load_categories_file(*ndpi_info_mod, "categories.txt", NULL); diff --git a/fuzz/fuzz_config.cpp b/fuzz/fuzz_config.cpp index b85f3752f..f99b87358 100644 --- a/fuzz/fuzz_config.cpp +++ b/fuzz/fuzz_config.cpp @@ -32,6 +32,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { char cfg_value[32]; char cfg_proto[32]; char cfg_param[32]; + u_int64_t cat_userdata = 0; /* Just to be sure to have some data */ @@ -65,16 +66,32 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if(fuzzed_data.ConsumeBool()) ndpi_load_protocols_file(ndpi_info_mod, "protos.txt"); if(fuzzed_data.ConsumeBool()) - ndpi_load_categories_file(ndpi_info_mod, "categories.txt", NULL); + ndpi_load_protocols_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename"); /* Error */ + if(fuzzed_data.ConsumeBool()) + ndpi_load_categories_file(ndpi_info_mod, "categories.txt", &cat_userdata); + if(fuzzed_data.ConsumeBool()) + ndpi_load_categories_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename", &cat_userdata); /* Error */ if(fuzzed_data.ConsumeBool()) ndpi_load_risk_domain_file(ndpi_info_mod, "risky_domains.txt"); + if(fuzzed_data.ConsumeBool()) + ndpi_load_risk_domain_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename"); /* Error */ if(fuzzed_data.ConsumeBool()) ndpi_load_malicious_ja3_file(ndpi_info_mod, "ja3_fingerprints.csv"); if(fuzzed_data.ConsumeBool()) - ndpi_load_malicious_sha1_file(ndpi_info_mod, "sha1_fingerprints.csv"); - /* Note that this function is not used by ndpiReader */ + ndpi_load_malicious_ja3_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename"); /* Error */ if(fuzzed_data.ConsumeBool()) + ndpi_load_malicious_sha1_file(ndpi_info_mod, "sha1_fingerprints.csv"); + if(fuzzed_data.ConsumeBool()) + ndpi_load_malicious_sha1_file(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "invalid_filename"); /* Error */ + if(fuzzed_data.ConsumeBool()) + ndpi_load_domain_suffixes(ndpi_info_mod, (char *)"public_suffix_list.dat"); + if(fuzzed_data.ConsumeBool()) + ndpi_load_domain_suffixes(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : (char *)"invalid_filename"); /* Error */ + /* Note that this function is not used by ndpiReader */ + if(fuzzed_data.ConsumeBool()) { + ndpi_load_ipv4_ptree(ndpi_info_mod, "invalid_filename", NDPI_PROTOCOL_TLS); ndpi_load_ipv4_ptree(ndpi_info_mod, "ipv4_addresses.txt", NDPI_PROTOCOL_TLS); + } /* TODO: stub for geo stuff */ ndpi_load_geoip(ndpi_info_mod, NULL, NULL); @@ -92,11 +109,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { value = fuzzed_data.ConsumeIntegralInRange(0, 365 + 1); sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, "tls", "certificate_expiration_threshold", cfg_value); + ndpi_get_config(ndpi_info_mod, "tls", "certificate_expiration_threshold", cfg_value, sizeof(cfg_value)); } if(fuzzed_data.ConsumeBool()) { value = fuzzed_data.ConsumeIntegralInRange(0, 1 + 1); sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, "tls", "application_blocks_tracking", cfg_value); + ndpi_get_config(ndpi_info_mod, "tls", "application_blocks_tracking", cfg_value, sizeof(cfg_value)); } if(fuzzed_data.ConsumeBool()) { value = fuzzed_data.ConsumeIntegralInRange(0, 1 + 1); @@ -152,6 +171,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { value = fuzzed_data.ConsumeIntegralInRange(0, 1 + 1); sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, "any", "log", cfg_value); + ndpi_get_config(ndpi_info_mod, "any", "log", cfg_value, sizeof(cfg_value)); } for(i = 0; i < NDPI_MAX_SUPPORTED_PROTOCOLS; i++) { if(fuzzed_data.ConsumeBool()) { @@ -160,12 +180,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { sprintf(cfg_proto, "%d", i); /* TODO: we should try to map integer into name */ ndpi_set_config(ndpi_info_mod, cfg_proto, "log", cfg_value); + ndpi_get_config(ndpi_info_mod, cfg_proto, "log", cfg_value, sizeof(cfg_value)); } } if(fuzzed_data.ConsumeBool()) { value = fuzzed_data.ConsumeIntegralInRange(0, 1 + 1); sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, "any", "ip_list.load", cfg_value); + ndpi_get_config(ndpi_info_mod, "any", "ip_list.load", cfg_value, sizeof(cfg_value)); } for(i = 0; i < NDPI_MAX_SUPPORTED_PROTOCOLS; i++) { if(fuzzed_data.ConsumeBool()) { @@ -173,6 +195,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { sprintf(cfg_value, "%d", value); sprintf(cfg_proto, "%d", i); ndpi_set_config(ndpi_info_mod, cfg_proto, "ip_list.load", cfg_value); + ndpi_get_config(ndpi_info_mod, cfg_proto, "ip_list.load", cfg_value, sizeof(cfg_value)); } } if(fuzzed_data.ConsumeBool()) { @@ -230,6 +253,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, NULL, "flow_risk.crawler_bot.list.load", cfg_value); } + if(fuzzed_data.ConsumeBool()) { + ndpi_set_config(ndpi_info_mod, NULL, "filename.config", fuzzed_data.ConsumeBool() ? NULL : (char *)"config.txt"); + ndpi_get_config(ndpi_info_mod, NULL, "filename.config", cfg_value, sizeof(cfg_value)); + } if(fuzzed_data.ConsumeBool()) { value = fuzzed_data.ConsumeIntegralInRange(0, 3 + 1); sprintf(cfg_value, "%d", value); @@ -323,9 +350,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { value = fuzzed_data.ConsumeIntegralInRange(0, 16777215 / 2); /* max / 2 instead of max + 1 to avoid oom on oss-fuzzer */ sprintf(cfg_param, "lru.%s.size", name); ndpi_set_config(ndpi_info_mod, NULL, cfg_param, cfg_value); + ndpi_get_config(ndpi_info_mod, NULL, cfg_param, cfg_value, sizeof(cfg_value)); value = fuzzed_data.ConsumeIntegralInRange(0, 16777215 + 1); sprintf(cfg_param, "lru.%s.ttl", name); ndpi_set_config(ndpi_info_mod, NULL, cfg_param, cfg_value); + ndpi_get_config(ndpi_info_mod, NULL, cfg_param, cfg_value, sizeof(cfg_value)); } } /* Invalid parameter */ @@ -333,13 +362,19 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { value = fuzzed_data.ConsumeIntegralInRange(0, 1 + 1); sprintf(cfg_value, "%d", value); ndpi_set_config(ndpi_info_mod, NULL, "foo", cfg_value); + ndpi_get_config(ndpi_info_mod, NULL, "foo", cfg_value, sizeof(cfg_value)); } /* Invalid value */ if(fuzzed_data.ConsumeBool()) { sprintf(cfg_value, "%s", "jjj"); ndpi_set_config(ndpi_info_mod, NULL, "lru.stun_zoom.ttl", cfg_value); + ndpi_get_config(ndpi_info_mod, NULL, "lru.stun_zoom.ttl", cfg_value, sizeof(cfg_value)); } + ndpi_add_host_risk_mask(ndpi_info_mod, + (char *)fuzzed_data.ConsumeBytesAsString(32).c_str(), + static_cast(fuzzed_data.ConsumeIntegral())); + ndpi_finalize_initialization(ndpi_info_mod); /* Random protocol configuration */ @@ -355,8 +390,26 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_is_subprotocol_informative(ndpi_info_mod, pid); ndpi_get_proto_breed(ndpi_info_mod, pid); + ndpi_port_range d_port[MAX_DEFAULT_PORTS] = {}; + ndpi_set_proto_defaults(ndpi_info_mod, 0, 0, NDPI_PROTOCOL_SAFE, pid, + protoname, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, + d_port, d_port); + ndpi_get_proto_by_name(ndpi_info_mod, NULL); /* Error */ ndpi_get_proto_by_name(ndpi_info_mod, "foo"); /* Invalid protocol */ + ndpi_get_proto_name(ndpi_info_mod, pid); + ndpi_get_protocol_id(ndpi_info_mod, protoname); + + struct in_addr pin; + struct in6_addr pin6; + pin.s_addr = fuzzed_data.ConsumeIntegral(); + ndpi_network_port_ptree_match(ndpi_info_mod, &pin, fuzzed_data.ConsumeIntegral()); + for(i = 0; i < 16; i++) + pin6.s6_addr[i] = fuzzed_data.ConsumeIntegral(); + ndpi_network_port_ptree6_match(ndpi_info_mod, &pin6, fuzzed_data.ConsumeIntegral()); + + ndpi_get_host_domain_suffix(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "www.bbc.co.uk"); + ndpi_get_host_domain(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : "www.bbc.co.uk"); /* Custom category configuration */ cat = fuzzed_data.ConsumeIntegralInRange(static_cast(NDPI_PROTOCOL_CATEGORY_CUSTOM_1), @@ -376,10 +429,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_self_check_host_match(stdout); - ndpi_dump_protocols(ndpi_info_mod, stdout); - ndpi_generate_options(fuzzed_data.ConsumeIntegralInRange(0, 4), stdout); - ndpi_dump_risks_score(stdout); - ndpi_dump_config(ndpi_info_mod, stdout); + ndpi_dump_protocols(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : stdout); + ndpi_generate_options(fuzzed_data.ConsumeIntegralInRange(0, 4), fuzzed_data.ConsumeBool() ? NULL : stdout); + ndpi_dump_risks_score(fuzzed_data.ConsumeBool() ? NULL : stdout); + ndpi_dump_config(ndpi_info_mod, fuzzed_data.ConsumeBool() ? NULL : stdout); /* Basic code to try testing this "config" */ bool_value = fuzzed_data.ConsumeBool(); @@ -388,6 +441,12 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { memset(&flow, 0, sizeof(flow)); std::vectorpkt = fuzzed_data.ConsumeRemainingBytes(); + const u_int8_t *l4_return; + u_int16_t l4_len_return; + u_int8_t l4_protocol_return; + ndpi_detection_get_l4(pkt.data(), pkt.size(), &l4_return, &l4_len_return, &l4_protocol_return, NDPI_DETECTION_ONLY_IPV6); + ndpi_detection_get_l4(pkt.data(), pkt.size(), &l4_return, &l4_len_return, &l4_protocol_return, NDPI_DETECTION_ONLY_IPV4); + ndpi_detection_process_packet(ndpi_info_mod, &flow, pkt.data(), pkt.size(), 0, &input_info); p = ndpi_detection_giveup(ndpi_info_mod, &flow, &protocol_was_guessed); @@ -406,7 +465,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_get_http_method(ndpi_info_mod, bool_value ? &flow : NULL); ndpi_get_http_url(ndpi_info_mod, &flow); ndpi_get_http_content_type(ndpi_info_mod, &flow); - check_for_email_address(ndpi_info_mod, 0); ndpi_get_flow_name(bool_value ? &flow : NULL); /* ndpi_guess_undetected_protocol() is a "strange" function. Try fuzzing it, here */ if(!ndpi_is_protocol_detected(ndpi_info_mod, p)) { @@ -423,7 +481,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { flow.c_address.v4, flow.c_port, flow.s_address.v4, flow.s_port); } else { - ndpi_find_ipv6_category_userdata(ndpi_info_mod, (struct in6_addr *)flow.c_address.v6); + ndpi_find_ipv6_category_userdata(ndpi_info_mod, bool_value ? NULL : (struct in6_addr *)flow.c_address.v6); } /* Another "strange" function: fuzz it here, for lack of a better alternative */ ndpi_search_tcp_or_udp(ndpi_info_mod, &flow); diff --git a/fuzz/fuzz_ds_ahocorasick.cpp b/fuzz/fuzz_ds_ahocorasick.cpp index 3333cad3e..949cc4b6d 100644 --- a/fuzz/fuzz_ds_ahocorasick.cpp +++ b/fuzz/fuzz_ds_ahocorasick.cpp @@ -23,6 +23,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { u_int16_t protocol_id; ndpi_protocol_category_t category; ndpi_protocol_breed_t breed; + u_int32_t unused; /* TODO: real string instead of random bytes */ @@ -120,7 +121,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ndpi_free(value_dup); - ndpi_match_string(a2, (char *)value.c_str()); + ndpi_match_string(a2, fuzzed_data.ConsumeBool() ? NULL : (char *)value.c_str()); + ndpi_match_string_value(a2, fuzzed_data.ConsumeBool() ? NULL : (char *)value.c_str(), + strlen(value.c_str()), &unused); ndpi_match_string_protocol_id(a2, (char *)value.c_str(), strlen(value.c_str()), &protocol_id, &category, &breed); } @@ -133,6 +136,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ac_automata_search(a, &ac_input_text, &match); ndpi_match_string(a2, value_added); + ndpi_match_string_value(a2, value_added, strlen(value_added), &unused); ndpi_match_string_protocol_id(a2, value_added, strlen(value_added), &protocol_id, &category, &breed); diff --git a/fuzz/fuzz_ds_patricia.cpp b/fuzz/fuzz_ds_patricia.cpp index 58e098b45..1bd2e2d0d 100644 --- a/fuzz/fuzz_ds_patricia.cpp +++ b/fuzz/fuzz_ds_patricia.cpp @@ -20,10 +20,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { u_int16_t i, num_iteration, ip_len; ndpi_patricia_tree_t *p, *p_cloned; u_int16_t maxbits; - int is_ipv6, is_added = 0; + int is_added = 0; ndpi_prefix_t prefix, prefix_added; u_char *ip; ndpi_patricia_node_t *node; + int tree_type; /* 0: ipv4, 1: ipv6, 2: mac */ /* Just to have some data */ if (fuzzed_data.remaining_bytes() < 1024) @@ -32,11 +33,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* To allow memory allocation failures */ fuzz_set_alloc_callbacks_and_seed(size); - is_ipv6 = fuzzed_data.ConsumeBool(); - if (is_ipv6) + tree_type = fuzzed_data.ConsumeIntegralInRange(0, 2); + if (tree_type == 0) + maxbits = 32; + else if (tree_type == 1) maxbits = 128; else - maxbits = 32; + maxbits = 48; p = ndpi_patricia_new(maxbits); @@ -47,7 +50,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* "Random" add */ num_iteration = fuzzed_data.ConsumeIntegral(); for (i = 0; i < num_iteration; i++) { - if (!is_ipv6) { + if (tree_type == 0) { if(fuzzed_data.remaining_bytes() > 4) { std::vectordata = fuzzed_data.ConsumeBytes(4); ip = data.data(); @@ -67,7 +70,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert(ndpi_patricia_get_node_u64(node) == 0); } } - } else { + } else if (tree_type == 1){ if(fuzzed_data.remaining_bytes() > 16) { std::vectordata = fuzzed_data.ConsumeBytes(16); ip = data.data(); @@ -87,6 +90,26 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert(ndpi_patricia_get_node_u64(node) == 0); } } + } else { + if(fuzzed_data.remaining_bytes() > 6) { + std::vectordata = fuzzed_data.ConsumeBytes(6); + ip = data.data(); + ip_len = fuzzed_data.ConsumeIntegralInRange(0, 49); /* 49 to force error */ + ndpi_fill_prefix_mac(&prefix, ip, ip_len, 48); + node = ndpi_patricia_lookup(p, &prefix); + /* Keep one random node really added */ + if (node && is_added == 0 && fuzzed_data.ConsumeBool()) { + is_added = 1; + prefix_added = prefix; + /* Some random operations on this node */ + ndpi_patricia_get_node_prefix(node); + ndpi_patricia_get_node_bits(node); + ndpi_patricia_set_node_data(node, NULL); + assert(ndpi_patricia_get_node_data(node) == NULL); + ndpi_patricia_set_node_u64(node, 0); + assert(ndpi_patricia_get_node_u64(node) == 0); + } + } } } @@ -96,7 +119,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* "Random" exact search. Remove if found */ num_iteration = fuzzed_data.ConsumeIntegral(); for (i = 0; i < num_iteration; i++) { - if (!is_ipv6) { + if (tree_type == 0) { if(fuzzed_data.remaining_bytes() > 4) { std::vectordata = fuzzed_data.ConsumeBytes(4); ip = data.data(); @@ -106,7 +129,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (node) ndpi_patricia_remove(p, node); } - } else { + } else if (tree_type == 1) { if(fuzzed_data.remaining_bytes() > 16) { std::vectordata = fuzzed_data.ConsumeBytes(16); ip = data.data(); @@ -116,7 +139,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (node) ndpi_patricia_remove(p, node); } + } else { + if(fuzzed_data.remaining_bytes() > 6) { + std::vectordata = fuzzed_data.ConsumeBytes(6); + ip = data.data(); + ip_len = fuzzed_data.ConsumeIntegralInRange(0, 48); + ndpi_fill_prefix_mac(&prefix, ip, ip_len, 48); + node = ndpi_patricia_search_exact(p, &prefix); + if (node) + ndpi_patricia_remove(p, node); + } } + } /* Exact search of an added node */ if (is_added) @@ -125,7 +159,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* "Random" best search. Remove if found */ num_iteration = fuzzed_data.ConsumeIntegral(); for (i = 0; i < num_iteration; i++) { - if (!is_ipv6) { + if (tree_type == 0) { if(fuzzed_data.remaining_bytes() > 4) { std::vectordata = fuzzed_data.ConsumeBytes(4); ip = data.data(); @@ -135,7 +169,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (node) ndpi_patricia_remove(p, node); } - } else { + } else if (tree_type == 1) { if(fuzzed_data.remaining_bytes() > 16) { std::vectordata = fuzzed_data.ConsumeBytes(16); ip = data.data(); @@ -145,6 +179,16 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (node) ndpi_patricia_remove(p, node); } + } else { + if(fuzzed_data.remaining_bytes() > 6) { + std::vectordata = fuzzed_data.ConsumeBytes(6); + ip = data.data(); + ip_len = fuzzed_data.ConsumeIntegralInRange(0, 48); + ndpi_fill_prefix_mac(&prefix, ip, ip_len, 48); + node = ndpi_patricia_search_best(p, &prefix); + if (node) + ndpi_patricia_remove(p, node); + } } } /* Best search of an added node */ diff --git a/fuzz/fuzz_filecfg_category.c b/fuzz/fuzz_filecfg_category.c new file mode 100644 index 000000000..757ada01f --- /dev/null +++ b/fuzz/fuzz_filecfg_category.c @@ -0,0 +1,27 @@ +#include "ndpi_api.h" +#include "ndpi_private.h" +#include "fuzz_common_code.h" + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + struct ndpi_detection_module_struct *ndpi_struct; + FILE *fd; + NDPI_PROTOCOL_BITMASK all; + + /* To allow memory allocation failures */ + fuzz_set_alloc_callbacks_and_seed(size); + + ndpi_struct = ndpi_init_detection_module(); + NDPI_BITMASK_SET_ALL(all); + ndpi_set_protocol_detection_bitmask2(ndpi_struct, &all); + + ndpi_set_config(ndpi_struct, NULL, "log.level", "3"); + ndpi_set_config(ndpi_struct, "all", "log", "1"); + + fd = buffer_to_file(data, size); + load_category_file_fd(ndpi_struct, fd, NDPI_PROTOCOL_CATEGORY_VOIP /* random category */); + if(fd) + fclose(fd); + + ndpi_exit_detection_module(ndpi_struct); + return 0; +} diff --git a/fuzz/ipv4_addresses.txt b/fuzz/ipv4_addresses.txt index 209765e5a..76065bd2a 100644 --- a/fuzz/ipv4_addresses.txt +++ b/fuzz/ipv4_addresses.txt @@ -3,4 +3,5 @@ 192.168.5.5 192.168.5.6/32 192.168.4.0/24 +192.168.4.1 diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index 27386966e..d2d122cb0 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -387,23 +387,6 @@ extern "C" { struct ndpi_flow_struct *flow, struct ndpi_proto * ndpi_proto); - /** - * API call that is called internally by ndpi_detection_process_packet or by apps - * that want to avoid calling ndpi_detection_process_packet as they have already - * parsed the packet and thus want to avoid this. - * - * - * @par ndpi_struct = the detection module - * @par flow = the flow given for the detection module - * @par ndpi_selection_bitmask = the protocol selected bitmask - * @return number of protocol dissector that have been tried (0 = no more dissectors) - * - */ - u_int32_t ndpi_check_flow_func(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow, - NDPI_SELECTION_BITMASK_PROTOCOL_SIZE *ndpi_selection_packet); - - /** * Query the pointer to the layer 4 packet * diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index 06e6eaed1..b7c93d60d 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -265,7 +265,6 @@ struct ndpi_detection_module_struct { u_int ndpi_num_supported_protocols; u_int ndpi_num_custom_protocols; - int ac_automa_finalized; /* HTTP/DNS/HTTPS/QUIC host matching */ ndpi_automa host_automa, /* Used for DNS/HTTPS */ risky_domain_automa, tls_cert_subject_automa, @@ -414,9 +413,6 @@ u_int8_t ips_match(u_int32_t src, u_int32_t dst, u_int8_t ends_with(struct ndpi_detection_module_struct *ndpi_struct, char *str, char *ends); -u_int16_t check_for_email_address(struct ndpi_detection_module_struct *ndpi_struct, - u_int16_t counter); - u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, u_int8_t protocol, @@ -434,7 +430,8 @@ int load_malicious_sha1_file_fd(struct ndpi_detection_module_struct *ndpi_str, F int load_malicious_ja3_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd); int load_risk_domain_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd); int load_config_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd); - +int load_category_file_fd(struct ndpi_detection_module_struct *ndpi_str, + FILE *fd, ndpi_protocol_category_t category_id); /* TLS */ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct, diff --git a/src/lib/ndpi_domains.c b/src/lib/ndpi_domains.c index aeb34b010..ff7fd52cb 100644 --- a/src/lib/ndpi_domains.c +++ b/src/lib/ndpi_domains.c @@ -82,6 +82,8 @@ int ndpi_load_domain_suffixes(struct ndpi_detection_module_struct *ndpi_str, const char* ndpi_get_host_domain_suffix(struct ndpi_detection_module_struct *ndpi_str, const char *hostname) { + if(!ndpi_str) + return NULL; if(ndpi_str->public_domain_suffixes == NULL) return(hostname); else { @@ -96,6 +98,8 @@ const char* ndpi_get_host_domain_suffix(struct ndpi_detection_module_struct *ndp const char* ndpi_get_host_domain(struct ndpi_detection_module_struct *ndpi_str, const char *hostname) { + if(!ndpi_str) + return NULL; if(ndpi_str->public_domain_suffixes == NULL) return(hostname); else { diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index e9044dfd2..5fe52dd04 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -307,18 +307,14 @@ u_int16_t ndpi_get_proto_by_name(struct ndpi_detection_module_struct *ndpi_str, /* ************************************************************************************* */ /* ************************************************************************************* */ -void ndpi_add_user_proto_id_mapping(struct ndpi_detection_module_struct *ndpi_str, - u_int16_t ndpi_proto_id, u_int16_t user_proto_id) { - if(ndpi_proto_id < NDPI_MAX_SUPPORTED_PROTOCOLS) - return; /* Nothing to map */ - -#ifdef NDPI_ENABLE_DEBUG_MESSAGES +static void ndpi_add_user_proto_id_mapping(struct ndpi_detection_module_struct *ndpi_str, + u_int16_t ndpi_proto_id, u_int16_t user_proto_id) { NDPI_LOG_DBG2(ndpi_str, "[DEBUG] *** %u (>= %u)-> %u\n", ndpi_proto_id, NDPI_MAX_SUPPORTED_PROTOCOLS, user_proto_id); -#endif - ndpi_str->ndpi_to_user_proto_id[ndpi_proto_id-NDPI_MAX_SUPPORTED_PROTOCOLS] = user_proto_id; + if(ndpi_proto_id >= NDPI_MAX_SUPPORTED_PROTOCOLS) + ndpi_str->ndpi_to_user_proto_id[ndpi_proto_id-NDPI_MAX_SUPPORTED_PROTOCOLS] = user_proto_id; } /* ************************************************************************************* */ @@ -327,10 +323,8 @@ void ndpi_add_user_proto_id_mapping(struct ndpi_detection_module_struct *ndpi_st u_int16_t ndpi_map_user_proto_id_to_ndpi_id(struct ndpi_detection_module_struct *ndpi_str, u_int16_t user_proto_id) { -#ifdef NDPI_ENABLE_DEBUG_MESSAGES #if 0 /* Too much verbose... */ NDPI_LOG_DBG2(ndpi_str, "[DEBUG] ***** %s(%u)\n", __FUNCTION__, user_proto_id); -#endif #endif if(!ndpi_str) @@ -359,10 +353,8 @@ u_int16_t ndpi_map_user_proto_id_to_ndpi_id(struct ndpi_detection_module_struct /* Map an internal nDPI protocol id to a custom user protocol */ u_int16_t ndpi_map_ndpi_id_to_user_proto_id(struct ndpi_detection_module_struct *ndpi_str, u_int16_t ndpi_proto_id) { -#ifdef NDPI_ENABLE_DEBUG_MESSAGES #if 0 /* Too much verbose... */ NDPI_LOG_DBG2(ndpi_str, "[DEBUG] ***** %s(%u)\n", __FUNCTION__, ndpi_proto_id); -#endif #endif if(!ndpi_str) @@ -561,6 +553,9 @@ void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_str, char *name; int j; + if(!ndpi_str || !protoName) + return; + if(!ndpi_is_valid_protoId(protoId)) { NDPI_LOG_ERR(ndpi_str, "[NDPI] %s/protoId=%d: INTERNAL ERROR\n", protoName, protoId); return; @@ -577,9 +572,6 @@ void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_str, return; } - if(ndpi_str->proto_defaults[protoId].protoName) - ndpi_free(ndpi_str->proto_defaults[protoId].protoName); - ndpi_str->proto_defaults[protoId].isClearTextProto = is_cleartext; /* is_appprotocol=1 means that this is only an application protocol layered @@ -2387,6 +2379,8 @@ int ndpi_fill_prefix_v6(ndpi_prefix_t *prefix, const struct in6_addr *addr, int /* ******************************************* */ int ndpi_fill_prefix_mac(ndpi_prefix_t *prefix, u_int8_t *mac, int bits, int maxbits) { + memset(prefix, 0, sizeof(ndpi_prefix_t)); + if(bits < 0 || bits > maxbits) return -1; @@ -2618,9 +2612,6 @@ static ndpi_patricia_node_t* add_to_ptree(ndpi_patricia_tree_t *tree, int family ndpi_prefix_t prefix; ndpi_patricia_node_t *node; - if(!tree) - return(NULL); - if(family == AF_INET) ndpi_fill_prefix_v4(&prefix, (struct in_addr *) addr, bits, tree->maxbits); else @@ -2758,9 +2749,6 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp bool value_ready = false; struct addrinfo hints, *result, *rp; - if(!ndpi_str->protocols_ptree) - return(-1); - if(value[0] == '[') { is_ipv6 = 1; bits = 128; @@ -2815,7 +2803,7 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; - if(!is_ipv6) { + if(!is_ipv6 && ndpi_str->protocols_ptree) { /* Check if the IP address is symbolic or numeric */ unsigned int d[4]; char tail[16] = { '\0' }; @@ -2848,7 +2836,7 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp } node = add_to_ptree(ndpi_str->protocols_ptree, AF_INET, &pin, bits); - } else { + } else if(is_ipv6 && ndpi_str->protocols_ptree6) { if(strchr(value, ':') == NULL) { /* This might be a symbolic IPv6 address */ @@ -2875,6 +2863,8 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp } node = add_to_ptree(ndpi_str->protocols_ptree6, AF_INET6, &pin6, bits); + } else { + return(-1); } if(node != NULL) { @@ -2884,7 +2874,6 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp for(i=0; ivalue.u.uv16[i].user_value == 0) { node->value.u.uv16[i].user_value = protocol_id, node->value.u.uv16[i].additional_user_value = htons(port); - return(0); } } /* for */ @@ -2919,9 +2908,9 @@ void set_ndpi_flow_free(void (*__ndpi_flow_free)(void *ptr)) { _ndpi_flow_free = __ndpi_flow_free; } +#ifdef NDPI_ENABLE_DEBUG_MESSAGES void ndpi_debug_printf(unsigned int proto, struct ndpi_detection_module_struct *ndpi_str, ndpi_log_level_t log_level, const char *file_name, const char *func_name, unsigned int line_number, const char *format, ...) { -#ifdef NDPI_ENABLE_DEBUG_MESSAGES va_list args; #define MAX_STR_LEN 250 char str[MAX_STR_LEN]; @@ -2941,8 +2930,8 @@ void ndpi_debug_printf(unsigned int proto, struct ndpi_detection_module_struct * } #endif -#endif } +#endif /* ****************************************** */ @@ -3273,8 +3262,6 @@ static void ndpi_add_domain_risk_exceptions(struct ndpi_detection_module_struct u_int i; ndpi_risk mask = ((ndpi_risk)-1); - if(!ndpi_str) return; - for(i=0; risks_to_mask[i] != NDPI_NO_RISK; i++) mask &= ~(1ULL << risks_to_mask[i]); @@ -3611,8 +3598,6 @@ int ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str) } } - if(ndpi_str->ac_automa_finalized) return -1; - ndpi_automa * const automa[] = { &ndpi_str->host_automa, &ndpi_str->tls_cert_subject_automa, &ndpi_str->host_risk_mask_automa, @@ -3625,8 +3610,6 @@ int ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str) ac_automata_finalize((AC_AUTOMATA_t *) a->ac_automa); } - ndpi_str->ac_automa_finalized = 1; - if(ndpi_str->cfg.tls_app_blocks_tracking_enabled) { ndpi_str->num_tls_blocks_to_follow = NDPI_MAX_NUM_TLS_APPL_BLOCKS; ndpi_str->skip_tls_blocks_until_change_cipher = 1; @@ -4168,7 +4151,7 @@ static u_int16_t guess_protocol_id(struct ndpi_detection_module_struct *ndpi_str if(flow) { /* Run some basic consistency tests */ - if(packet->payload_packet_len < sizeof(struct ndpi_icmphdr)) + if(packet->payload_packet_len < sizeof(struct ndpi_icmp6hdr)) ndpi_set_risk(ndpi_str, flow, NDPI_MALFORMED_PACKET, NULL); else { u_int8_t icmp6_type = (u_int8_t)packet->payload[0]; @@ -4699,26 +4682,35 @@ int load_categories_file_fd(struct ndpi_detection_module_struct *ndpi_str, */ int ndpi_load_category_file(struct ndpi_detection_module_struct *ndpi_str, char *path, ndpi_protocol_category_t category_id) { - char buffer[256], *line; + int rc; FILE *fd; + + if(!ndpi_str || !path) + return(-1); + + fd = fopen(path, "r"); + if(fd == NULL) { + NDPI_LOG_ERR(ndpi_str, "Unable to open file %s [%s]\n", path, strerror(errno)); + return -1; + } + + rc = load_category_file_fd(ndpi_str, fd, category_id); + + fclose(fd); + + return rc; +} + +int load_category_file_fd(struct ndpi_detection_module_struct *ndpi_str, + FILE *fd, ndpi_protocol_category_t category_id) { + char buffer[256], *line; u_int num_loaded = 0; unsigned int failed_lines = 0; unsigned int lines_read = 0; - if(!ndpi_str || !path || !ndpi_str->protocols_ptree) + if(!ndpi_str || !fd || !ndpi_str->protocols_ptree) return(0); -#ifdef NDPI_ENABLE_DEBUG_MESSAGES - // printf("Loading %s [proto %d]\n", path, category_id); -#endif - - fd = fopen(path, "r"); - - if(fd == NULL) { - NDPI_LOG_ERR(ndpi_str, "Unable to open file %s [%s]\n", path, strerror(errno)); - return(0); - } - while(1) { int len; @@ -4731,8 +4723,8 @@ int ndpi_load_category_file(struct ndpi_detection_module_struct *ndpi_str, len = strlen(line); if(len <= 1 || len == sizeof(buffer) - 1) { - NDPI_LOG_ERR(ndpi_str, "[NDPI] Failed to read file '%s' line #%u, line too short/long\n", - path, lines_read); + NDPI_LOG_ERR(ndpi_str, "[NDPI] Failed to read file line #%u, line too short/long\n", + lines_read); failed_lines++; continue; } else if (line[0] == '#') @@ -4752,8 +4744,8 @@ int ndpi_load_category_file(struct ndpi_detection_module_struct *ndpi_str, if (i != len - 2 && i != len - 1) { - NDPI_LOG_ERR(ndpi_str, "[NDPI] Failed to read file '%s' line #%u, invalid characters found\n", - path, lines_read); + NDPI_LOG_ERR(ndpi_str, "[NDPI] Failed to read file line #%u, invalid characters found\n", + lines_read); failed_lines++; continue; } @@ -4762,7 +4754,6 @@ int ndpi_load_category_file(struct ndpi_detection_module_struct *ndpi_str, num_loaded++; } - fclose(fd); if(failed_lines) return(-1 * failed_lines); return(num_loaded); @@ -4839,9 +4830,6 @@ static int ndpi_load_risky_domain(struct ndpi_detection_module_struct *ndpi_str, ac_automata_name(ndpi_str->risky_domain_automa.ac_automa, "risky", 0); } - if(!ndpi_str->risky_domain_automa.ac_automa) - return -1; - return ndpi_string_to_automa(ndpi_str, (AC_AUTOMATA_t *)ndpi_str->risky_domain_automa.ac_automa, domain_name, 1, 0, 0, 0, 1); /* domain, protocol, category, breed, level , at_end */ } @@ -6336,9 +6324,6 @@ static int ndpi_init_packet(struct ndpi_detection_module_struct *ndpi_str, u_int8_t l4protocol; u_int8_t l4_result; - if(!flow) - return(1); - /* need at least 20 bytes for ip header */ if(packetlen < 20) return 1; @@ -6577,11 +6562,8 @@ static int tcp_ack_padding(struct ndpi_packet_struct *packet) { return 0; } -void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_str, - struct ndpi_flow_struct *flow) { - if(!flow) { - return; - } else { +static void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_str, + struct ndpi_flow_struct *flow) { /* const for gcc code optimization and cleaner code */ struct ndpi_packet_struct *packet = &ndpi_str->packet; const struct ndpi_iphdr *iph = packet->iph; @@ -6816,7 +6798,6 @@ void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_str, ndpi_unset_risk(ndpi_str, flow, NDPI_UNIDIRECTIONAL_TRAFFIC); /* Clear bit */ } } - } } /* ************************************************ */ @@ -6969,12 +6950,10 @@ static u_int32_t check_ndpi_tcp_flow_func(struct ndpi_detection_module_struct *n /* ********************************************************************************* */ -u_int32_t ndpi_check_flow_func(struct ndpi_detection_module_struct *ndpi_str, - struct ndpi_flow_struct *flow, - NDPI_SELECTION_BITMASK_PROTOCOL_SIZE *ndpi_selection_packet) { - if(!flow) - return(0); - else if(ndpi_str->packet.tcp != NULL) +static u_int32_t ndpi_check_flow_func(struct ndpi_detection_module_struct *ndpi_str, + struct ndpi_flow_struct *flow, + NDPI_SELECTION_BITMASK_PROTOCOL_SIZE *ndpi_selection_packet) { + if(ndpi_str->packet.tcp != NULL) return(check_ndpi_tcp_flow_func(ndpi_str, flow, ndpi_selection_packet)); else if(ndpi_str->packet.udp != NULL) return(check_ndpi_udp_flow_func(ndpi_str, flow, ndpi_selection_packet)); @@ -8695,90 +8674,6 @@ void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct *ndpi_s /* ********************************************************************************* */ -u_int16_t check_for_email_address(struct ndpi_detection_module_struct *ndpi_str, - u_int16_t counter) { - struct ndpi_packet_struct *packet; - - if(!ndpi_str) - return(0); - - packet = &ndpi_str->packet; - NDPI_LOG_DBG2(ndpi_str, "called ndpi_check_for_email_address\n"); - - if(packet->payload_packet_len > counter && ((packet->payload[counter] >= 'a' && packet->payload[counter] <= 'z') || - (packet->payload[counter] >= 'A' && packet->payload[counter] <= 'Z') || - (packet->payload[counter] >= '0' && packet->payload[counter] <= '9') || - packet->payload[counter] == '-' || packet->payload[counter] == '_')) { - NDPI_LOG_DBG2(ndpi_str, "first letter\n"); - counter++; - while(packet->payload_packet_len > counter && - ((packet->payload[counter] >= 'a' && packet->payload[counter] <= 'z') || - (packet->payload[counter] >= 'A' && packet->payload[counter] <= 'Z') || - (packet->payload[counter] >= '0' && packet->payload[counter] <= '9') || - packet->payload[counter] == '-' || packet->payload[counter] == '_' || - packet->payload[counter] == '.')) { - NDPI_LOG_DBG2(ndpi_str, "further letter\n"); - counter++; - if(packet->payload_packet_len > counter && packet->payload[counter] == '@') { - NDPI_LOG_DBG2(ndpi_str, "@\n"); - counter++; - while(packet->payload_packet_len > counter && - ((packet->payload[counter] >= 'a' && packet->payload[counter] <= 'z') || - (packet->payload[counter] >= 'A' && packet->payload[counter] <= 'Z') || - (packet->payload[counter] >= '0' && packet->payload[counter] <= '9') || - packet->payload[counter] == '-' || packet->payload[counter] == '_')) { - NDPI_LOG_DBG2(ndpi_str, "letter\n"); - counter++; - if(packet->payload_packet_len > counter && packet->payload[counter] == '.') { - NDPI_LOG_DBG2(ndpi_str, ".\n"); - counter++; - if(packet->payload_packet_len > counter + 1 && - ((packet->payload[counter] >= 'a' && packet->payload[counter] <= 'z') && - (packet->payload[counter + 1] >= 'a' && packet->payload[counter + 1] <= 'z'))) { - NDPI_LOG_DBG2(ndpi_str, "two letters\n"); - counter += 2; - if(packet->payload_packet_len > counter && - (packet->payload[counter] == ' ' || packet->payload[counter] == ';')) { - NDPI_LOG_DBG2(ndpi_str, "whitespace1\n"); - return(counter); - } else if(packet->payload_packet_len > counter && packet->payload[counter] >= 'a' && - packet->payload[counter] <= 'z') { - NDPI_LOG_DBG2(ndpi_str, "one letter\n"); - counter++; - if(packet->payload_packet_len > counter && - (packet->payload[counter] == ' ' || packet->payload[counter] == ';')) { - NDPI_LOG_DBG2(ndpi_str, "whitespace2\n"); - return(counter); - } else if(packet->payload_packet_len > counter && packet->payload[counter] >= 'a' && - packet->payload[counter] <= 'z') { - counter++; - if(packet->payload_packet_len > counter && - (packet->payload[counter] == ' ' || packet->payload[counter] == ';')) { - NDPI_LOG_DBG2(ndpi_str, "whitespace3\n"); - return(counter); - } else { - return(0); - } - } else { - return(0); - } - } else { - return(0); - } - } else { - return(0); - } - } - } - return(0); - } - } - } - return(0); -} - -/* ********************************************************************************* */ - u_int8_t ndpi_detection_get_l4(const u_int8_t *l3, u_int16_t l3_len, const u_int8_t **l4_return, u_int16_t *l4_len_return, u_int8_t *l4_protocol_return, u_int32_t flags) { return(ndpi_detection_get_l4_internal(NULL, l3, l3_len, l4_return, l4_len_return, l4_protocol_return, flags)); @@ -8854,9 +8749,6 @@ void ndpi_get_flow_ndpi_proto(struct ndpi_detection_module_struct *ndpi_str, str static void ndpi_int_change_flow_protocol(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_flow_struct *flow, u_int16_t upper_detected_protocol, u_int16_t lower_detected_protocol, ndpi_confidence_t confidence) { - if(!flow) - return; - flow->detected_protocol_stack[0] = upper_detected_protocol, flow->detected_protocol_stack[1] = lower_detected_protocol; flow->confidence = confidence; @@ -8890,21 +8782,6 @@ void change_category(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_ /* ********************************************************************************* */ -void NDPI_PROTOCOL_IP_clear(ndpi_ip_addr_t *ip) { - memset(ip, 0, sizeof(ndpi_ip_addr_t)); -} - -/* ********************************************************************************* */ - -#ifdef CODE_UNUSED -/* NTOP */ -int NDPI_PROTOCOL_IP_is_set(const ndpi_ip_addr_t *ip) { - return(memcmp(ip, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", sizeof(ndpi_ip_addr_t)) != 0); -} -#endif - -/* ********************************************************************************* */ - u_int8_t ndpi_is_ipv6(const ndpi_ip_addr_t *ip) { return(ip->ipv6.u6_addr.u6_addr32[1] != 0 || ip->ipv6.u6_addr.u6_addr32[2] != 0 || ip->ipv6.u6_addr.u6_addr32[3] != 0); @@ -9331,7 +9208,7 @@ char *ndpi_get_proto_breed_name(struct ndpi_detection_module_struct *ndpi_str, int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_str, char *proto) { int i; - if(!ndpi_str) return(-1); + if(!ndpi_str || !proto) return(-1); for(i = 0; i < (int) ndpi_str->ndpi_num_supported_protocols; i++) if(ndpi_str->proto_defaults[i].protoName && @@ -9438,6 +9315,9 @@ void ndpi_generate_options(u_int opt, FILE *options_out) { void ndpi_dump_risks_score(FILE *risk_out) { u_int i; + if(!risk_out) + return; + fprintf(risk_out, "%3s %-48s %-8s %s %-8s %-8s\n", "Id", "Risk", "Severity", "Score", "CliScore", "SrvScore"); @@ -9566,8 +9446,6 @@ static u_int16_t ndpi_automa_match_string_subprotocol(struct ndpi_detection_modu ndpi_protocol_match_result *ret_match) { int matching_protocol_id; - if(!ndpi_str) return(NDPI_PROTOCOL_UNKNOWN); - matching_protocol_id = ndpi_match_string_subprotocol(ndpi_str, string_to_match, string_to_match_len, ret_match); @@ -10979,7 +10857,7 @@ char *ndpi_dump_config(struct ndpi_detection_module_struct *ndpi_str, /* TODO */ case CFG_PARAM_PROTOCOL_ENABLE_DISABLE: fprintf(fd, " *) %s %s: %s [all %s]", - c->proto ? c->proto : "NULL", + c->proto, c->param, /* TODO */ _get_param_protocol_enable_disable((void *)((char *)&ndpi_str->cfg + c->offset), "any", buf, sizeof(buf)), c->default_value); diff --git a/tests/cfgs/default/pcap/custom_rules_ipv6.pcapng b/tests/cfgs/default/pcap/custom_rules_ipv6.pcapng index 8283b1f47f37337c318ba60d024b0c4ec335cd5b..c5106a90c315865a83710638af4bc183356f677e 100644 GIT binary patch delta 313 zcmaE%G(}5>i [21bc:b273:7f68:88d7:77a8:585:3990:927b]:1991 [proto: 2048/CustomProtocolE][IP: 2048/CustomProtocolE][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][Plen Bins: 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,100,0,0,0,0,0,0,0,0,0] 2 UDP [247f:855b:5e16:3caf:3f2c:4134:9592:661b]:36098 -> [21bc:b273:7f68:88d7:77a8:585:3990:927b]:50621 [proto: 2049/CustomProtocolF][IP: 2049/CustomProtocolF][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 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,100,0,0,0,0,0,0,0,0,0] 3 UDP [3ffe:507::1:200:86ff:fe05:80da]:21554 <-> [3ffe:501:4819::42]:5333 [proto: 1024/CustomProtocolD][IP: 1024/CustomProtocolD][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/90 bytes <-> 1 pkts/510 bytes][Goodput ratio: 31/88][0.07 sec][PLAIN TEXT (itojun)][Plen Bins: 50,0,0,0,0,0,0,0,0,0,0,0,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] 4 UDP [fe80::76ac:b9ff:fe6c:c124]:12717 -> [ff02::1]:64315 [proto: 2050/CustomProtocolG][IP: 2050/CustomProtocolG][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,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] 5 UDP [fe80::76ac:b9ff:fe6c:c124]:12718 -> [ff02::1]:26993 [proto: 65535/CustomProtocolH][IP: 65535/CustomProtocolH][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,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] + 6 UDP [fe80::76ac:b9ff:fe6c:c124]:12719 -> [ff02::1]:26993 [proto: 65534/CustomProtocolI][IP: 65534/CustomProtocolI][ClearText][Confidence: Match by custom rule][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,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] + + +Undetected flows: + 1 UDP [fe80::76ac:b9ff:fedd:a1e2]:12719 -> [ff02::1]:26993 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,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] diff --git a/tests/ossfuzz.sh b/tests/ossfuzz.sh index d41454b2d..37e933c0f 100644 --- a/tests/ossfuzz.sh +++ b/tests/ossfuzz.sh @@ -60,6 +60,7 @@ cp example/risky_domains.txt $OUT/ cp example/ja3_fingerprints.csv $OUT/ cp example/sha1_fingerprints.csv $OUT/ cp example/config.txt $OUT/ +cp lists/public_suffix_list.dat $OUT/ cp fuzz/ipv4_addresses.txt $OUT/ cp fuzz/bd_param.txt $OUT/ cp fuzz/splt_param.txt $OUT/