Build fuzzers by default.

nih-at · Sep 23, 2023 · 27ad73c · 27ad73c
1 parent 3690582
commit 27ad73c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
@@ -1,11 +1,18 @@
 check_function_exists(getopt HAVE_GETOPT)
 
+set(FUZZ_PROGRAMS
+  zip_read_encrypted_file_fuzzer
+  zip_read_file_fuzzer
+  zip_read_fuzzer
+  zip_write_encrypt_aes256_file_fuzzer
+  zip_write_encrypt_pkware_file_fuzzer
+)
+
 set(TEST_PROGRAMS
   add_from_filep
   can_clone_file
   fopen_unchanged
   fseek
-  fuzz_main
   nonrandomopentest
   liboverride-test
 )
@@ -20,7 +27,7 @@ set(HOLE_USERS
   ziptool_regress
 )
 
-set(ZIP_PROGRAMS ${TEST_PROGRAMS} ${GETOPT_USERS} ${HOLE_USERS})
+set(ZIP_PROGRAMS ${TEST_PROGRAMS} ${GETOPT_USERS} ${HOLE_USERS} ${FUZZ_PROGRAMS})
 
 foreach(PROGRAM IN LISTS ZIP_PROGRAMS)
   add_executable(${PROGRAM} ${PROGRAM}.c)
@@ -40,6 +47,10 @@ foreach(PROGRAM IN LISTS HOLE_USERS)
   target_sources(${PROGRAM} PRIVATE source_hole.c)
 endforeach()
 
+foreach(PROGRAM IN LISTS FUZZ_PROGRAMS)
+  target_sources(${PROGRAM} PRIVATE fuzz_main.c)
+endforeach()
+
 # for including ziptool.c
 target_include_directories(ziptool_regress PRIVATE BEFORE ${PROJECT_SOURCE_DIR}/src)
 

diff --git a/regress/fuzz_main.c b/regress/fuzz_main.c
@@ -1,4 +1,3 @@
-#include "fuzzers/zip_read_fuzzer.c"
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/regress/ossfuzz.sh b/regress/ossfuzz.sh
@@ -25,27 +25,27 @@ cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_
 make -j$(nproc)
 
 $CXX $CXXFLAGS -I. -I../lib \
-    $SRC/libzip/regress/fuzzers/zip_read_encrypted_file_fuzzer.c \
+    $SRC/libzip/regress/zip_read_encrypted_file_fuzzer.c \
     -o $OUT/zip_read_encrypted_file_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libzip/build/lib/libzip.a -lz -v -lssl -lcrypto
 
 $CXX $CXXFLAGS -I. -I../lib \
-    $SRC/libzip/regress/fuzzers/zip_read_file_fuzzer.c \
+    $SRC/libzip/regress/zip_read_file_fuzzer.c \
     -o $OUT/zip_read_file_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libzip/build/lib/libzip.a -lz -v -lssl -lcrypto
 
 $CXX $CXXFLAGS -I. -I../lib \
-    $SRC/libzip/regress/fuzzers/zip_read_fuzzer.c \
+    $SRC/libzip/regress/zip_read_fuzzer.c \
     -o $OUT/zip_read_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libzip/build/lib/libzip.a -lz -v -lssl -lcrypto
 
 $CXX $CXXFLAGS -I. -I../lib \
-    $SRC/libzip/regress/fuzzers/zip_write_encrypt_aes256_file_fuzzer.c \
+    $SRC/libzip/regress/zip_write_encrypt_aes256_file_fuzzer.c \
     -o $OUT/zip_write_encrypt_aes256_file_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libzip/build/lib/libzip.a -lz -v -lssl -lcrypto
 
 $CXX $CXXFLAGS -I. -I../lib \
-    $SRC/libzip/regress/fuzzers/zip_write_encrypt_pkware_file_fuzzer.c \
+    $SRC/libzip/regress/zip_write_encrypt_pkware_file_fuzzer.c \
     -o $OUT/zip_write_encrypt_pkware_file_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libzip/build/lib/libzip.a -lz -v -lssl -lcrypto
 

diff --git a/.../fuzzers/zip_read_encrypted_file_fuzzer.c → regress/zip_read_encrypted_file_fuzzer.c b/.../fuzzers/zip_read_encrypted_file_fuzzer.c → regress/zip_read_encrypted_file_fuzzer.c
diff --git a/regress/fuzzers/zip_read_file_fuzzer.c → regress/zip_read_file_fuzzer.c b/regress/fuzzers/zip_read_file_fuzzer.c → regress/zip_read_file_fuzzer.c
diff --git a/regress/fuzzers/zip_read_fuzzer.c → regress/zip_read_fuzzer.c b/regress/fuzzers/zip_read_fuzzer.c → regress/zip_read_fuzzer.c
diff --git a/...rs/zip_write_encrypt_aes256_file_fuzzer.c → ...ss/zip_write_encrypt_aes256_file_fuzzer.c b/...rs/zip_write_encrypt_aes256_file_fuzzer.c → ...ss/zip_write_encrypt_aes256_file_fuzzer.c
diff --git a/...rs/zip_write_encrypt_pkware_file_fuzzer.c → ...ss/zip_write_encrypt_pkware_file_fuzzer.c b/...rs/zip_write_encrypt_pkware_file_fuzzer.c → ...ss/zip_write_encrypt_pkware_file_fuzzer.c