Merge branch 'master' into 2406-immer

google · Jun 25, 2024 · bc7e6e5 · bc7e6e5
2 parents a97f521 + 3b9936f
commit bc7e6e5
Show file tree

Hide file tree

Showing 33 changed files with 154 additions and 95 deletions.
diff --git a/infra/base-images/base-builder-rust/Dockerfile b/infra/base-images/base-builder-rust/Dockerfile
@@ -22,4 +22,15 @@ ENV PATH=$PATH:/rust/bin
 # Set up custom environment variable for source code copy for coverage reports
 ENV OSSFUZZ_RUSTPATH /rust
 
+# Force rustup to ignore `rust-toolchain` and `rust-toolchain.toml` files by
+# manually specifying what toolchain to use. Note that this environment variable
+# is additionally used by `install_rust.sh` as the toolchain to install.
+# cf https://rust-lang.github.io/rustup/overrides.html
+ENV RUSTUP_TOOLCHAIN nightly-2024-02-12
+
+# Configure the linker used by default for x86_64 linux to be `clang` instead of
+# rustc's default of `cc` which is able to find custom-built libraries like
+# `libc++` by default more easily.
+ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER clang
+
 RUN install_rust.sh
diff --git a/infra/base-images/base-builder/install_rust.sh b/infra/base-images/base-builder/install_rust.sh
@@ -15,8 +15,8 @@
 #
 ################################################################################
 
-curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly-2023-12-28 --profile=minimal
+curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=$RUSTUP_TOOLCHAIN --profile=minimal
 cargo install cargo-fuzz && rm -rf /rust/registry
 # Needed to recompile rust std library for MSAN
