Merge branch 'main' into pe

yara-x/fuzz/Cargo.toml

@@ -23,12 +23,6 @@ path = "fuzz_targets/macho_parser.rs"
 test = false
 doc = false
 
-[[bin]]
-name = "macho_fat_parser"
-path = "fuzz_targets/macho_fat_parser.rs"
-test = false
-doc = false
-
 [[bin]]
 name = "lnk_parser"
 path = "fuzz_targets/lnk_parser.rs"
@@ -45,4 +39,4 @@ doc = false
 name = "pe_parser"
 path = "fuzz_targets/pe_parser.rs"
 test = false
-doc = false
+doc = false

yara-x/fuzz/fuzz_targets/elf_parser.rs

@@ -1,7 +1,6 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-use yara_x::modules::elf::parser::ElfParser;
 
 fuzz_target!(|data: &[u8]| {
-    let _ = ElfParser::new().parse(data);
+    let _ = yara_x::mods::invoke_mod::<yara_x::mods::ELF>(data);
 });

yara-x/fuzz/fuzz_targets/lnk_parser.rs

@@ -1,7 +1,6 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-use yara_x::modules::lnk::parser::LnkParser;
 
 fuzz_target!(|data: &[u8]| {
-    let _ = LnkParser::new().parse(data);
+    let _ = yara_x::mods::invoke_mod::<yara_x::mods::Lnk>(data);
 });

yara-x/fuzz/fuzz_targets/macho_parser.rs

@@ -1,7 +1,6 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-use yara_x::modules::macho::parse_macho_file;
 
 fuzz_target!(|data: &[u8]| {
-    let _ = parse_macho_file(data);
+    let _ = yara_x::mods::invoke_mod::<yara_x::mods::Macho>(data);
 });

yara-x/src/lib.rs

@@ -67,9 +67,6 @@ pub use variables::Variable;
 pub use variables::VariableError;
 
 mod compiler;
-#[cfg(fuzzing)]
-pub mod modules;
-#[cfg(not(fuzzing))]
 mod modules;
 mod re;
 mod scanner;