fix wireshark?

Author: zukatsinadze

benchmarks/wireshark_fuzzshark/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2018 Google Inc.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,14 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:87ca1e9e19235e731fac8de8d1892ebe8d55caf18e7aa131346fc582a2034fdd
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
-RUN apt-get update && \
-    apt-get install -y \
-        libstdc++-9-dev libstdc++-9-dev:i386 nasm subversion \
-        gnupg lsb-release software-properties-common pkg-config \
-        python3-pip libgtk-3-dev unzip pax-utils file cpio ninja-build cmake \
-        libgcrypt20-dev libc-ares-dev libpcre2-dev flex inotify-tools \
-        libboost-dev 
+RUN apt-get update && apt-get install -y ninja-build cmake \
+                       flex libc-ares-dev \
+                       libglib2.0-dev libgcrypt20-dev
 
-RUN git clone \
-        https://gitlab.com/wireshark/wireshark
+RUN git clone --depth=1 https://gitlab.com/wireshark/wireshark.git
+RUN git clone --depth=1 https://bitbucket.org/jwzawadzki/wireshark-fuzzdb.git
 
 WORKDIR wireshark
 COPY build.sh $SRC/

benchmarks/wireshark_fuzzshark/benchmark.yaml

@@ -1,23 +1,4 @@
-commit: 36a9f4231b3ee82bd4efee53ed8a1004ff90102d
-commit_date: 2023-11-11T01:07:51+00:00
-fuzz_target: fuzzshark
+commit: 238cc3beabc2b7bc4bd7e41bd0c410b21e680a06
+commit_date: 2025-03-24 07:43:57+00:00
+fuzz_target: fuzzshark_ip
 project: wireshark
-unsupported_fuzzers:
-  - aflcc
-  - afl_qemu
-  - aflplusplus_qemu
-  - aflplusplus_qemu_tracepc
-  - aflplusplus_frida
-  - honggfuzz_qemu
-  - klee
-  - lafintel
-  - weizz_qemu
-  - aflplusplus_cmplog_double
-  - symcc_aflplusplus_single
-  - eclipser_aflplusplus
-  - aflplusplus_qemu_double
-  - fuzzolic_aflplusplus_z3
-  - symqemu_aflplusplus
-  - fuzzolic_aflplusplus_fuzzy
-  - fuzzolic_aflplusplus_z3dict
-  - tortoisefuzz

benchmarks/wireshark_fuzzshark/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -eu
-# Copyright 2018 Google Inc.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,33 @@
 #
 ################################################################################
 
+WIRESHARK_BUILD_PATH="$WORK/build"
+mkdir -p "$WIRESHARK_BUILD_PATH"
 
-mkdir seeds
-find . -name "*.pcap" -exec cp {} seeds \;
-cp -r seeds $OUT/
+# Prepare Samples directory
+export SAMPLES_DIR="$WORK/samples"
+mkdir -p "$SAMPLES_DIR"
+cp -a $SRC/wireshark-fuzzdb/samples/* "$SAMPLES_DIR"
 
-mkdir build 
-cd build
+# Make sure we build fuzzshark.
+CMAKE_DEFINES="-DBUILD_fuzzshark=ON"
 
-cmake -G Ninja .. \
+# compile static version of libs
+# XXX, with static wireshark linking each fuzzer binary is ~346 MB (just libwireshark.a is 761 MB).
+# XXX, wireshark is not ready for including static plugins into binaries.
+CMAKE_DEFINES="$CMAKE_DEFINES -DENABLE_STATIC=ON -DENABLE_PLUGINS=OFF"
+
+# disable optional dependencies
+CMAKE_DEFINES="$CMAKE_DEFINES -DENABLE_PCAP=OFF -DENABLE_GNUTLS=OFF"
+
+# There is no need to manually disable programs via BUILD_xxx=OFF since the
+# all-fuzzers targets builds the minimum required binaries. However we do have
+# to disable the Qt GUI and sharkd or else the cmake step will fail.
+CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_wireshark=OFF -DBUILD_logray=OFF -DBUILD_sharkd=OFF"
+
+cd "$WIRESHARK_BUILD_PATH"
+
+cmake -G Ninja \
     -DENABLE_STATIC=ON \
     -DOSS_FUZZ=ON \
     -DINSTRUMENT_DISSECTORS_ONLY=ON \
@@ -51,9 +69,14 @@ cmake -G Ninja .. \
     -DENABLE_ILBC=OFF \
     -DENABLE_LIBXML2=OFF \
     -DENABLE_OPUS=OFF \
-    -DENABLE_SINSP=OFF
+    -DENABLE_SINSP=OFF $SRC/wireshark/
+
+# cmake -GNinja \
+#       -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
+#       -DCMAKE_C_FLAGS="-Wno-error=fortify-source -Wno-error=missing-field-initializers $CFLAGS" -DCMAKE_CXX_FLAGS="-Wno-error=fortify-source -Wno-error=missing-field-initializers $CXXFLAGS" \
+#       -DDISABLE_WERROR=ON -DOSS_FUZZ=ON $CMAKE_DEFINES $SRC/wireshark/
 
 ninja fuzzshark
-cp run/fuzzshark $OUT/fuzzshark
-export FUZZSHARK_TARGET="tcp"
 
+
+$SRC/wireshark/tools/oss-fuzzshark/build.sh all