Modernize our libfuzzer usage to close #40407

Additionally, remove lingering references to hsv2 fuzzers from the
fuzzing_include_am.py script.
This commit is contained in:
Nick Mathewson 2021-06-08 12:47:57 -04:00
parent f93d9d8bac
commit d2256fe9ce
4 changed files with 10 additions and 9 deletions

View File

@ -253,7 +253,7 @@ endif
TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings
if LIBFUZZER_ENABLED if LIBFUZZER_ENABLED
TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div TEST_CFLAGS += -fsanitize=fuzzer-no-link
# not "edge" # not "edge"
endif endif

5
changes/bug40407 Normal file
View File

@ -0,0 +1,5 @@
o Minor features (fuzzing):
- When building with --enable-libfuzzer, use a set of compiler flags
that works with more recent versions of the library. Previously
we were using a set of flags from 2017.
Closes ticket 40407.

View File

@ -11,11 +11,9 @@ FUZZERS = """
diff diff
diff-apply diff-apply
extrainfo extrainfo
hsdescv2
hsdescv3 hsdescv3
http http
http-connect http-connect
iptsv2
microdesc microdesc
socks socks
strops strops
@ -47,11 +45,10 @@ oss-fuzz-prereqs: \
noinst_HEADERS += \ noinst_HEADERS += \
src/test/fuzz/fuzzing.h src/test/fuzz/fuzzing.h
LIBFUZZER = -lFuzzer
LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS)
LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG) -fsanitize=fuzzer
LIBFUZZER_LIBS = $(FUZZING_LIBS) $(LIBFUZZER) -lstdc++ LIBFUZZER_LIBS = $(FUZZING_LIBS) -lstdc++
LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS) LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS)

View File

@ -23,11 +23,10 @@ oss-fuzz-prereqs: \
noinst_HEADERS += \ noinst_HEADERS += \
src/test/fuzz/fuzzing.h src/test/fuzz/fuzzing.h
LIBFUZZER = -lFuzzer
LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS)
LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG) -fsanitize=fuzzer
LIBFUZZER_LIBS = $(FUZZING_LIBS) $(LIBFUZZER) -lstdc++ LIBFUZZER_LIBS = $(FUZZING_LIBS) -lstdc++
LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS) LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS)