diff --git a/CMakeLists.txt b/CMakeLists.txt index a453be0e8e..09e9d835da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -481,7 +481,7 @@ message( "\n debugging: ${USE_PERFTOOLS_DEBUG}" "\njemalloc: ${ENABLE_JEMALLOC}" "\n" - "\nFuzz Targets: ${ZEEK_ENABLE_FUZZING}" + "\nFuzz Targets: ${ZEEK_ENABLE_FUZZERS}" "\nFuzz Engine: ${ZEEK_FUZZING_ENGINE}" "\n" "\n================================================================\n" diff --git a/configure b/configure index a54e1248d2..1fd036f169 100755 --- a/configure +++ b/configure @@ -47,7 +47,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... Optional Features: --enable-debug compile in debugging mode (like --build-type=Debug) --enable-coverage compile with code coverage support (implies debugging mode) - --enable-fuzzing build fuzzing targets + --enable-fuzzers build fuzzer targets --enable-mobile-ipv6 analyze mobile IPv6 features defined by RFC 6275 --enable-perftools enable use of Google perftools (use tcmalloc) --enable-perftools-debug use Google's perftools for debugging @@ -230,8 +230,8 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_COVERAGE BOOL true append_cache_entry ENABLE_DEBUG BOOL true ;; - --enable-fuzzing) - append_cache_entry ZEEK_ENABLE_FUZZING BOOL true + --enable-fuzzers) + append_cache_entry ZEEK_ENABLE_FUZZERS BOOL true ;; --enable-debug) append_cache_entry ENABLE_DEBUG BOOL true diff --git a/src/fuzzers/CMakeLists.txt b/src/fuzzers/CMakeLists.txt index 1d98ae2057..d057f156f4 100644 --- a/src/fuzzers/CMakeLists.txt +++ b/src/fuzzers/CMakeLists.txt @@ -1,7 +1,7 @@ ######################################################################## ## Fuzzing targets -if ( NOT ZEEK_ENABLE_FUZZING ) +if ( NOT ZEEK_ENABLE_FUZZERS ) return() endif () diff --git a/src/fuzzers/README b/src/fuzzers/README index e771b52010..5e85435571 100644 --- a/src/fuzzers/README +++ b/src/fuzzers/README @@ -14,7 +14,7 @@ First configure and build for fuzzing (with libFuzzer) and code coverage:: CFLAGS="-fprofile-instr-generate -fcoverage-mapping" \ CXXFLAGS="-fprofile-instr-generate -fcoverage-mapping" \ ./configure --build-type=RelWithDebInfo --build-dir=./build-fuzz-cov \ - --sanitizers=fuzzer-no-link --enable-fuzzing + --sanitizers=fuzzer-no-link --enable-fuzzers $ cd build-fuzz-cov && make -j $(nproc) @@ -60,9 +60,9 @@ First configure and build:: $ CC=clang CXX=clang++ \ ./configure --build-type=debug --build-dir=./build-fuzz-check \ - --sanitizers=address,fuzzer-no-link --enable-fuzzing + --sanitizers=address --enable-fuzzers - $ cd build-fuzz-cov && make -j $(nproc) + $ cd build-fuzz-check && make -j $(nproc) Get a set of inputs to process (we're using the POP3 fuzzer/corpus as example)::