From c48e8179eb9a8fad6e9db6e038f54ef968eb55e4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Nov 2023 07:55:28 +0100 Subject: [PATCH 1/2] Update pcapplusplus build.sh --- projects/pcapplusplus/build.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/projects/pcapplusplus/build.sh b/projects/pcapplusplus/build.sh index fc3cc72fee37..97c306935f85 100644 --- a/projects/pcapplusplus/build.sh +++ b/projects/pcapplusplus/build.sh @@ -16,26 +16,4 @@ # ################################################################################ -TARGETS_DIR=build/ - -# Build libpcap -cd $SRC/libpcap/ -./autogen.sh -./configure --enable-shared=no -make -j$(nproc) - -# Build PcapPlusPlus linking statically against the built libpcap -cd $SRC/PcapPlusPlus -LIBPCAP_PATH=$SRC/libpcap/ -cmake -DPCAPPP_BUILD_FUZZERS=ON -DPCAPPP_BUILD_TESTS=OFF -DPCAPPP_BUILD_EXAMPLES=OFF -DPCAP_INCLUDE_DIR="${LIBPCAP_PATH}/" -DPCAP_LIBRARY="${LIBPCAP_PATH}/libpcap.a" -S . -B $TARGETS_DIR -cmake --build $TARGETS_DIR -j - -# Copy target and options -cp $TARGETS_DIR/Tests/Fuzzers/FuzzTarget $OUT -cp $(ldd $OUT/FuzzTarget | cut -d" " -f3) $OUT -cp $SRC/default.options $OUT/FuzzTarget.options - -# Copy corpora -cd $SRC/tcpdump -zip -jr FuzzTarget_seed_corpus.zip tests/*.pcap -cp FuzzTarget_seed_corpus.zip $OUT/ +$SRC/PcapPlusPlus/Tests/Fuzzers/ossfuzz.sh From bb56188cc4d973c545957abaed3b7f5c24c06079 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Nov 2023 07:57:34 +0100 Subject: [PATCH 2/2] Delete projects/pcapplusplus/default.options --- projects/pcapplusplus/default.options | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 projects/pcapplusplus/default.options diff --git a/projects/pcapplusplus/default.options b/projects/pcapplusplus/default.options deleted file mode 100644 index eb7fde2c6179..000000000000 --- a/projects/pcapplusplus/default.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -close_fd_mask=3