diff options
97 files changed, 120 insertions, 120 deletions
diff --git a/projects/augeas/build.sh b/projects/augeas/build.sh index a4cae739..6e16c1a4 100644 --- a/projects/augeas/build.sh +++ b/projects/augeas/build.sh @@ -22,7 +22,7 @@ make -j$(nproc) for fuzzer in augeas_escape_name_fuzzer; do $CXX $CXXFLAGS -std=c++11 -Isrc/ `xml2-config --cflags` \ - $SRC/$fuzzer.cc -o $OUT/$fuzzer -lFuzzingEngine \ + $SRC/$fuzzer.cc -o $OUT/$fuzzer $LIB_FUZZING_ENGINE \ src/.libs/libaugeas.a src/.libs/libfa.a ./gnulib/lib/.libs/libgnu.a \ /usr/lib/x86_64-linux-gnu/libxml2.a done diff --git a/projects/bad_example/build.sh b/projects/bad_example/build.sh index 69122082..eb08bd6e 100755 --- a/projects/bad_example/build.sh +++ b/projects/bad_example/build.sh @@ -8,7 +8,7 @@ make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/bad_example_fuzzer.cc -o $OUT/bad_example_valid_build \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a # Testcase 2. Silent startup crash. @@ -19,7 +19,7 @@ make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -I. -DINTENTIONAL_STARTUP_CRASH \ $SRC/bad_example_fuzzer.cc -o $OUT/bad_example_startup_crash \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a # The latest two examples won't for for coverage build, bail out. @@ -41,7 +41,7 @@ make -j$(nproc) all $CXX -fsanitize=$SANITIZER $CXXFLAGS_ORIG -std=c++11 -I. \ $SRC/bad_example_fuzzer.cc -o $OUT/bad_example_partial_instrumentation \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a # Testcase 4. Completely ignore the flags provided by OSS-Fuzz. @@ -52,7 +52,7 @@ make -j$(nproc) all $CXX -fsanitize=$SANITIZER $CXXFLAGS -std=c++11 -I. \ $SRC/bad_example_fuzzer.cc -o $OUT/bad_example_no_instrumentation \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a # Testcase 5. Enable multiple sanitizers. @@ -72,4 +72,4 @@ make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/bad_example_fuzzer.cc -o $OUT/bad_example_mixed_sanitizers \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a diff --git a/projects/bignum-fuzzer/build.sh b/projects/bignum-fuzzer/build.sh index 23a3e5e2..15732eba 100755 --- a/projects/bignum-fuzzer/build.sh +++ b/projects/bignum-fuzzer/build.sh @@ -62,7 +62,7 @@ BASE_CXXFLAGS=$CXXFLAGS cd $SRC/bignum-fuzzer ./config-modules.sh openssl go CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NO_NEGATIVE=1 -DBNFUZZ_FLAG_NUM_LEN=1200 -DBNFUZZ_FLAG_ALL_OPERATIONS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy OpenSSL/Go fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_openssl_go_no_negative_num_len_1200_all_operations @@ -72,7 +72,7 @@ cd $SRC/bignum-fuzzer make clean ./config-modules.sh openssl rust CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NUM_LEN=1200 -DBNFUZZ_FLAG_ALL_OPERATIONS=1 -DBNFUZZ_FLAG_NUM_LOOPS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy OpenSSL/Rust fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_openssl_rust_num_len_1200_all_operations_num_loops_1 @@ -82,7 +82,7 @@ cd $SRC/bignum-fuzzer make clean ./config-modules.sh openssl cpp_boost CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NUM_LEN=1200 -DBNFUZZ_FLAG_ALL_OPERATIONS=1 -DBNFUZZ_FLAG_NUM_LOOPS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy OpenSSL/C++-Boost fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_openssl_cpp_boost_num_len_1200_all_operations_num_loops_1 @@ -92,7 +92,7 @@ cd $SRC/bignum-fuzzer make clean ./config-modules.sh openssl libgmp CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NUM_LEN=1200 -DBNFUZZ_FLAG_ALL_OPERATIONS=1 -DBNFUZZ_FLAG_NUM_LOOPS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy OpenSSL/libgmp fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_openssl_libgmp_num_len_1200_all_operations_num_loops_1 @@ -122,7 +122,7 @@ cd $SRC/bignum-fuzzer make clean ./config-modules.sh boringssl mbedtls CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NUM_LEN=100 -DBNFUZZ_FLAG_ALL_OPERATIONS=1 -DBNFUZZ_FLAG_NUM_LOOPS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy BoringSSL/mbedtls fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_boringssl_mbedtls_num_len_100_all_operations_num_loops_1 @@ -132,7 +132,7 @@ cd $SRC/bignum-fuzzer make clean ./config-modules.sh boringssl libmpdec CXXFLAGS="$BASE_CXXFLAGS -DBNFUZZ_FLAG_NUM_LEN=100 -DBNFUZZ_FLAG_ALL_OPERATIONS=1 -DBNFUZZ_FLAG_NUM_LOOPS=1" -LIBFUZZER_LINK="-lFuzzingEngine" make +LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make # Copy BoringSSL/libmpdec fuzzer to the designated location cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_boringssl_libmpdec_num_len_100_all_operations_num_loops_1 diff --git a/projects/boringssl/build.sh b/projects/boringssl/build.sh index a7f3bd5e..26d9330f 100755 --- a/projects/boringssl/build.sh +++ b/projects/boringssl/build.sh @@ -41,7 +41,7 @@ for F in $fuzzerFiles; do fuzzerName=$(basename $F .cc) echo "Building fuzzer $fuzzerName" $CXX $CXXFLAGS -std=c++11 \ - -o $OUT/${fuzzerName} -lFuzzingEngine $F \ + -o $OUT/${fuzzerName} $LIB_FUZZING_ENGINE $F \ -I $SRC/boringssl/include ./ssl/libssl.a ./crypto/libcrypto.a if [ -d "$SRC/boringssl/fuzz/${fuzzerName}_corpus" ]; then diff --git a/projects/brotli/build.sh b/projects/brotli/build.sh index 30b9283e..cf6f5e76 100755 --- a/projects/brotli/build.sh +++ b/projects/brotli/build.sh @@ -7,7 +7,7 @@ make -j$(nproc) brotlidec-static $CC $CFLAGS -c -std=c99 -I. -I./c/include c/fuzz/decode_fuzzer.c $CXX $CXXFLAGS ./decode_fuzzer.o -o $OUT/decode_fuzzer \ - -lFuzzingEngine ./libbrotlidec-static.a ./libbrotlicommon-static.a + $LIB_FUZZING_ENGINE ./libbrotlidec-static.a ./libbrotlicommon-static.a cp java/org/brotli/integration/fuzz_data.zip $OUT/decode_fuzzer_seed_corpus.zip chmod a-x $OUT/decode_fuzzer_seed_corpus.zip # we will try to run it otherwise diff --git a/projects/bzip2/build.sh b/projects/bzip2/build.sh index 0cf248e2..2cdf271f 100755 --- a/projects/bzip2/build.sh +++ b/projects/bzip2/build.sh @@ -31,7 +31,7 @@ for file in $SRC/*.c; do name=$(basename $file .c) $CC $CFLAGS -c -I . $SRC/${name}.c -o $OUT/${name}.o - $CXX $CXXFLAGS -o $OUT/${name} $OUT/${name}.o -lFuzzingEngine \ + $CXX $CXXFLAGS -o $OUT/${name} $OUT/${name}.o $LIB_FUZZING_ENGINE \ libbz2.a rm -f $OUT/${name}.o done diff --git a/projects/c-ares/build.sh b/projects/c-ares/build.sh index 71d7efda..decac119 100755 --- a/projects/c-ares/build.sh +++ b/projects/c-ares/build.sh @@ -31,13 +31,13 @@ make -j$(nproc) V=1 all $CC $CFLAGS -I. -c $SRC/c-ares/test/ares-test-fuzz.c -o $WORK/ares-test-fuzz.o $CXX $CXXFLAGS -std=c++11 $WORK/ares-test-fuzz.o \ -o $OUT/ares_parse_reply_fuzzer \ - -lFuzzingEngine $SRC/c-ares/.libs/libcares.a + $LIB_FUZZING_ENGINE $SRC/c-ares/.libs/libcares.a $CC $CFLAGS -I. -c $SRC/c-ares/test/ares-test-fuzz-name.c \ -o $WORK/ares-test-fuzz-name.o $CXX $CXXFLAGS -std=c++11 $WORK/ares-test-fuzz-name.o \ -o $OUT/ares_create_query_fuzzer \ - -lFuzzingEngine $SRC/c-ares/.libs/libcares.a + $LIB_FUZZING_ENGINE $SRC/c-ares/.libs/libcares.a # Archive and copy to $OUT seed corpus if the build succeeded. zip -j $OUT/ares_parse_reply_fuzzer_seed_corpus.zip $SRC/c-ares/test/fuzzinput/* diff --git a/projects/capstone/build.sh b/projects/capstone/build.sh index 3b2e9c41..35720ea0 100755 --- a/projects/capstone/build.sh +++ b/projects/capstone/build.sh @@ -50,7 +50,7 @@ do if [ -f CMakeFiles/fuzz_disasm.dir/suite/fuzz/platform.c.o ]; then FUZZO="$FUZZO CMakeFiles/fuzz_disasm.dir/suite/fuzz/platform.c.o" fi - $CXX $CXXFLAGS $FUZZO -o $OUT/fuzz_disasm$branch libcapstone.a -lFuzzingEngine + $CXX $CXXFLAGS $FUZZO -o $OUT/fuzz_disasm$branch libcapstone.a $LIB_FUZZING_ENGINE cd ../../ done diff --git a/projects/cmark/build.sh b/projects/cmark/build.sh index ae416a0e..627fa6c4 100755 --- a/projects/cmark/build.sh +++ b/projects/cmark/build.sh @@ -18,7 +18,7 @@ make -j$(nproc) cmake_build $CC $CFLAGS -Isrc -Ibuild/src -c $SRC/cmark/test/cmark-fuzz.c -o cmark_fuzzer.o -$CXX $CXXFLAGS -lFuzzingEngine cmark_fuzzer.o build/src/libcmark.a -o $OUT/cmark_fuzzer +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE cmark_fuzzer.o build/src/libcmark.a -o $OUT/cmark_fuzzer cp $SRC/*.options $OUT/ cp $SRC/cmark/test/fuzzing_dictionary $OUT/cmark.dict diff --git a/projects/cras/build.sh b/projects/cras/build.sh index 23c27f97..2759730a 100755 --- a/projects/cras/build.sh +++ b/projects/cras/build.sh @@ -17,6 +17,6 @@ $CXX $CXXFLAGS $FUZZER_LDFLAGS \ -I ${SRC}/adhd/cras/src/common \ ${SRC}/adhd/cras/src/.libs/libcrasserver.a \ -lpthread -lrt -ludev -ldl -lm \ - -lFuzzingEngine \ + $LIB_FUZZING_ENGINE \ -Wl,-Bstatic -liniparser -lasound -lspeexdsp -Wl,-Bdynamic zip -j ${OUT}/rclient_message_corpus.zip ${SRC}/adhd/cras/src/fuzz/corpus/* diff --git a/projects/ecc-diff-fuzzer/build.sh b/projects/ecc-diff-fuzzer/build.sh index 301022eb..169470ea 100755 --- a/projects/ecc-diff-fuzzer/build.sh +++ b/projects/ecc-diff-fuzzer/build.sh @@ -88,4 +88,4 @@ $CC $CFLAGS -I. -I../gcrypt/src -c modules/gcrypt.c -o gcrypt.o $CXX $CXXFLAGS -I. -I../ -c modules/cryptopp.cpp -o cryptopp.o $CC $CFLAGS -I. -I../ -c modules/nettle.c -o nettle.o -$CXX $CXXFLAGS fuzz_ec.o mbedtls.o libecc.o openssl.o gcrypt.o cryptopp.o nettle.o -o $OUT/fuzz_ec ../mbedtls/library/libmbedcrypto.a ../libecc/build/libec.a ../libecc/src/external_deps/rand.o ../openssl/libcrypto.a ../nettle/libhogweed.a ../nettle/libnettle.a ../nettle/gmp-6.1.2/.libs/libgmp.a ../gcrypt/src/.libs/libgcrypt.a ../cryptopp/libcryptopp.a -lgpg-error -lFuzzingEngine +$CXX $CXXFLAGS fuzz_ec.o mbedtls.o libecc.o openssl.o gcrypt.o cryptopp.o nettle.o -o $OUT/fuzz_ec ../mbedtls/library/libmbedcrypto.a ../libecc/build/libec.a ../libecc/src/external_deps/rand.o ../openssl/libcrypto.a ../nettle/libhogweed.a ../nettle/libnettle.a ../nettle/gmp-6.1.2/.libs/libgmp.a ../gcrypt/src/.libs/libgcrypt.a ../cryptopp/libcryptopp.a -lgpg-error $LIB_FUZZING_ENGINE diff --git a/projects/expat/build.sh b/projects/expat/build.sh index dc933ae4..b185038f 100755 --- a/projects/expat/build.sh +++ b/projects/expat/build.sh @@ -34,7 +34,7 @@ for encoding in $ENCODING_TYPES; do $CXX $CXXFLAGS -std=c++11 -Ilib/ -DENCODING_${encoding} \ $SRC/parse_fuzzer.cc -o $OUT/${fuzz_target_name} \ - -lFuzzingEngine lib/.libs/libexpat.a + $LIB_FUZZING_ENGINE lib/.libs/libexpat.a # Use dictionaries in proper encoding for 16-bit encoding types. if [[ $encoding == *"UTF_16"* ]]; then diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index 3a3ede23..e13213e5 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -159,7 +159,7 @@ PKG_CONFIG_PATH="$FFMPEG_DEPS_PATH/lib/pkgconfig" ./configure \ --prefix="$FFMPEG_DEPS_PATH" \ --pkg-config-flags="--static" \ --enable-ossfuzz \ - --libfuzzer=-lFuzzingEngine \ + --libfuzzer=$LIB_FUZZING_ENGINE \ --optflags=-O1 \ --enable-gpl \ --enable-libass \ diff --git a/projects/file/build.sh b/projects/file/build.sh index b48140d8..66223bc6 100755 --- a/projects/file/build.sh +++ b/projects/file/build.sh @@ -21,7 +21,7 @@ make V=1 all $CXX $CXXFLAGS -std=c++11 -Isrc/ \ $SRC/magic_fuzzer.cc -o $OUT/magic_fuzzer \ - -lFuzzingEngine ./src/.libs/libmagic.a + $LIB_FUZZING_ENGINE ./src/.libs/libmagic.a cp ./magic/magic.mgc $OUT/ diff --git a/projects/freetype2/build.sh b/projects/freetype2/build.sh index 6ed16410..c4a63c6e 100755 --- a/projects/freetype2/build.sh +++ b/projects/freetype2/build.sh @@ -17,7 +17,7 @@ ################################################################################ # Tell CMake what fuzzing engine to link: -export CMAKE_FUZZING_ENGINE="-lFuzzingEngine" +export CMAKE_FUZZING_ENGINE="$LIB_FUZZING_ENGINE" bash "fuzzing/scripts/build-fuzzers.sh" bash "fuzzing/scripts/prepare-oss-fuzz.sh" diff --git a/projects/fuzzing-puzzles/build.sh b/projects/fuzzing-puzzles/build.sh index 9eba4b8c..6dda8ddd 100755 --- a/projects/fuzzing-puzzles/build.sh +++ b/projects/fuzzing-puzzles/build.sh @@ -17,4 +17,4 @@ $CXX $CXXFLAGS $SRC/fuzzing-puzzles/MultipleConstraintsOnSmallInputTest.cpp \ -o $OUT/multiple_constraints_on_small_input_afl_fuzzer \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE diff --git a/projects/giflib/build.sh b/projects/giflib/build.sh index 79a34405..0978df07 100755 --- a/projects/giflib/build.sh +++ b/projects/giflib/build.sh @@ -12,7 +12,7 @@ ar rc libgif.a *.o cd $SRC $CC $CFLAGS -Wall -c -I giflib-code dgif_target.c -o dgif_target.o $CXX $CXXFLAGS -std=c++11 -I giflib-code dgif_target.o \ - -o $OUT/dgif_target -lFuzzingEngine giflib-code/libgif.a + -o $OUT/dgif_target $LIB_FUZZING_ENGINE giflib-code/libgif.a # Place dict and config in OUT wget -O $OUT/gif.dict \ diff --git a/projects/gnupg/build.sh b/projects/gnupg/build.sh index f31f6a3a..7f338ac3 100755 --- a/projects/gnupg/build.sh +++ b/projects/gnupg/build.sh @@ -68,5 +68,5 @@ ls fuzz_*.c | cut -d_ -f2 | cut -d. -f1 | while read target do $CC $CFLAGS -DHAVE_CONFIG_H -I. -I../.. -I../../common -I../../g10 -c fuzz_$target.c -o fuzz_$target.o - $CXX $CXXFLAGS -std=c++11 -DHAVE_CONFIG_H fuzz_$target.o -o $OUT/fuzz_$target ../../g10/libgpg.a ../../kbx/libkeybox.a ../../common/libcommon.a ../../common/libgpgrl.a -lFuzzingEngine -lgcrypt -lgpg-error -lassuan + $CXX $CXXFLAGS -std=c++11 -DHAVE_CONFIG_H fuzz_$target.o -o $OUT/fuzz_$target ../../g10/libgpg.a ../../kbx/libkeybox.a ../../common/libcommon.a ../../common/libgpgrl.a $LIB_FUZZING_ENGINE -lgcrypt -lgpg-error -lassuan done diff --git a/projects/gnupg/fuzzgnupg.diff b/projects/gnupg/fuzzgnupg.diff index ee8949f9..300033d1 100644 --- a/projects/gnupg/fuzzgnupg.diff +++ b/projects/gnupg/fuzzgnupg.diff @@ -8,7 +8,7 @@ index 78a03c420..57a0949fc 100644 +# TODO choose when to build fuzzing with option ? +AC_CHECK_LIB(FuzzingEngine, main, -+ [ LIB_FUZZING_ENGINE="-lFuzzingEngine" ++ [ LIB_FUZZING_ENGINE="$LIB_FUZZING_ENGINE" + have_fuzz=yes + ]) +AC_SUBST(LIB_FUZZING_ENGINE) diff --git a/projects/grpc/build.sh b/projects/grpc/build.sh index 0f72f186..aa75dbe2 100755 --- a/projects/grpc/build.sh +++ b/projects/grpc/build.sh @@ -80,7 +80,7 @@ for file in $FUZZER_FILES; do echo "Building fuzzer $fuzzer_name" $CXX $CXXFLAGS \ $file -o $OUT/$fuzzer_name \ - -lFuzzingEngine ${FUZZER_LIBRARIES} + $LIB_FUZZING_ENGINE ${FUZZER_LIBRARIES} done # Copy dictionaries and options files to $OUT/ diff --git a/projects/guetzli/build.sh b/projects/guetzli/build.sh index 7f4281d4..03a40151 100755 --- a/projects/guetzli/build.sh +++ b/projects/guetzli/build.sh @@ -16,7 +16,7 @@ ################################################################################ make guetzli_static -$CXX $CXXFLAGS -std=c++11 -I. fuzz_target.cc -lFuzzingEngine \ +$CXX $CXXFLAGS -std=c++11 -I. fuzz_target.cc $LIB_FUZZING_ENGINE \ -o $OUT/guetzli_fuzzer bin/Release/libguetzli_static.a cp $SRC/guetzli_fuzzer_seed_corpus.zip $OUT/ diff --git a/projects/harfbuzz/build.sh b/projects/harfbuzz/build.sh index ad15ecb0..74c4f7d6 100755 --- a/projects/harfbuzz/build.sh +++ b/projects/harfbuzz/build.sh @@ -29,11 +29,11 @@ make -j$(nproc) CPPFLAGS="-DHB_NO_VISIBILITY" V=1 all # Build the fuzzer. $CXX $CXXFLAGS -std=c++11 -Isrc \ ./test/fuzzing/hb-shape-fuzzer.cc -o $OUT/hb-shape-fuzzer \ - -lFuzzingEngine ./src/.libs/libharfbuzz.a + $LIB_FUZZING_ENGINE ./src/.libs/libharfbuzz.a $CXX $CXXFLAGS -std=c++11 -Isrc \ ./test/fuzzing/hb-subset-fuzzer.cc -o $OUT/hb-subset-fuzzer \ - -lFuzzingEngine ./src/.libs/libharfbuzz-subset.a ./src/.libs/libharfbuzz.a + $LIB_FUZZING_ENGINE ./src/.libs/libharfbuzz-subset.a ./src/.libs/libharfbuzz.a # Archive and copy to $OUT seed corpus if the build succeeded. mkdir all-fonts diff --git a/projects/hoextdown/build.sh b/projects/hoextdown/build.sh index e3def072..776b2dff 100755 --- a/projects/hoextdown/build.sh +++ b/projects/hoextdown/build.sh @@ -25,7 +25,7 @@ $CC $CFLAGS -c -std=c99 -Isrc \ "$SRC/hoextdown/test/hoedown_fuzzer.c" -o $WORK/hoedown_fuzzer.o $CXX $CXXFLAGS -std=c++11 -Isrc \ $WORK/hoedown_fuzzer.o -o $OUT/hoedown_fuzzer \ - -lFuzzingEngine "$SRC/hoextdown/libhoedown.a" + $LIB_FUZZING_ENGINE "$SRC/hoextdown/libhoedown.a" cp $SRC/*.options $OUT/ cp $SRC/*.dict $OUT/ diff --git a/projects/icu/build.sh b/projects/icu/build.sh index cd8b6680..744cc55d 100755 --- a/projects/icu/build.sh +++ b/projects/icu/build.sh @@ -53,7 +53,7 @@ for fuzzer in $FUZZERS; do $CXX $CXXFLAGS -std=c++11 \ $SRC/icu/icu4c/source/test/fuzzer/$fuzzer.cc -o $OUT/$fuzzer locale_util.o \ -I$SRC/icu/icu4c/source/common -I$SRC/icu/icu4c/source/i18n -L$WORK/icu/lib \ - -lFuzzingEngine -licui18n -licuuc -licutu -licudata + $LIB_FUZZING_ENGINE -licui18n -licuuc -licutu -licudata done CORPUS="uloc_canonicalize_fuzzer_seed_corpus \ diff --git a/projects/irssi/build.sh b/projects/irssi/build.sh index e48a3102..8947e469 100644 --- a/projects/irssi/build.sh +++ b/projects/irssi/build.sh @@ -42,7 +42,7 @@ FE_COMMON_LIBS="$FE_COMMON_LIBS src/fe-common/core/libfe_common_core.a" FE_FUZZ_CFLAGS="-I. -Isrc -Isrc/core/ -Isrc/irc/core/ -Isrc/fe-common/core/" for target in irssi irc/core/event-get-params fe-common/core/theme-load; do - ${CXX} ${CXXFLAGS} -DHAVE_CONFIG_H -lFuzzingEngine ${FE_FUZZ_CFLAGS} ${GLIB_CFLAGS} \ + ${CXX} ${CXXFLAGS} -DHAVE_CONFIG_H $LIB_FUZZING_ENGINE ${FE_FUZZ_CFLAGS} ${GLIB_CFLAGS} \ src/fe-fuzz/${target}.o src/fe-text/module-formats.o -lm \ -Wl,-Bstatic ${FE_COMMON_LIBS} ${CORE_LIBS} -lssl -lcrypto ${GLIB_LIBS} -lgmodule-2.0 -lz \ -Wl,-Bdynamic -o $OUT/${target##*/}-fuzz diff --git a/projects/json-c/build.sh b/projects/json-c/build.sh index 30c3f779..244504d0 100755 --- a/projects/json-c/build.sh +++ b/projects/json-c/build.sh @@ -26,5 +26,5 @@ for f in $SRC/*_fuzzer.cc; do fuzzer=$(basename "$f" _fuzzer.cc) $CXX $CXXFLAGS -std=c++11 -I$SRC/json-c \ $SRC/${fuzzer}_fuzzer.cc -o $OUT/${fuzzer}_fuzzer \ - -lFuzzingEngine $SRC/json-c/json_c.a + $LIB_FUZZING_ENGINE $SRC/json-c/json_c.a done diff --git a/projects/json/build.sh b/projects/json/build.sh index 54e81939..d53a1b4f 100755 --- a/projects/json/build.sh +++ b/projects/json/build.sh @@ -15,7 +15,7 @@ # ################################################################################ -make FUZZER_ENGINE="-lFuzzingEngine" fuzzers -Ctest +make FUZZER_ENGINE="$LIB_FUZZING_ENGINE" fuzzers -Ctest FUZZER_FILES=$(find test/ -maxdepth 1 -executable -type f) for F in $FUZZER_FILES; do diff --git a/projects/karchive/build.sh b/projects/karchive/build.sh index e2889e28..b600aa56 100644 --- a/projects/karchive/build.sh +++ b/projects/karchive/build.sh @@ -80,7 +80,7 @@ cmake . -DBUILD_SHARED_LIBS=OFF -DQt5Core_DIR=$SRC/qtbase/lib/cmake/Qt5Core/ -DB make install -j$(nproc) # Build karchive_fuzzer -$CXX $CXXFLAGS -fPIC -std=c++11 $SRC/karchive_fuzzer.cc -o $OUT/karchive_fuzzer -I $SRC/qtbase/include/QtCore/ -I $SRC/qtbase/include/ -I $SRC/qtbase/include//QtGui -I $SRC/qtbase/mkspecs/linux-clang-libc++/ -I /usr/local/include/KF5/KArchive -L $SRC/qtbase/lib -lQt5Core -lm -lqtpcre2 -ldl -lpthread -lFuzzingEngine /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive /usr/local/lib/libbz2.a -llzma -lQt5Core +$CXX $CXXFLAGS -fPIC -std=c++11 $SRC/karchive_fuzzer.cc -o $OUT/karchive_fuzzer -I $SRC/qtbase/include/QtCore/ -I $SRC/qtbase/include/ -I $SRC/qtbase/include//QtGui -I $SRC/qtbase/mkspecs/linux-clang-libc++/ -I /usr/local/include/KF5/KArchive -L $SRC/qtbase/lib -lQt5Core -lm -lqtpcre2 -ldl -lpthread $LIB_FUZZIN_ENGINE /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive /usr/local/lib/libbz2.a -llzma -lQt5Core cd $SRC find . -name "*.gz" -o -name "*.zip" -o -name "*.xz" -o -name "*.tar" | zip -q $OUT/karchive_fuzzer_seed_corpus.zip -@ diff --git a/projects/kcodecs/build.sh b/projects/kcodecs/build.sh index c1100379..580f42fd 100644 --- a/projects/kcodecs/build.sh +++ b/projects/kcodecs/build.sh @@ -41,6 +41,6 @@ make -j$(nproc) VERBOSE=1 $CXX $CXXFLAGS -fPIC -std=c++11 $SRC/kcodecs_fuzzer.cc -o $OUT/kcodecs_fuzzer \ -I $SRC/qtbase/include/QtCore/ -I $SRC/qtbase/include/ -I $SRC/kcodecs/src \ -I $SRC/kcodecs/src/probers -L $SRC/qtbase/lib -L $SRC/kcodecs/lib \ - -lQt5Core -lm -lqtpcre2 -ldl -lpthread -lFuzzingEngine -lKF5Codecs + -lQt5Core -lm -lqtpcre2 -ldl -lpthread $LIB_FUZZING_ENGINE -lKF5Codecs zip -qr $OUT/kcodecs_fuzzer_seed_corpus.zip $SRC/uchardet/test/ $SRC/kcodecs/autotests/data diff --git a/projects/keystone/build.sh b/projects/keystone/build.sh index be328c19..f1dfcc55 100755 --- a/projects/keystone/build.sh +++ b/projects/keystone/build.sh @@ -28,7 +28,7 @@ ls fuzz_*.c | cut -d_ -f2-4 | cut -d. -f1 | while read target do $CC $CFLAGS -I../../include -c fuzz_$target.c -o fuzz_$target.o - $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target ../../build/llvm/lib/libkeystone.a -lFuzzingEngine + $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target ../../build/llvm/lib/libkeystone.a $LIB_FUZZING_ENGINE #TODO corpuses cp fuzz_asm.options $OUT/fuzz_$target.options diff --git a/projects/kimageformats/build.sh b/projects/kimageformats/build.sh index e0b7f208..c4842e49 100644 --- a/projects/kimageformats/build.sh +++ b/projects/kimageformats/build.sh @@ -48,7 +48,7 @@ echo "$HANDLER_TYPES" | while read class format; do ( fuzz_target_name=kimgio_${format}_fuzzer - $CXX $CXXFLAGS -fPIC -DHANDLER=$class -std=c++11 $SRC/kimgio_fuzzer.cc $SRC/kimageformats/src/imageformats/$format.cpp -o $OUT/$fuzz_target_name -I $SRC/qtbase/include/QtCore/ -I $SRC/qtbase/include/ -I $SRC/qtbase/include//QtGui -I $SRC/kimageformats/src/imageformats/ -I $SRC/karchive/src/ -I $SRC/qtbase/mkspecs/linux-clang-libc++/ -L $SRC/qtbase/lib -lQt5Gui -lQt5Core -lqtlibpng -lqtharfbuzz -lm -lqtpcre2 -ldl -lpthread -lFuzzingEngine /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive + $CXX $CXXFLAGS -fPIC -DHANDLER=$class -std=c++11 $SRC/kimgio_fuzzer.cc $SRC/kimageformats/src/imageformats/$format.cpp -o $OUT/$fuzz_target_name -I $SRC/qtbase/include/QtCore/ -I $SRC/qtbase/include/ -I $SRC/qtbase/include//QtGui -I $SRC/kimageformats/src/imageformats/ -I $SRC/karchive/src/ -I $SRC/qtbase/mkspecs/linux-clang-libc++/ -L $SRC/qtbase/lib -lQt5Gui -lQt5Core -lqtlibpng -lqtharfbuzz -lm -lqtpcre2 -ldl -lpthread $LIB_FUZZING_ENGINE /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive find . -name "*.${format}" | zip -q $OUT/${fuzz_target_name}_seed_corpus.zip -@ ) diff --git a/projects/lame/build.sh b/projects/lame/build.sh index cb9702f8..8b53833f 100755 --- a/projects/lame/build.sh +++ b/projects/lame/build.sh @@ -25,6 +25,6 @@ then export CXXFLAGS="$CXXFLAGS -DMSAN" fi -$CXX -std=c++17 -Wall -Wextra -Werror $CXXFLAGS -I fuzzing-headers/include/ -I $SRC/lame/include/ fuzzer-encoder.cpp -lFuzzingEngine $SRC/lame/libmp3lame/.libs/libmp3lame.a -lm -o $OUT/fuzzer-encoder +$CXX -std=c++17 -Wall -Wextra -Werror $CXXFLAGS -I fuzzing-headers/include/ -I $SRC/lame/include/ fuzzer-encoder.cpp $LIB_FUZZING_ENGINE $SRC/lame/libmp3lame/.libs/libmp3lame.a -lm -o $OUT/fuzzer-encoder cp fuzzer-encoder_seed_corpus.zip $OUT/ cp fuzzer-encoder.dict $OUT/ diff --git a/projects/lcms/build.sh b/projects/lcms/build.sh index 6e07e163..4015b1ba 100755 --- a/projects/lcms/build.sh +++ b/projects/lcms/build.sh @@ -26,7 +26,7 @@ for F in $FUZZERS; do $SRC/$F.c -o $SRC/$F.o $CXX $CXXFLAGS \ $SRC/$F.o -o $OUT/$F \ - -lFuzzingEngine src/.libs/liblcms2.a + $LIB_FUZZING_ENGINE src/.libs/liblcms2.a done cp $SRC/icc.dict $SRC/*.options $OUT/ diff --git a/projects/leptonica/build.sh b/projects/leptonica/build.sh index bdca31b0..991c0cb4 100755 --- a/projects/leptonica/build.sh +++ b/projects/leptonica/build.sh @@ -115,5 +115,5 @@ $CXX $CXXFLAGS -std=c++11 -I"$WORK/include" \ "$WORK/lib/libjbig.a" \ "$WORK/lib/libzstd.a" \ "$WORK/lib/libz.a" \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE diff --git a/projects/libaom/build.sh b/projects/libaom/build.sh index 0e0a0291..522a151c 100755 --- a/projects/libaom/build.sh +++ b/projects/libaom/build.sh @@ -75,7 +75,7 @@ for mode in "${fuzzer_modes[@]}"; do -I$SRC/aom \ -I${build_dir} \ -Wl,--start-group \ - -lFuzzingEngine \ + $LIB_FUZZING_ENGINE \ $SRC/${fuzzer_src_name}.cc -o $OUT/${fuzzer_name} \ ${build_dir}/libaom.a ${build_dir}/ivfdec.o ${build_dir}/tools_common.o \ -Wl,--end-group diff --git a/projects/libarchive/build.sh b/projects/libarchive/build.sh index 1fa8d1b7..0f04f8dc 100755 --- a/projects/libarchive/build.sh +++ b/projects/libarchive/build.sh @@ -23,6 +23,6 @@ make -j$(nproc) all # build fuzzer(s) $CXX $CXXFLAGS -Ilibarchive \ $SRC/libarchive_fuzzer.cc -o $OUT/libarchive_fuzzer \ - -lFuzzingEngine .libs/libarchive.a \ + $LIB_FUZZING_ENGINE .libs/libarchive.a \ -Wl,-Bstatic -lbz2 -llzo2 -lxml2 -llzma -lz -lcrypto -llz4 -licuuc \ -licudata -Wl,-Bdynamic diff --git a/projects/libass/build.sh b/projects/libass/build.sh index e4e3acab..cb487018 100755 --- a/projects/libass/build.sh +++ b/projects/libass/build.sh @@ -28,7 +28,7 @@ make -j$(nproc) $CXX $CXXFLAGS -std=c++11 -I$SRC/libass -L/work/lib \ $SRC/libass_fuzzer.cc -o $OUT/libass_fuzzer \ - -lFuzzingEngine libass/.libs/libass.a \ + $LIB_FUZZING_ENGINE libass/.libs/libass.a \ -Wl,-Bstatic -lfontconfig -lfribidi -lfreetype -lz -lpng12 \ -lexpat -Wl,-Bdynamic diff --git a/projects/libchewing/build.sh b/projects/libchewing/build.sh index 3dbc4da1..e721a0b2 100755 --- a/projects/libchewing/build.sh +++ b/projects/libchewing/build.sh @@ -32,7 +32,7 @@ for variant in default random_init dynamic_config; do -o $OUT/chewing_${variant}_fuzzer \ $WORK/chewing_${variant}_fuzzer.o $WORK/chewing_fuzzer_common.o \ test/stress.o test/.libs/libtesthelper.a src/.libs/libchewing.a \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE done # install data files diff --git a/projects/libexif/build.sh b/projects/libexif/build.sh index 62eef44d..625119e1 100755 --- a/projects/libexif/build.sh +++ b/projects/libexif/build.sh @@ -27,4 +27,4 @@ cp libexif/test/testdata/*.jpg exif_corpus zip -r "$OUT/exif_loader_fuzzer_seed_corpus.zip" exif_corpus/ popd -$CXX $CXXFLAGS -std=c++11 -I"$WORK/include" "$SRC/exif_loader_fuzzer.cc" -o $OUT/exif_loader_fuzzer -lFuzzingEngine "$WORK/lib/libexif.a" +$CXX $CXXFLAGS -std=c++11 -I"$WORK/include" "$SRC/exif_loader_fuzzer.cc" -o $OUT/exif_loader_fuzzer $LIB_FUZZING_ENGINE "$WORK/lib/libexif.a" diff --git a/projects/libgd/build.sh b/projects/libgd/build.sh index 72a81746..bb95898d 100755 --- a/projects/libgd/build.sh +++ b/projects/libgd/build.sh @@ -29,7 +29,7 @@ for target in Bmp Gif Tga Gd Gd2 WBMP; do $CXX $CXXFLAGS -std=c++11 -I"$WORK/include" -L"$WORK/lib" \ -DFUZZ_GD_FORMAT=$target \ $SRC/parser_target.cc -o $OUT/${lowercase}_target \ - -lFuzzingEngine -lgd -Wl,-Bstatic -lz -Wl,-Bdynamic + $LIB_FUZZING_ENGINE -lgd -Wl,-Bstatic -lz -Wl,-Bdynamic done mkdir afl_testcases diff --git a/projects/libgit2/build.sh b/projects/libgit2/build.sh index a78d34ed..c9990e2b 100755 --- a/projects/libgit2/build.sh +++ b/projects/libgit2/build.sh @@ -36,7 +36,7 @@ do -DLIBGIT2_NO_FEATURES_H \ "$fuzzer" -o "$WORK/$fuzzer_name.o" $CXX $CXXFLAGS -std=c++11 -o "$OUT/$fuzzer_name" \ - -lFuzzingEngine "$WORK/$fuzzer_name.o" "$WORK/lib/libgit2.a" + $LIB_FUZZING_ENGINE "$WORK/$fuzzer_name.o" "$WORK/lib/libgit2.a" zip -j "$OUT/${fuzzer_name}_seed_corpus.zip" \ ../fuzzers/corpora/${fuzzer_name%_fuzzer}/* diff --git a/projects/libhtp/build.sh b/projects/libhtp/build.sh index 5b91b1b2..d15adbd7 100755 --- a/projects/libhtp/build.sh +++ b/projects/libhtp/build.sh @@ -23,7 +23,7 @@ make $CC $CFLAGS -I. -c test/fuzz/fuzz_htp.c -o fuzz_htp.o $CC $CFLAGS -I. -c test/test.c -o test.o -$CXX $CXXFLAGS fuzz_htp.o test.o -o $OUT/fuzz_htp ./htp/.libs/libhtp.a -lFuzzingEngine -lz +$CXX $CXXFLAGS fuzz_htp.o test.o -o $OUT/fuzz_htp ./htp/.libs/libhtp.a $LIB_FUZZING_ENGINE -lz # builds corpus zip -r $OUT/fuzz_htp_seed_corpus.zip test/files/*.t diff --git a/projects/libical/build.sh b/projects/libical/build.sh index 8bb61040..830a55b1 100644 --- a/projects/libical/build.sh +++ b/projects/libical/build.sh @@ -1,6 +1,6 @@ cmake . -DSTATIC_ONLY=ON -DICAL_GLIB=False make install -j$(nproc) -$CXX $CXXFLAGS -std=c++11 $SRC/libical_fuzzer.cc -lFuzzingEngine /usr/local/lib/libical.a -o $OUT/libical_fuzzer +$CXX $CXXFLAGS -std=c++11 $SRC/libical_fuzzer.cc $LIB_FUZZING_ENGINE /usr/local/lib/libical.a -o $OUT/libical_fuzzer find . -name *.ics -print | zip -q $OUT/libical_fuzzer_seed_corpus.zip -@ diff --git a/projects/libjpeg-turbo/build.sh b/projects/libjpeg-turbo/build.sh index 5e830122..e500e20b 100755 --- a/projects/libjpeg-turbo/build.sh +++ b/projects/libjpeg-turbo/build.sh @@ -21,6 +21,6 @@ make install $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/libjpeg_turbo_fuzzer.cc -o $OUT/libjpeg_turbo_fuzzer \ - -lFuzzingEngine "$WORK/lib/libturbojpeg.a" + $LIB_FUZZING_ENGINE "$WORK/lib/libturbojpeg.a" cp $SRC/libjpeg_turbo_fuzzer_seed_corpus.zip $OUT/ diff --git a/projects/libldac/build.sh b/projects/libldac/build.sh index e81a6e9c..b881d913 100755 --- a/projects/libldac/build.sh +++ b/projects/libldac/build.sh @@ -19,7 +19,7 @@ $CC $CFLAGS -Iinc -c $SRC/libldac_encode_fuzzer.cc -o libldac_encode_fuzzer.o $CC $CFLAGS -Iinc -c src/ldaclib.c -o src/ldaclib.o $CC $CFLAGS -Iinc -c src/ldacBT.c -o src/ldacBT.o -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ libldac_encode_fuzzer.o \ src/ldaclib.o \ src/ldacBT.o \ diff --git a/projects/libpcap/build.sh b/projects/libpcap/build.sh index 106db2b7..e44f8b83 100755 --- a/projects/libpcap/build.sh +++ b/projects/libpcap/build.sh @@ -28,7 +28,7 @@ make for target in pcap filter both do $CC $CFLAGS -I.. -c ../testprogs/fuzz/fuzz_$target.c -o fuzz_$target.o - $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target libpcap.a -lFuzzingEngine + $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target libpcap.a $LIB_FUZZING_ENGINE done # export other associated stuff diff --git a/projects/libplist/build.sh b/projects/libplist/build.sh index fc73b026..14a29c43 100755 --- a/projects/libplist/build.sh +++ b/projects/libplist/build.sh @@ -23,7 +23,7 @@ make -j$(nproc) all for fuzzer in bplist_fuzzer xplist_fuzzer; do $CXX $CXXFLAGS -std=c++11 -Iinclude/ \ fuzz/$fuzzer.cc -o $OUT/$fuzzer \ - -lFuzzingEngine src/.libs/libplist.a + $LIB_FUZZING_ENGINE src/.libs/libplist.a done zip -j $OUT/bplist_fuzzer_seed_corpus.zip test/data/*.bplist diff --git a/projects/libressl/build.sh b/projects/libressl/build.sh index e19c6d58..b6700e9a 100755 --- a/projects/libressl/build.sh +++ b/projects/libressl/build.sh @@ -48,7 +48,7 @@ for F in $fuzzerFiles; do $CXX $CXXFLAGS \ -o $OUT/${fuzzerName} -fsanitize-recover=address \ - $WORK/driver.o $WORK/${fuzzerName}.o ./ssl/libssl.a ./crypto/libcrypto.a ./tls/libtls.a -lFuzzingEngine + $WORK/driver.o $WORK/${fuzzerName}.o ./ssl/libssl.a ./crypto/libcrypto.a ./tls/libtls.a $LIB_FUZZING_ENGINE if [ -d "$LIBRESSL_FUZZERS/corpora/${fuzzerName}/" ]; then zip -j $OUT/${fuzzerName}_seed_corpus.zip $LIBRESSL_FUZZERS/corpora/${fuzzerName}/* diff --git a/projects/libsodium/build.sh b/projects/libsodium/build.sh index b98b358e..2b95a30b 100755 --- a/projects/libsodium/build.sh +++ b/projects/libsodium/build.sh @@ -24,5 +24,5 @@ for f in $SRC/*_fuzzer.cc; do fuzzer=$(basename "$f" _fuzzer.cc) $CXX $CXXFLAGS -std=c++11 -I"$SRC/libsodium/src/libsodium/include" \ "$f" -o "$OUT/${fuzzer}_fuzzer" \ - "$SRC/libsodium/src/libsodium/.libs/libsodium.a" -lFuzzingEngine + "$SRC/libsodium/src/libsodium/.libs/libsodium.a" $LIB_FUZZING_ENGINE done diff --git a/projects/libspng/build.sh b/projects/libspng/build.sh index f0857734..92a3542d 100644 --- a/projects/libspng/build.sh +++ b/projects/libspng/build.sh @@ -22,14 +22,14 @@ ninja -C build $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/libspng/tests/spng_read_fuzzer.cc \ -o $OUT/spng_read_fuzzer \ - -lFuzzingEngine $SRC/libspng/build/libspng.a -lz + $LIB_FUZZING_ENGINE $SRC/libspng/build/libspng.a -lz $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/libspng/tests/spng_read_fuzzer.cc \ -o $OUT/spng_read_fuzzer_structure_aware \ -include ../fuzzer-test-suite/libpng-1.2.56/png_mutator.h \ -D PNG_MUTATOR_DEFINE_LIBFUZZER_CUSTOM_MUTATOR \ - -lFuzzingEngine $SRC/libspng/build/libspng.a -lz + $LIB_FUZZING_ENGINE $SRC/libspng/build/libspng.a -lz find $SRC/libspng/tests/images -name "*.png" | \ xargs zip $OUT/spng_read_fuzzer_seed_corpus.zip diff --git a/projects/libsrtp/build.sh b/projects/libsrtp/build.sh index 85740890..aa2eb10d 100755 --- a/projects/libsrtp/build.sh +++ b/projects/libsrtp/build.sh @@ -3,7 +3,7 @@ git checkout fuzzing git fetch origin fuzzing autoreconf -ivf ./configure -LIBFUZZER="-lFuzzingEngine" make srtp-fuzzer +LIBFUZZER="$LIB_FUZZING_ENGINE" make srtp-fuzzer zip -r srtp-fuzzer_seed_corpus.zip fuzzer/corpus cp $SRC/libsrtp/fuzzer/srtp-fuzzer $OUT cp srtp-fuzzer_seed_corpus.zip $OUT diff --git a/projects/libssh/build.sh b/projects/libssh/build.sh index e29f85f5..7355542f 100644 --- a/projects/libssh/build.sh +++ b/projects/libssh/build.sh @@ -25,5 +25,5 @@ make "-j$(nproc)" $CXX $CXXFLAGS -std=c++11 -I$SRC/libssh/include/ \ "$SRC/libssh/tests/fuzz/ssh_server_fuzzer.cpp" \ -o "$OUT/libssh_server_fuzzer" \ - -lFuzzingEngine ./src/libssh.a -Wl,-Bstatic -lcrypto -lz -Wl,-Bdynamic + $LIB_FUZZING_ENGINE ./src/libssh.a -Wl,-Bstatic -lcrypto -lz -Wl,-Bdynamic popd diff --git a/projects/libteken/build.sh b/projects/libteken/build.sh index 4e5ef8e3..eef2596e 100755 --- a/projects/libteken/build.sh +++ b/projects/libteken/build.sh @@ -22,4 +22,4 @@ CFLAGS="$CFLAGS -D__unused=" pmake -C libteken libteken.a $CC $CFLAGS -c $SRC/libteken_fuzzer.c -o $SRC/libteken_fuzzer.o -I. $CXX $CXXFLAGS $SRC/libteken_fuzzer.o \ -o $OUT/libteken_fuzzer \ - -lFuzzingEngine libteken/libteken.a + $LIB_FUZZING_ENGINE libteken/libteken.a diff --git a/projects/libtsm/build.sh b/projects/libtsm/build.sh index b9c5e4ed..4c091be2 100755 --- a/projects/libtsm/build.sh +++ b/projects/libtsm/build.sh @@ -26,4 +26,4 @@ $CXX $CXXFLAGS \ -o $OUT/libtsm_fuzzer \ $SRC/libtsm_fuzzer.o \ .libs/libtsm.a \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE diff --git a/projects/libvpx/build.sh b/projects/libvpx/build.sh index 9fd89c7e..3f6559d2 100755 --- a/projects/libvpx/build.sh +++ b/projects/libvpx/build.sh @@ -53,7 +53,7 @@ for decoder in "${fuzzer_decoders[@]}"; do -I$SRC/libvpx \ -I${build_dir} \ -Wl,--start-group \ - -lFuzzingEngine \ + $LIB_FUZZING_ENGINE \ $SRC/libvpx/examples/${fuzzer_src_name}.cc -o $OUT/${fuzzer_name} \ ${build_dir}/libvpx.a \ -Wl,--end-group diff --git a/projects/libwebp/build.sh b/projects/libwebp/build.sh index 612f10ef..d9ea7a35 100644 --- a/projects/libwebp/build.sh +++ b/projects/libwebp/build.sh @@ -36,7 +36,7 @@ find $SRC/libwebp-test-data -type f -size -32k -iname "*.webp" \ # Simple Decoding API $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_simple_api.c -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_simple_api.o -o $OUT/fuzz_simple_api \ src/.libs/libwebp.a cp fuzz_seed_corpus.zip $OUT/fuzz_simple_api_seed_corpus.zip @@ -44,7 +44,7 @@ cp $SRC/fuzz.dict $OUT/fuzz_simple_api.dict # Advanced Decoding API $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_advanced_api.c -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_advanced_api.o -o $OUT/fuzz_advanced_api \ src/.libs/libwebp.a cp fuzz_seed_corpus.zip $OUT/fuzz_advanced_api_seed_corpus.zip @@ -52,7 +52,7 @@ cp $SRC/fuzz.dict $OUT/fuzz_advanced_api.dict # Animation Decoding API $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_animation_api.c -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_animation_api.o -o $OUT/fuzz_animation_api \ src/demux/.libs/libwebpdemux.a \ src/.libs/libwebp.a @@ -61,7 +61,7 @@ cp $SRC/fuzz.dict $OUT/fuzz_animation_api.dict # Animation Encoding API $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_webp_animencoder.cc -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_webp_animencoder.o -o $OUT/fuzz_webp_animencoder \ src/mux/.libs/libwebpmux.a \ src/.libs/libwebp.a @@ -69,7 +69,7 @@ cp fuzz_seed_corpus.zip $OUT/fuzz_webp_animencoder_seed_corpus.zip # (De)mux API $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_demux_api.c -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_demux_api.o -o $OUT/fuzz_demux_api \ src/demux/.libs/libwebpdemux.a src/mux/.libs/libwebpmux.a \ src/.libs/libwebp.a @@ -78,7 +78,7 @@ cp $SRC/fuzz.dict $OUT/fuzz_demux_api.dict # Encode then Decode $CC $CFLAGS -Isrc -I. -c $SRC/fuzz_webp_enc_dec.cc -$CXX $CXXFLAGS -lFuzzingEngine \ +$CXX $CXXFLAGS $LIB_FUZZING_ENGINE \ fuzz_webp_enc_dec.o -o $OUT/fuzz_webp_enc_dec \ src/.libs/libwebp.a cp fuzz_seed_corpus.zip $OUT/fuzz_webp_enc_dec_seed_corpus.zip diff --git a/projects/libxml2/build.sh b/projects/libxml2/build.sh index fe052b6f..418792b1 100755 --- a/projects/libxml2/build.sh +++ b/projects/libxml2/build.sh @@ -27,7 +27,7 @@ zip -r $seed_corpus_temp_file $SRC/libxml2/test for fuzzer in libxml2_xml_read_memory_fuzzer libxml2_xml_reader_for_file_fuzzer; do $CXX $CXXFLAGS -std=c++11 -Iinclude/ \ $SRC/$fuzzer.cc -o $OUT/$fuzzer \ - -lFuzzingEngine .libs/libxml2.a + $LIB_FUZZING_ENGINE .libs/libxml2.a cp $SRC/*.dict $OUT/$fuzzer.dict cp $seed_corpus_temp_file $OUT/${fuzzer}_seed_corpus.zip diff --git a/projects/libyaml/build.sh b/projects/libyaml/build.sh index 89a5980d..f78b99ba 100755 --- a/projects/libyaml/build.sh +++ b/projects/libyaml/build.sh @@ -20,7 +20,7 @@ make "-j$(nproc)" $CXX $CXXFLAGS -std=c++11 -Iinclude \ $SRC/libyaml_fuzzer.cc -o $OUT/libyaml_fuzzer \ - -lFuzzingEngine src/.libs/libyaml.a + $LIB_FUZZING_ENGINE src/.libs/libyaml.a cp $SRC/libyaml_fuzzer_seed_corpus.zip $OUT/ cp $SRC/*.dict $SRC/*.options $OUT/ diff --git a/projects/llvm_libcxx/build.sh b/projects/llvm_libcxx/build.sh index 8121900a..961a912f 100755 --- a/projects/llvm_libcxx/build.sh +++ b/projects/llvm_libcxx/build.sh @@ -28,5 +28,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert(result == 0); return 0; } EOF - $CXX $CXXFLAGS -std=c++11 ${f}_fuzzer.cc ./libcxx/fuzzing/fuzzing.cpp -I ./libcxx -o $OUT/$f -lFuzzingEngine + $CXX $CXXFLAGS -std=c++11 ${f}_fuzzer.cc ./libcxx/fuzzing/fuzzing.cpp -I ./libcxx -o $OUT/$f $LIB_FUZZING_ENGINE done diff --git a/projects/llvm_libcxxabi/build.sh b/projects/llvm_libcxxabi/build.sh index e8fbabe2..b5e0d701 100644 --- a/projects/llvm_libcxxabi/build.sh +++ b/projects/llvm_libcxxabi/build.sh @@ -16,4 +16,4 @@ # ################################################################################ $CXX $CXXFLAGS -std=c++11 -g src/cxa_demangle.cpp -Iinclude fuzz/cxa_demangle_fuzzer.cpp \ - -o $OUT/cxa_demangle_fuzzer -lFuzzingEngine + -o $OUT/cxa_demangle_fuzzer $LIB_FUZZING_ENGINE diff --git a/projects/lwan/build.sh b/projects/lwan/build.sh index 6ae5277a..bc3c960f 100644 --- a/projects/lwan/build.sh +++ b/projects/lwan/build.sh @@ -36,6 +36,6 @@ for fuzzer in $SRC/lwan/src/bin/fuzz/*_fuzzer.cc; do $CXX $CXXFLAGS -std=c++11 \ -Wl,-whole-archive $WORK/lwan/src/lib/liblwan.a -Wl,-no-whole-archive \ -I$SRC/lwan/src/lib $fuzzer \ - -lFuzzingEngine -lpthread -lz \ + $LIB_FUZZING_ENGINE -lpthread -lz \ -o $OUT/$executable done diff --git a/projects/lzo/build.sh b/projects/lzo/build.sh index 25b84d57..bfe78b95 100755 --- a/projects/lzo/build.sh +++ b/projects/lzo/build.sh @@ -27,7 +27,7 @@ do name=$(basename $file .c) $CC $CFLAGS -c -I include -I minilzo -I include/lzo ${file} -o ${name}.o $CXX $CXXFLAGS -std=c++11 -I include -I minilzo -I include/lzo ${name}.o \ - -o $OUT/${name} -lFuzzingEngine src/.libs/liblzo2.a + -o $OUT/${name} $LIB_FUZZING_ENGINE src/.libs/liblzo2.a done # copy fuzzer options diff --git a/projects/mbedtls/build.sh b/projects/mbedtls/build.sh index f5f70066..1788e3df 100755 --- a/projects/mbedtls/build.sh +++ b/projects/mbedtls/build.sh @@ -47,5 +47,5 @@ for target in x509crl x509crt x509csr privkey pubkey client server dtlsclient dt do $CC $CFLAGS -I. -I ../../include -c fuzz_$target.c -o fuzz_$target.o - $CXX $CXXFLAGS -std=c++11 fuzz_$target.o -o $OUT/fuzz_$target ../../library/libmbedx509.a ../../library/libmbedtls.a ../../library/libmbedcrypto.a -lFuzzingEngine + $CXX $CXXFLAGS -std=c++11 fuzz_$target.o -o $OUT/fuzz_$target ../../library/libmbedx509.a ../../library/libmbedtls.a ../../library/libmbedcrypto.a $LIB_FUZZING_ENGINE done diff --git a/projects/mpg123/build.sh b/projects/mpg123/build.sh index 49317c5f..bd0de3db 100755 --- a/projects/mpg123/build.sh +++ b/projects/mpg123/build.sh @@ -22,7 +22,7 @@ make install popd $CC $CXXFLAGS read_fuzzer.c -I$WORK/include $WORK/lib/libmpg123.a \ - -lFuzzingEngine -lc++ -o $OUT/read_fuzzer + $LIB_FUZZING_ENGINE -lc++ -o $OUT/read_fuzzer $CXX $CXXFLAGS decode_fuzzer.cc -I$WORK/include $WORK/lib/libmpg123.a \ - -lFuzzingEngine -o $OUT/decode_fuzzer + $LIB_FUZZING_ENGINE -o $OUT/decode_fuzzer diff --git a/projects/msgpack-c/build.sh b/projects/msgpack-c/build.sh index 03e0604a..21faacfb 100755 --- a/projects/msgpack-c/build.sh +++ b/projects/msgpack-c/build.sh @@ -27,7 +27,7 @@ for f in $SRC/msgpack-c/fuzz/*_fuzzer.cpp; do fuzzer=$(basename "$f" .cpp) $CXX $CXXFLAGS -std=c++11 -Iinclude -I"$SRC/msgpack-c/include" \ "$f" -o "$OUT/${fuzzer}" \ - -lFuzzingEngine "$SRC/msgpack-c/libmsgpackc.a" + $LIB_FUZZING_ENGINE "$SRC/msgpack-c/libmsgpackc.a" if [ -d "$SRC/msgpack-c/fuzz/${fuzzer}_seed_corpus" ]; then zip -rj "$OUT/${fuzzer}_seed_corpus.zip" "$SRC/msgpack-c/fuzz/${fuzzer}_seed_corpus/" diff --git a/projects/mupdf/build.sh b/projects/mupdf/build.sh index edbf651e..d0619069 100755 --- a/projects/mupdf/build.sh +++ b/projects/mupdf/build.sh @@ -20,7 +20,7 @@ fuzz_target=pdf_fuzzer $CXX $CXXFLAGS -std=c++11 -Iinclude \ source/fuzz/pdf_fuzzer.cc -o $OUT/$fuzz_target \ - -lFuzzingEngine $WORK/libmupdf.a $WORK/libmupdf-third.a + $LIB_FUZZING_ENGINE $WORK/libmupdf.a $WORK/libmupdf-third.a mv $SRC/{*.zip,*.dict,*.options} $OUT diff --git a/projects/nestegg/build.sh b/projects/nestegg/build.sh index 1e496784..3031ca8a 100644 --- a/projects/nestegg/build.sh +++ b/projects/nestegg/build.sh @@ -1,7 +1,7 @@ #!/bin/bash -eu $CC $CFLAGS -c -I./include src/nestegg.c -$CXX $CXXFLAGS -o $OUT/fuzz -I./include nestegg.o test/fuzz.cc -lFuzzingEngine +$CXX $CXXFLAGS -o $OUT/fuzz -I./include nestegg.o test/fuzz.cc $LIB_FUZZING_ENGINE mkdir corpus/ diff --git a/projects/net-snmp/build.sh b/projects/net-snmp/build.sh index c0c0a8f1..b7bceda0 100755 --- a/projects/net-snmp/build.sh +++ b/projects/net-snmp/build.sh @@ -23,13 +23,13 @@ make # build fuzzers (remember to link statically) $CC $CFLAGS -c -Iinclude $SRC/snmp_pdu_parse_fuzzer.c -o $WORK/snmp_pdu_parse_fuzzer.o $CXX $CXXFLAGS $WORK/snmp_pdu_parse_fuzzer.o \ - -lFuzzingEngine snmplib/.libs/libnetsnmp.a \ + $LIB_FUZZING_ENGINE snmplib/.libs/libnetsnmp.a \ -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -lm \ -o $OUT/snmp_pdu_parse_fuzzer $CC $CFLAGS -c -Iinclude -Iagent/mibgroup/agentx $SRC/agentx_parse_fuzzer.c -o $WORK/agentx_parse_fuzzer.o $CXX $CXXFLAGS $WORK/agentx_parse_fuzzer.o \ - -lFuzzingEngine snmplib/.libs/libnetsnmp.a \ + $LIB_FUZZING_ENGINE snmplib/.libs/libnetsnmp.a \ agent/.libs/libnetsnmpagent.a \ -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -lm \ -o $OUT/agentx_parse_fuzzer diff --git a/projects/nghttp2/build.sh b/projects/nghttp2/build.sh index 819af675..728fd9e2 100755 --- a/projects/nghttp2/build.sh +++ b/projects/nghttp2/build.sh @@ -21,7 +21,7 @@ make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -Ilib/includes \ fuzz/fuzz_target.cc -o $OUT/nghttp2_fuzzer \ - -lFuzzingEngine lib/.libs/libnghttp2.a + $LIB_FUZZING_ENGINE lib/.libs/libnghttp2.a cp $SRC/*.options $OUT diff --git a/projects/opendnp3/build.sh b/projects/opendnp3/build.sh index fc9b1120..a4bada3b 100755 --- a/projects/opendnp3/build.sh +++ b/projects/opendnp3/build.sh @@ -29,5 +29,5 @@ cp *.options $OUT/ # build fuzz target $CXX $CXXFLAGS -I. -I ../../libs/include/ -c fuzzdnp3.cpp -o fuzzdnp3.o -$CXX $CXXFLAGS -std=c++14 fuzzdnp3.o -o $OUT/fuzz_dnp3 ../../../libasiodnp3.a ../../../libdnp3decode.a ../../../libasiopal.a ../../../libopendnp3.a ../../../libopenpal.a -lFuzzingEngine +$CXX $CXXFLAGS -std=c++14 fuzzdnp3.o -o $OUT/fuzz_dnp3 ../../../libasiodnp3.a ../../../libdnp3decode.a ../../../libasiopal.a ../../../libopendnp3.a ../../../libopenpal.a $LIB_FUZZING_ENGINE diff --git a/projects/openh264/build.sh b/projects/openh264/build.sh index 9fe523a6..8e4f100a 100755 --- a/projects/openh264/build.sh +++ b/projects/openh264/build.sh @@ -28,4 +28,4 @@ else ASM_BUILD=Yes fi make -j$(nproc) USE_ASM=$ASM_BUILD BUILDTYPE=Debug libraries -$CXX $CXXFLAGS -o $OUT/decoder_fuzzer -I./codec/api/svc -I./codec/console/common/inc -I./codec/common/inc -L. -lFuzzingEngine $SRC/decoder_fuzzer.cpp libopenh264.a +$CXX $CXXFLAGS -o $OUT/decoder_fuzzer -I./codec/api/svc -I./codec/console/common/inc -I./codec/common/inc -L. $LIB_FUZZING_ENGINE $SRC/decoder_fuzzer.cpp libopenh264.a diff --git a/projects/openssh/build.sh b/projects/openssh/build.sh index 6cdb30e7..1f10270a 100755 --- a/projects/openssh/build.sh +++ b/projects/openssh/build.sh @@ -29,13 +29,13 @@ STATIC_CRYPTO="-Wl,-Bstatic -lcrypto -Wl,-Bdynamic" $CXX $CXXFLAGS -std=c++11 -I. -L. -Lopenbsd-compat -g \ regress/misc/fuzz-harness/pubkey_fuzz.cc -o $OUT/pubkey_fuzz \ - -lssh -lopenbsd-compat $STATIC_CRYPTO -lFuzzingEngine + -lssh -lopenbsd-compat $STATIC_CRYPTO $LIB_FUZZING_ENGINE $CXX $CXXFLAGS -std=c++11 -I. -L. -Lopenbsd-compat -g \ regress/misc/fuzz-harness/sig_fuzz.cc -o $OUT/sig_fuzz \ - -lssh -lopenbsd-compat $STATIC_CRYPTO -lFuzzingEngine + -lssh -lopenbsd-compat $STATIC_CRYPTO $LIB_FUZZING_ENGINE $CXX $CXXFLAGS -std=c++11 -I. -L. -Lopenbsd-compat -g \ regress/misc/fuzz-harness/authopt_fuzz.cc -o $OUT/authopt_fuzz \ - auth-options.o -lssh -lopenbsd-compat $STATIC_CRYPTO -lFuzzingEngine + auth-options.o -lssh -lopenbsd-compat $STATIC_CRYPTO $LIB_FUZZING_ENGINE # Prepare seed corpora CASES="$SRC/openssh-fuzz-cases" diff --git a/projects/opus/build.sh b/projects/opus/build.sh index 1bbb5745..ae86054c 100644 --- a/projects/opus/build.sh +++ b/projects/opus/build.sh @@ -45,7 +45,7 @@ for build in "${BUILDS[@]}"; do $CXX $CXXFLAGS \ $fuzzer.o \ -o $OUT/${fuzzer}_${build} \ - -lFuzzingEngine .libs/libopus.a + $LIB_FUZZING_ENGINE .libs/libopus.a # Setup the .options and test corpus zip files using the corresponding # fuzzer's name diff --git a/projects/ots/build.sh b/projects/ots/build.sh index cc3cff4e..fe2a50e3 100755 --- a/projects/ots/build.sh +++ b/projects/ots/build.sh @@ -17,7 +17,7 @@ # Configure the project. export CXXFLAGS="$CXXFLAGS -DOTS_FUZZER_NO_MAIN" -export LDFLAGS="-lFuzzingEngine" +export LDFLAGS="$LIB_FUZZING_ENGINE" meson build # Build the fuzzer. diff --git a/projects/pcre2/build.sh b/projects/pcre2/build.sh index 5a503920..33161fd3 100755 --- a/projects/pcre2/build.sh +++ b/projects/pcre2/build.sh @@ -23,7 +23,7 @@ make -j$(nproc) all # build fuzzer $CXX $CXXFLAGS -o $OUT/pcre2_fuzzer \ - -lFuzzingEngine .libs/libpcre2-fuzzsupport.a .libs/libpcre2-8.a + $LIB_FUZZING_ENGINE .libs/libpcre2-fuzzsupport.a .libs/libpcre2-8.a # set up dictionary and options to use it cp pcre2_fuzzer.options pcre2_fuzzer.dict $OUT/ diff --git a/projects/pffft/build.sh b/projects/pffft/build.sh index 190f7d75..9f0d70df 100644 --- a/projects/pffft/build.sh +++ b/projects/pffft/build.sh @@ -51,7 +51,7 @@ build_fuzzer() { -DTRANSFORM_${fft_transform} \ $SRC/pffft/pffft.c $SRC/pffft/pffft_fuzzer.cc \ -o $OUT/${fuzz_target_name} \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE } # Build fuzzers. diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh index f6227f48..49478ef2 100755 --- a/projects/poppler/build.sh +++ b/projects/poppler/build.sh @@ -48,7 +48,7 @@ fuzz_target=pdf_fuzzer $CXX $CXXFLAGS -std=c++11 -I$SRC/poppler/cpp \ $SRC/fuzz/pdf_fuzzer.cc -o $OUT/$fuzz_target \ - -lFuzzingEngine $WORK/poppler/cpp/libpoppler-cpp.a $WORK/poppler/libpoppler.a $WORK/lib/libfreetype.a + $LIB_FUZZING_ENGINE $WORK/poppler/cpp/libpoppler-cpp.a $WORK/poppler/libpoppler.a $WORK/lib/libfreetype.a mv $SRC/{*.zip,*.dict} $OUT diff --git a/projects/qcms/build.sh b/projects/qcms/build.sh index 67b3fcbd..cedee42e 100644 --- a/projects/qcms/build.sh +++ b/projects/qcms/build.sh @@ -29,7 +29,7 @@ $CC $CFLAGS -c \ $CXX $CXXFLAGS -std=c++11 \ -I. *.o \ -DBUILD_FOR_OSSFUZZ \ - -lFuzzingEngine \ + $LIB_FUZZING_ENGINE \ fuzztest/qcms_fuzzer.cpp -o $OUT/fuzz find fuzztest -iname "*.icc" \ diff --git a/projects/qpdf/build.sh b/projects/qpdf/build.sh index dd07b5ac..fd745cd1 100755 --- a/projects/qpdf/build.sh +++ b/projects/qpdf/build.sh @@ -46,4 +46,4 @@ $CXX $CXXFLAGS -std=c++11 -I"$WORK/include" \ "$WORK/lib/libjpeg.a" \ "$WORK/lib/libz.a" \ -pthread \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE diff --git a/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch b/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch index 06731753..8d17e7be 100644 --- a/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch +++ b/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch @@ -25,7 +25,7 @@ index b4470d59..211252c4 100644 + set(FUZZING_QPID_PROTON_CORE_LIBRARY qpid-proton-core) + endif() + target_link_libraries (${test} ${FUZZING_QPID_PROTON_CORE_LIBRARY} ${FUZZING_LIBRARY}) -+ # -lFuzzingEngine is a C++ library, which needs c++ std lib ++ # $LIB_FUZZING_ENGINE is a C++ library, which needs c++ std lib + set_target_properties(${test} PROPERTIES LINKER_LANGUAGE CXX) + list(APPEND fuzz_test_src ${ARGN}) diff --git a/projects/re2/build.sh b/projects/re2/build.sh index ef17315c..b0c38637 100755 --- a/projects/re2/build.sh +++ b/projects/re2/build.sh @@ -30,4 +30,4 @@ make -j$(nproc) obj/libre2.a # Second, build the fuzzer (distributed with RE2). $CXX $CXXFLAGS -std=c++11 -I. \ re2/fuzzing/re2_fuzzer.cc -o $OUT/re2_fuzzer \ - -lFuzzingEngine obj/libre2.a + $LIB_FUZZING_ENGINE obj/libre2.a diff --git a/projects/sqlite3/build.sh b/projects/sqlite3/build.sh index 12da0d65..8d58ad15 100755 --- a/projects/sqlite3/build.sh +++ b/projects/sqlite3/build.sh @@ -38,6 +38,6 @@ $CC $CFLAGS -I. -c \ $CXX $CXXFLAGS \ $SRC/sqlite3/test/ossfuzz.o -o $OUT/ossfuzz \ - -lFuzzingEngine ./sqlite3.o + $LIB_FUZZING_ENGINE ./sqlite3.o cp $SRC/*.options $SRC/*.dict $SRC/*.zip $OUT/ diff --git a/projects/tensorflow/build.sh b/projects/tensorflow/build.sh index ef34d35f..5ed6bc68 100755 --- a/projects/tensorflow/build.sh +++ b/projects/tensorflow/build.sh @@ -130,7 +130,7 @@ for fuzzer in ${FUZZERS}; do lfile=`ls -1 bazel-bin/tensorflow/core/kernels/fuzzing/${fz}*.params | head -n1` # Manually link everything. - ${CXX} ${CXXFLAGS} -lFuzzingEngine -o ${OUT}/${fz} ${LINK_ARGS} -Wl,@${lfile} + ${CXX} ${CXXFLAGS} $LIB_FUZZING_ENGINE -o ${OUT}/${fz} ${LINK_ARGS} -Wl,@${lfile} done # For coverage, we need one extra step, see the envoy and grpc projects. diff --git a/projects/tesseract-ocr/build.sh b/projects/tesseract-ocr/build.sh index c93cc4f1..e64539fe 100755 --- a/projects/tesseract-ocr/build.sh +++ b/projects/tesseract-ocr/build.sh @@ -45,7 +45,7 @@ $CXX $CXXFLAGS \ /usr/lib/x86_64-linux-gnu/libjbig.a \ /usr/lib/x86_64-linux-gnu/liblzma.a \ -lz \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE $CXX $CXXFLAGS \ -DTESSERACT_FUZZER_WIDTH=512 \ @@ -63,4 +63,4 @@ $CXX $CXXFLAGS \ /usr/lib/x86_64-linux-gnu/libjbig.a \ /usr/lib/x86_64-linux-gnu/liblzma.a \ -lz \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE diff --git a/projects/tidy-html5/build.sh b/projects/tidy-html5/build.sh index 840e9a50..d10c505a 100644 --- a/projects/tidy-html5/build.sh +++ b/projects/tidy-html5/build.sh @@ -27,7 +27,7 @@ for fuzzer in tidy_config_fuzzer tidy_fuzzer; do $SRC/${fuzzer}.c -o ${fuzzer}.o ${CXX} ${CXXFLAGS} -std=c++11 ${fuzzer}.o \ -o $OUT/${fuzzer} \ - -lFuzzingEngine libtidys.a + $LIB_FUZZING_ENGINE libtidys.a done cp ${SRC}/*.options ${OUT}/ diff --git a/projects/tinyxml2/build.sh b/projects/tinyxml2/build.sh index a31ccfda..0c43f40c 100644 --- a/projects/tinyxml2/build.sh +++ b/projects/tinyxml2/build.sh @@ -18,6 +18,6 @@ make -j$(nproc) clean make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -Iinclude/ $SRC/xmltest.cpp -o $OUT/xmltest \ - -lFuzzingEngine $SRC/tinyxml2/libtinyxml2.a + $LIB_FUZZING_ENGINE $SRC/tinyxml2/libtinyxml2.a cp $SRC/*.dict $SRC/*.options $OUT/ diff --git a/projects/tor/build.sh b/projects/tor/build.sh index fcfaac87..9f0b3db2 100644 --- a/projects/tor/build.sh +++ b/projects/tor/build.sh @@ -75,7 +75,7 @@ TORLIBS="$TORLIBS -Wl,-Bdynamic" for fuzzer in src/test/fuzz/*.a; do output="${fuzzer%.a}" output="${output##*lib}" - ${CXX} ${CXXFLAGS} -std=c++11 -lFuzzingEngine ${fuzzer} ${TORLIBS} -o ${OUT}/${output} + ${CXX} ${CXXFLAGS} -std=c++11 $LIB_FUZZING_ENGINE ${fuzzer} ${TORLIBS} -o ${OUT}/${output} corpus_dir="${SRC}/tor-fuzz-corpora/${output#oss-fuzz-}" if [ -d "${corpus_dir}" ]; then diff --git a/projects/unbound/build.sh b/projects/unbound/build.sh index c525b30d..27a0d1d6 100755 --- a/projects/unbound/build.sh +++ b/projects/unbound/build.sh @@ -24,7 +24,7 @@ make -j6 all $CC $CFLAGS -I. -DSRCDIR=. -c -o parse_packet_fuzzer.o parse_packet_fuzzer.c $CXX $CXXFLAGS -std=c++11 \ - -lFuzzingEngine \ + $LIB_FUZZING_ENGINE \ -lssl -lcrypto -pthread \ -o $OUT/parse_packet_fuzzer \ parse_packet_fuzzer.o \ diff --git a/projects/unicorn/build.sh b/projects/unicorn/build.sh index 067d89ff..1123321b 100755 --- a/projects/unicorn/build.sh +++ b/projects/unicorn/build.sh @@ -25,7 +25,7 @@ ls fuzz_*.c | cut -d_ -f2-4 | cut -d. -f1 | while read target do $CC $CFLAGS -I../../include -c fuzz_$target.c -o fuzz_$target.o - $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target ../../libunicorn.a -lFuzzingEngine + $CXX $CXXFLAGS fuzz_$target.o -o $OUT/fuzz_$target ../../libunicorn.a $LIB_FUZZING_ENGINE # TODO corpuses cp fuzz_emu.options $OUT/fuzz_$target.options diff --git a/projects/unrar/build.sh b/projects/unrar/build.sh index c9fdbf46..d597942c 100644 --- a/projects/unrar/build.sh +++ b/projects/unrar/build.sh @@ -29,4 +29,4 @@ rm -v $UNRAR_SRC_DIR/libunrar.so # build fuzzer $CXX $CXXFLAGS -I. $UNRAR_SRC_DIR/unrar_fuzzer.cc -o $OUT/unrar_fuzzer \ - $UNRAR_DEFINES -lFuzzingEngine -L$UNRAR_SRC_DIR -lunrar + $UNRAR_DEFINES $LIB_FUZZING_ENGINE -L$UNRAR_SRC_DIR -lunrar diff --git a/projects/woff2/build.sh b/projects/woff2/build.sh index 9143838e..078caaa7 100755 --- a/projects/woff2/build.sh +++ b/projects/woff2/build.sh @@ -29,7 +29,7 @@ make -j$(nproc) CC="$CC $CFLAGS" CXX="$CXX $CXXFLAGS" CANONICAL_PREFIXES= all \ # Build fuzzers for fuzzer_archive in src/*fuzzer*.a; do fuzzer_name=$(basename ${fuzzer_archive%.a}) - $CXX $CXXFLAGS -lFuzzingEngine $fuzzer_archive \ + $CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer_archive \ -o $OUT/$fuzzer_name zip -q $OUT/${fuzzer_name}_seed_corpus.zip $SRC/corpus/* done diff --git a/projects/wolfssl/build.sh b/projects/wolfssl/build.sh index 50fe1535..16606125 100755 --- a/projects/wolfssl/build.sh +++ b/projects/wolfssl/build.sh @@ -26,7 +26,7 @@ make install # put linker arguments into the environment, appending to any existing ones export LDFLAGS="${LDFLAGS-""}" -export LDLIBS="${LDLIBS-""} -lwolfssl -lFuzzingEngine" +export LDLIBS="${LDLIBS-""} -lwolfssl $LIB_FUZZING_ENGINE" # make and export targets to $OUT; environment overridding internal variables cd "${target_dir}" diff --git a/projects/wuffs/build.sh b/projects/wuffs/build.sh index 6bcee64e..6177a3b7 100755 --- a/projects/wuffs/build.sh +++ b/projects/wuffs/build.sh @@ -27,7 +27,7 @@ for f in fuzz/c/std/*_fuzzer.c; do # Make the "gzip_fuzzer" binary. First compile the (C) Wuffs code, then link # the (C++) fuzzing library. $CC $CFLAGS -c -std=c99 $f -o $WORK/${b}_fuzzer.o - $CXX $CXXFLAGS $WORK/${b}_fuzzer.o -o $OUT/${b}_fuzzer -lFuzzingEngine + $CXX $CXXFLAGS $WORK/${b}_fuzzer.o -o $OUT/${b}_fuzzer $LIB_FUZZING_ENGINE # Make the optional "gzip_fuzzer_seed_corpus.zip" archive. This means # extracting the "foo/bar/*.gz" out of the matching "gzip: foo/bar/*.gz" diff --git a/projects/wxwidgets/build.sh b/projects/wxwidgets/build.sh index 6e8f95c8..bb45c4e3 100755 --- a/projects/wxwidgets/build.sh +++ b/projects/wxwidgets/build.sh @@ -21,7 +21,7 @@ make -j$(nproc) # build fuzzers $CXX $CXXFLAGS -o $OUT/zip ./tests/fuzz/zip.cpp \ - -lFuzzingEngine `./wx-config --cxxflags --libs base` + $LIB_FUZZING_ENGINE `./wx-config --cxxflags --libs base` # and copy their corpora zip -j $OUT/zip_seed_corpus.zip $SRC/wxwidgets/tests/fuzz/corpus/zip/* diff --git a/projects/xmlsec/build.sh b/projects/xmlsec/build.sh index 99c4296a..c91327ca 100755 --- a/projects/xmlsec/build.sh +++ b/projects/xmlsec/build.sh @@ -43,7 +43,7 @@ for file in $SRC/xmlsec/tests/oss-fuzz/*_target.c; do $CC $CFLAGS -c $file -I /usr/include/libxml2 -I ./include/ \ -o $OUT/${b}_target.o $CXX $CXXFLAGS $OUT/${b}_target.o ./src/.libs/libxmlsec1.a \ - ./src/openssl/.libs/libxmlsec1-openssl.a -lFuzzingEngine \ + ./src/openssl/.libs/libxmlsec1-openssl.a $LIB_FUZZING_ENGINE \ "$XMLSEC_DEPS_PATH"/lib/libxslt.a "$XMLSEC_DEPS_PATH"/lib/libxml2.a \ -lz -o $OUT/${b}_fuzzer done diff --git a/projects/yara/build.sh b/projects/yara/build.sh index 8aba4611..156a63ad 100755 --- a/projects/yara/build.sh +++ b/projects/yara/build.sh @@ -28,7 +28,7 @@ for f in $fuzzers; do echo "Building $fuzzer_name" $CXX $CXXFLAGS -std=c++11 -I. $f -o $OUT/$fuzzer_name \ ./libyara/.libs/libyara.a \ - -lFuzzingEngine + $LIB_FUZZING_ENGINE if [ -d "$SRC/yara/tests/oss-fuzz/${fuzzer_name}_corpus" ]; then zip -j $OUT/${fuzzer_name}_seed_corpus.zip $SRC/yara/tests/oss-fuzz/${fuzzer_name}_corpus/* fi diff --git a/projects/zlib/build.sh b/projects/zlib/build.sh index 3312212a..4a1560a6 100755 --- a/projects/zlib/build.sh +++ b/projects/zlib/build.sh @@ -9,14 +9,14 @@ make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/zlib_uncompress_fuzzer.cc -o $OUT/zlib_uncompress_fuzzer \ - -lFuzzingEngine ./libz.a + $LIB_FUZZING_ENGINE ./libz.a zip $OUT/seed_corpus.zip *.* for f in $(find $SRC -name '*_fuzzer.c'); do b=$(basename -s .c $f) $CC $CFLAGS -I. $f -c -o /tmp/$b.o - $CXX $CXXFLAGS -o $OUT/$b /tmp/$b.o -stdlib=libc++ -lFuzzingEngine ./libz.a + $CXX $CXXFLAGS -o $OUT/$b /tmp/$b.o -stdlib=libc++ $LIB_FUZZING_ENGINE ./libz.a rm -f /tmp/$b.o ln -sf $OUT/seed_corpus.zip $OUT/${b}_seed_corpus.zip done |