-rustup component add rust-src --toolchain nightly-2023-12-28
+rustup component add rust-src
 cp -r /usr/local/lib/x86_64-unknown-linux-gnu/* /usr/local/lib/
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
@@ -23,6 +23,7 @@ ARG arch=x86_64
 ENV FUZZINTRO_OUTDIR=$SRC
 
 # Install newer cmake.
+# Many projects, as well as recent clang versions, need a newer cmake.
 ENV CMAKE_VERSION 3.29.2
 RUN apt-get update && apt-get install -y wget sudo && \
     wget -q https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-$arch.sh && \

diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh
@@ -50,6 +50,10 @@ LLVM_DEP_PACKAGES="build-essential make ninja-build git python3 python3-distutil
 apt-get update && apt-get install -y $LLVM_DEP_PACKAGES --no-install-recommends
 
 # For manual bumping.
+# On each bump a full trial run for everything (fuzzing engines, sanitizers,
+# languages, projects, ...) is needed.
+# Check CMAKE_VERSION infra/base-images/base-clang/Dockerfile was released
+# recently enough to fully support this clang version.
 OUR_LLVM_REVISION=llvmorg-18-init-4631-gd50b56d1
 
 mkdir $SRC/chromium_tools
@@ -59,13 +63,6 @@ cd clang
 # Pin clang script due to https://github.com/google/oss-fuzz/issues/7617
 git checkout 9eb79319239629c1b23cf7a59e5ebb2bab319a34
 
-# To allow for manual downgrades. Set to 0 to use Chrome's clang version (i.e.
-# *not* force a manual downgrade). Set to 1 to force a manual downgrade.
-# DO NOT CHANGE THIS UNTIL https://github.com/google/oss-fuzz/issues/7273 is
-# RESOLVED.
-FORCE_OUR_REVISION=1
-LLVM_REVISION=$(grep -Po "CLANG_REVISION = '\K([^']+)" scripts/update.py)
-
 LLVM_SRC=$SRC/llvm-project
 # Checkout
 CHECKOUT_RETRIES=10
@@ -107,19 +104,8 @@ function cmake_llvm {
       $LLVM_SRC/llvm
 }
 
-set +e
-git -C $LLVM_SRC merge-base --is-ancestor $OUR_LLVM_REVISION $LLVM_REVISION
-IS_OUR_REVISION_ANCESTOR_RETCODE=$?
-set -e
-
-# Use our revision if specified by FORCE_OUR_REVISION or if our revision is a
-# later revision than Chrome's (i.e. not an ancestor of Chrome's).
-if [ $IS_OUR_REVISION_ANCESTOR_RETCODE -ne 0 ] || [ $FORCE_OUR_REVISION -eq 1 ] ; then
-  LLVM_REVISION=$OUR_LLVM_REVISION
-fi
-
-git -C $LLVM_SRC checkout $LLVM_REVISION
-echo "Using LLVM revision: $LLVM_REVISION"
+git -C $LLVM_SRC checkout $OUR_LLVM_REVISION
+echo "Using LLVM revision: $OUR_LLVM_REVISION"
 
 # For fuzz introspector.
 echo "Applying introspector changes"

diff --git a/projects/askama/build.sh b/projects/askama/build.sh
@@ -17,18 +17,8 @@
 
 set -eox pipefail
 
-FUZZ_CRATE_DIRS=$(find . -type d -name fuzz -exec dirname $(readlink -f {}) \;)
-
-for CRATE_DIR in ${FUZZ_CRATE_DIRS[@]};
-do
-  echo "Building crate: $CRATE_DIR"
-  cd $CRATE_DIR
-  cargo +nightly-2023-12-28 fuzz build -O
-  FUZZ_TARGET_OUTPUT_DIR=fuzz/target/x86_64-unknown-linux-gnu/release
-  for f in fuzz/fuzz_targets/*.rs
-  do
-      FUZZ_TARGET_NAME=$(basename ${f%.*})
-      CRATE_NAME=$(basename $CRATE_DIR)
-      cp $FUZZ_TARGET_OUTPUT_DIR/$FUZZ_TARGET_NAME $OUT/$CRATE_NAME-$FUZZ_TARGET_NAME
-  done
+target_out_dir=fuzz/target/x86_64-unknown-linux-gnu/release
+cargo fuzz build -O
+cargo fuzz list | while read i; do
+    cp $target_out_dir/$i $OUT/
 done
diff --git a/projects/bc-gh/Dockerfile b/projects/bc-gh/Dockerfile
@@ -0,0 +1,21 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-builder
+RUN apt-get update && apt-get install -y make
+RUN git clone --depth 1 https://github.com/gavinhoward/bc.git bc-gh
+WORKDIR bc-gh
+COPY build.sh $SRC/
diff --git a/projects/bc-gh/build.sh b/projects/bc-gh/build.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -eu
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+./configure -Z
+make -j$(nproc) all
+
+cp bin/*_fuzzer_* $OUT/
diff --git a/projects/bc-gh/project.yaml b/projects/bc-gh/project.yaml
@@ -2,3 +2,9 @@ homepage: https://git.gavinhoward.com/gavin/bc
 main_repo: https://github.com/gavinhoward/bc
 language: c
 primary_contact: [email protected]
+fuzzing_engines:
+  - libfuzzer
+  - afl
+  - honggfuzz
+  - centipede
+disabled: true
diff --git a/projects/cairo/Dockerfile b/projects/cairo/Dockerfile
@@ -16,7 +16,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install -y python3-pip gtk-doc-tools libffi-dev autotools-dev libtool gperf
-RUN pip3 install -U meson==1.2.0 ninja packaging
+RUN pip3 install -U meson==1.3.0 ninja packaging
 
 RUN git clone --depth 1 git://git.sv.nongnu.org/freetype/freetype2.git
 RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/glib

diff --git a/projects/crosvm/build.sh b/projects/crosvm/build.sh
@@ -19,7 +19,7 @@ cd crosvm
 
 # Build crosvm fuzzers
 # Unset the SRC variable as it will interfere with minijail's common.mk framework.
-env -u SRC cargo +nightly-2023-12-28 fuzz build -O
+env -u SRC cargo fuzz build -O
 
 # Copy fuzzer binaries to $OUT
 FUZZ_TARGET_OUTPUT_DIR="target/x86_64-unknown-linux-gnu/release"

diff --git a/projects/freeimage/Dockerfile b/projects/freeimage/Dockerfile
@@ -14,10 +14,10 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
-RUN apt-get update && apt-get install -y make autoconf automake libtool wget
+FROM gcr.io/oss-fuzz-base/base-builder
+RUN apt-get update && apt-get install -y make autoconf automake libtool wget dos2unix
 RUN svn checkout https://svn.code.sf.net/p/freeimage/svn/ freeimage-svn
 WORKDIR $SRC/freeimage-svn/FreeImage/trunk/
+RUN wget "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/7e12ab1185b347c0edfd893471c055e3ae7830b5/debian/patches/082bb032be1f6c75173bf603252e4f37bfded9fa.patch" --output-document=$SRC/jxrlib_tmpnam.patch
 COPY build.sh $SRC/
 COPY load_from_memory_fuzzer.cc $SRC/
diff --git a/projects/freeimage/build.sh b/projects/freeimage/build.sh
@@ -18,6 +18,13 @@
 # b44ExpLogTable.cpp only contains a definition of main().
 sed -i 's/Source\/OpenEXR\/IlmImf\/b44ExpLogTable.cpp//' Makefile.srcs
 sed -i 's/Source\/LibTIFF4\/tif_getimage.c/Source\/LibTIFF4\/tif_getimage.c Source\/LibTIFF4\/tif_hash_set.c/g' ./Makefile.srcs
+export CXXFLAGS="$CXXFLAGS -std=c++14"  # Avoid C++17 build error
+(
+ # Avoid tmpnam link error
+ cd Source/LibJXR
+ dos2unix ./image/encode/strenc.c
+ patch -p1 -i $SRC/jxrlib_tmpnam.patch
+)
 make LIBRARIES=-lc++ -j$(nproc)
 
 INSTALL_DIR="$PWD/Dist"

diff --git a/projects/gdbm/Dockerfile b/projects/gdbm/Dockerfile
@@ -21,12 +21,27 @@ RUN apt-get -qq update && \
       git\
       autopoint\
       automake\
-      autoconf\
       bison\
       flex\
       libtool\
       texinfo\
       gettext
+RUN set -- $(apt-cache policy autoconf | \
+             sed -n -r -e '/^[[:space:]]+Candidate:[[:space:]]+/{' \
+	            -e s/// \
+		    -e 's/-.*//' \
+		    -e 's/\./ /g' \
+		    -e 'p}'); \
+    if [ "$2" -ge 71 ]; then \
+       apt-get install -qq autoconf; \
+    else \
+       (cd /usr/src && \
+        curl -oautoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
+	tar xf autoconf-2.71.tar.gz && \
+	cd autoconf-2.71 && \
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var && \
+	make install); \
+    fi
 RUN git clone --depth 1 https://git.gnu.org.ua/gdbm.git
 WORKDIR gdbm
 COPY build.sh $SRC/
diff --git a/projects/gitoxide/build.sh b/projects/gitoxide/build.sh
@@ -25,19 +25,19 @@ for CRATE_DIR in ${FUZZ_CRATE_DIRS[@]};
 do
   echo "Building crate: $CRATE_DIR"
   cd $CRATE_DIR
-  cargo +nightly-2023-12-28 fuzz build -O --debug-assertions
+  cargo fuzz build -O --debug-assertions
   FUZZ_TARGET_OUTPUT_DIR=$CARGO_BUILD_TARGET_DIR/x86_64-unknown-linux-gnu/release
   for f in fuzz/fuzz_targets/*.rs
   do
       FUZZ_TARGET_NAME=$(basename ${f%.*})
       CRATE_NAME=$(basename $CRATE_DIR)
       OUT_FUZZER_NAME=$OUT/$CRATE_NAME-$FUZZ_TARGET_NAME
-      cp $FUZZ_TARGET_OUTPUT_DIR/$FUZZ_TARGET_NAME $OUT_FUZZER_NAME 
-      FUZZ_CORPUS_BUILDER=./fuzz/fuzz_targets/${FUZZ_TARGET_NAME}_corpus_builder.sh      
+      cp $FUZZ_TARGET_OUTPUT_DIR/$FUZZ_TARGET_NAME $OUT_FUZZER_NAME
+      FUZZ_CORPUS_BUILDER=./fuzz/fuzz_targets/${FUZZ_TARGET_NAME}_corpus_builder.sh
       if test -f "$FUZZ_CORPUS_BUILDER"; then
           $FUZZ_CORPUS_BUILDER $SRC/gitoxide ${OUT_FUZZER_NAME}_seed_corpus.zip
       fi
-      FUZZ_DICT=./fuzz/fuzz_targets/${FUZZ_TARGET_NAME}.dict      
+      FUZZ_DICT=./fuzz/fuzz_targets/${FUZZ_TARGET_NAME}.dict
       if test -f "$FUZZ_DICT"; then
             cp $FUZZ_DICT ${OUT_FUZZER_NAME}.dict
       fi

diff --git a/projects/hdf5/Dockerfile b/projects/hdf5/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool \
   pkg-config cmake zlib1g-dev
 RUN git clone --depth 1 https://github.com/HDFGroup/hdf5

diff --git a/projects/hdf5/project.yaml b/projects/hdf5/project.yaml
@@ -11,3 +11,7 @@ sanitizers:
   - address
   - undefined
   - memory
+fuzzing_engines:
+# - afl  # Temporarily disabled after a clang-18 bump, to avoid link errors "undefined reference to [...]"
+  - honggfuzz
+  - libfuzzer
diff --git a/projects/jsign/build.sh b/projects/jsign/build.sh
@@ -15,7 +15,7 @@
 #
 ################################################################################
 
-$MVN package --projects jsign-core,jsign-cli,jsign-ant,jsign \
+$MVN package --projects jsign-crypto,jsign-core,jsign-cli,jsign-ant,jsign \
     -DskipTests -Dmaven.javadoc.skip -Djacoco.skip -Dproguard.skip -Djapicmp.skip -Djdeb.skip -Dmaven.antrun.skip
 
 CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)

diff --git a/projects/kimageformats/Dockerfile b/projects/kimageformats/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install --yes cmake autoconf libtool pkg-config
 RUN git clone --depth 1 https://github.com/madler/zlib.git
 RUN git clone --depth 1 https://github.com/nih-at/libzip.git

diff --git a/projects/kimageformats/build.sh b/projects/kimageformats/build.sh
@@ -152,7 +152,8 @@ echo "$HANDLER_TYPES" | while read class format; do
   $SRC/qtbase/bin/moc $SRC/kimageformats/src/imageformats/$format.cpp -o $format.moc
   header=`ls $SRC/kimageformats/src/imageformats/$format*.h`
   $SRC/qtbase/bin/moc $header -o moc_`basename $header .h`.cpp
-  $CXX $CXXFLAGS -fPIC -DHANDLER=$class -std=c++17 $SRC/kimgio_fuzzer.cc $SRC/kimageformats/src/imageformats/$format.cpp $SRC/kimageformats/src/imageformats/scanlineconverter.cpp -o $OUT/$fuzz_target_name -DJXL_STATIC_DEFINE -DJXL_THREADS_STATIC_DEFINE -DJXL_CMS_STATIC_DEFINE -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++/ -I $SRC/libavif/include/ -I $SRC/libjxl/build/lib/include/ -I $SRC/libjxl/lib/include/ -I /usr/local/include/OpenEXR/ -I /usr/local/include/Imath -I . -L $SRC/qtbase/lib $SRC/libavif/build/libavif.a /usr/local/lib/libheif.a /usr/local/lib/libde265.a $SRC/aom/build.libavif/libaom.a $SRC/libjxl/build/lib/libjxl_threads.a $SRC/libjxl/build/lib/libjxl.a $SRC/libjxl/build/lib/libjxl_cms.a $SRC/libjxl/build/third_party/highway/libhwy.a $SRC/libjxl/build/third_party/brotli/libbrotlidec.a $SRC/libjxl/build/third_party/brotli/libbrotlienc.a $SRC/libjxl/build/third_party/brotli/libbrotlicommon.a -lQt5Gui -lQt5Core -lqtlibpng -lqtharfbuzz -lm -lqtpcre2 -ldl -lpthread $LIB_FUZZING_ENGINE /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive /usr/local/lib/libz.a /usr/local/lib/libraw.a /usr/local/lib/libOpenEXR-3_2.a /usr/local/lib/libIex-3_2.a /usr/local/lib/libImath-3_1.a /usr/local/lib/libIlmThread-3_2.a /usr/local/lib/libOpenEXRCore-3_2.a /usr/local/lib/libOpenEXRUtil-3_2.a /usr/local/lib/libopenjp2.a
+  $CXX $CXXFLAGS -fPIC -DHANDLER=$class -std=c++17 $SRC/kimgio_fuzzer.cc $SRC/kimageformats/src/imageformats/$format.cpp $SRC/kimageformats/src/imageformats/scanlineconverter.cpp -o $OUT/$fuzz_target_name -DJXL_STATIC_DEFINE -DJXL_THREADS_STATIC_DEFINE -DJXL_CMS_STATIC_DEFINE -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++/ -I $SRC/libavif/include/ -I $SRC/libjxl/build/lib/include/ -I $SRC/libjxl/lib/include/ -I /usr/local/include/OpenEXR/ -I /usr/local/include/Imath -I . -L $SRC/qtbase/lib $SRC/libavif/build/libavif.a /usr/local/lib/libheif.a /usr/local/lib/libde265.a $SRC/aom/build.libavif/libaom.a $SRC/libjxl/build/lib/libjxl_threads.a $SRC/libjxl/build/lib/libjxl.a $SRC/libjxl/build/lib/libjxl_cms.a $SRC/libjxl/build/third_party/highway/libhwy.a $SRC/libjxl/build/third_party/brotli/libbrotlidec.a $SRC/libjxl/build/third_party/brotli/libbrotlienc.a $SRC/libjxl/build/third_party/brotli/libbrotlicommon.a -lQt5Gui -lQt5Core -lqtlibpng -lqtharfbuzz -lm -lqtpcre2 -ldl -lpthread $LIB_FUZZING_ENGINE /usr/local/lib/libzip.a /usr/local/lib/libz.a -lKF5Archive /usr/local/lib/libz.a /usr/local/lib/libraw.a /usr/local/lib/libOpenEXR-3_2.a /usr/local/lib/libIex-3_2.a /usr/local/lib/libImath-3_1.a /usr/local/lib/libIlmThread-3_2.a /usr/local/lib/libOpenEXRCore-3_2.a /usr/local/lib/libOpenEXRUtil-3_2.a /usr/local/lib/libopenjp2.a -lclang_rt.builtins
+  # -lclang_rt.builtins in the previous line is a temporary workaround to avoid a linker error "undefined reference to __truncsfhf2". Investigate why this is needed here, but not anywhere else, and possibly remove it.
 
   find . -name "*.${format}" | zip -q $OUT/${fuzz_target_name}_seed_corpus.zip -@
 )

diff --git a/projects/knot-dns/Dockerfile b/projects/knot-dns/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y \
  autoconf \
  autogen \

diff --git a/projects/knot-dns/build.sh b/projects/knot-dns/build.sh
@@ -32,7 +32,7 @@ make -j$(nproc)
 make install
 
 GNUTLS_CONFIGURE_FLAGS=""
-NETTLE_CONFIGURE_FLAGS=""
+NETTLE_CONFIGURE_FLAGS="--disable-assembler"  # Temporarily disalbe asm to work around error "Libnettle 3.6 was not found."
 if [[ $CFLAGS = *sanitize=memory* ]]; then
   GNUTLS_CONFIGURE_FLAGS="--disable-hardware-acceleration"
   NETTLE_CONFIGURE_FLAGS="--disable-assembler --disable-fat"

diff --git a/projects/libavif/Dockerfile b/projects/libavif/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel cmake git nasm && \
     pip3 install meson ninja

diff --git a/projects/libwebp/project.yaml b/projects/libwebp/project.yaml
@@ -3,9 +3,6 @@ language: c++
 primary_contact: "[email protected]"
 fuzzing_engines:
   - libfuzzer
-  - afl
-  - honggfuzz
-  - centipede
 sanitizers:
   - address
   - undefined

diff --git a/projects/linkerd2-proxy/build.sh b/projects/linkerd2-proxy/build.sh
@@ -23,7 +23,7 @@ then
   export CFLAGS=""
 fi
 
-BUILD_FUZZER="cargo +nightly-2023-12-28 fuzz build "
+BUILD_FUZZER="cargo fuzz build "
 TARGET_PATH="./fuzz/target/x86_64-unknown-linux-gnu/release"
 BASE="$SRC/linkerd2-proxy/linkerd"