Merge branch 'master' into feat/abseil-ubuntu-migration

Author: hunsche

projects/quiche-cloudflare/Dockerfile

@@ -17,6 +17,4 @@ FROM gcr.io/oss-fuzz-base/base-builder-rust
 
 RUN git clone --recursive --depth 1 https://github.com/cloudflare/quiche quiche
 COPY build.sh $SRC/
-ENV RUSTUP_TOOLCHAIN nightly-2025-01-10
-RUN rustup update
 WORKDIR $SRC/quiche

projects/skia/build.sh

@@ -90,7 +90,7 @@ SKIA_ARGS="skia_build_fuzzers=true
            skia_use_freetype=true
            skia_use_system_freetype2=false
            skia_use_wuffs=true
-           skia_use_libfuzzer_defaults=false"
+           skia_provide_default_fuzz_engine=false"
 
 # Even though GPU is "enabled" for all these builds, none really
 # uses the gpu except for api_mock_gpu_canvas.

projects/timestamp-authority/Dockerfile

@@ -21,11 +21,5 @@ RUN git clone --depth=1 https://github.com/dvyukov/go-fuzz-corpus
 # For json dictionary
 RUN git clone --depth=1 https://github.com/rc0r/afl-fuzz
 
-RUN wget https://go.dev/dl/go1.24.0.linux-amd64.tar.gz \
-    && mkdir temp-go \
-    && rm -rf /root/.go/* \
-    && tar -C temp-go/ -xzf go1.24.0.linux-amd64.tar.gz \
-    && mv temp-go/go/* /root/.go/
-
 COPY build.sh $SRC/
 WORKDIR $SRC/timestamp-authority

projects/timestamp-authority/build.sh

@@ -15,7 +15,5 @@
 #
 ################################################################################
 
-export CXX="${CXX} -lresolv"
-
 ./test/fuzz/oss_fuzz_build.sh
 

projects/wolfssl/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool zip wget
 RUN git clone --depth 1 https://github.com/wolfssl/wolfssl $SRC/wolfssl
 RUN git clone --depth 1 https://github.com/wolfSSL/wolfsm
 RUN git clone --depth 1 https://github.com/wolfSSL/wolfssh.git
-RUN git clone --depth 1 https://github.com/guidovranken/fuzzing-headers.git
+RUN git clone --depth 1 https://github.com/JacobBarthelmeh/fuzzing-headers.git
 RUN git clone --depth 1 https://github.com/JacobBarthelmeh/wolf-ssl-ssh-fuzzers
 RUN git clone --depth 1 https://github.com/MozillaSecurity/cryptofuzz
 RUN git clone --depth 1 https://github.com/google/wycheproof.git

projects/wolfssl/build.sh

@@ -61,7 +61,7 @@ then
         ./configure $WOLFCRYPT_CONFIGURE_PARAMS --enable-opensslall --enable-opensslextra
     fi
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT_OPENSSL"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT_OPENSSL -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-openssl-api/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-openssl-api/"
     cd $SRC/cryptofuzz-openssl-api/modules/wolfcrypt-openssl
@@ -118,7 +118,7 @@ then
         ./configure $WOLFCRYPT_CONFIGURE_PARAMS --disable-asm
     fi
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-normal-math/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-normal-math/"
     cd $SRC/cryptofuzz-normal-math/modules/wolfcrypt
@@ -139,7 +139,7 @@ then
     CFLAGS="$CFLAGS -DHAVE_AES_ECB -DWOLFSSL_DES_ECB -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3 -DHAVE_ECC_BRAINPOOL -DHAVE_ECC_KOBLITZ -DWOLFSSL_ECDSA_SET_K -DWOLFSSL_ECDSA_SET_K_ONE_LOOP -DWOLFSSL_SP_INT_NEGATIVE"
     ./configure $WOLFCRYPT_CONFIGURE_PARAMS --enable-sp-math-all
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-sp-math-all/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-sp-math-all/"
     cd $SRC/cryptofuzz-sp-math-all/modules/wolfcrypt
@@ -160,7 +160,7 @@ then
     CFLAGS="$CFLAGS -DHAVE_AES_ECB -DWOLFSSL_DES_ECB -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3 -DHAVE_ECC_BRAINPOOL -DHAVE_ECC_KOBLITZ -DWOLFSSL_ECDSA_SET_K -DWOLFSSL_ECDSA_SET_K_ONE_LOOP -DSP_WORD_SIZE=8 -DWOLFSSL_SP_INT_NEGATIVE"
     ./configure $WOLFCRYPT_CONFIGURE_PARAMS --enable-sp-math-all
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-sp-math-all-8bit/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-sp-math-all-8bit/"
     cd $SRC/cryptofuzz-sp-math-all-8bit/modules/wolfcrypt
@@ -192,7 +192,7 @@ then
         ./configure $WOLFCRYPT_CONFIGURE_PARAMS_SP_MATH --enable-sp --enable-sp-math
     fi
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-sp-math/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-sp-math/"
     cd $SRC/cryptofuzz-sp-math/modules/wolfcrypt
@@ -213,7 +213,7 @@ then
     CFLAGS="$CFLAGS -DHAVE_AES_ECB -DWOLFSSL_DES_ECB -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3 -DHAVE_ECC_BRAINPOOL -DHAVE_ECC_KOBLITZ -DWOLFSSL_ECDSA_SET_K -DWOLFSSL_ECDSA_SET_K_ONE_LOOP"
     ./configure $WOLFCRYPT_CONFIGURE_PARAMS --enable-fastmath
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-fastmath/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-fastmath/"
     cd $SRC/cryptofuzz-fastmath/modules/wolfcrypt
@@ -234,7 +234,7 @@ then
     CFLAGS="$CFLAGS -DHAVE_AES_ECB -DWOLFSSL_DES_ECB -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3 -DHAVE_ECC_BRAINPOOL -DHAVE_ECC_KOBLITZ -DWOLFSSL_ECDSA_SET_K -DWOLFSSL_ECDSA_SET_K_ONE_LOOP"
     ./configure $WOLFCRYPT_CONFIGURE_PARAMS --enable-heapmath
     make -j$(nproc)
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT"
+    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL -DCRYPTOFUZZ_WOLFCRYPT -Wno-deprecated-literal-operator"
     export WOLFCRYPT_LIBWOLFSSL_A_PATH="$SRC/wolfssl-heapmath/src/.libs/libwolfssl.a"
     export WOLFCRYPT_INCLUDE_PATH="$SRC/wolfssl-heapmath/"
     cd $SRC/cryptofuzz-heapmath/modules/wolfcrypt
@@ -250,8 +250,8 @@ then
     mkdir $SRC/cryptofuzz-seed-corpus/
 
     # Convert Wycheproof test vectors to Cryptofuzz corpus format
-    find $SRC/wycheproof/testvectors/ -type f -name 'ecdsa_*' -exec $SRC/cryptofuzz-fastmath/cryptofuzz --from-wycheproof={},$SRC/cryptofuzz-seed-corpus/ \;
-    find $SRC/wycheproof/testvectors/ -type f -name 'ecdh_*' -exec $SRC/cryptofuzz-fastmath/cryptofuzz --from-wycheproof={},$SRC/cryptofuzz-seed-corpus/ \;
+    find $SRC/wycheproof/testvectors_v1/ -type f -name 'ecdsa_*' -exec $SRC/cryptofuzz-fastmath/cryptofuzz --from-wycheproof={},$SRC/cryptofuzz-seed-corpus/ \;
+    find $SRC/wycheproof/testvectors_v1/ -type f -name 'ecdh_*' -exec $SRC/cryptofuzz-fastmath/cryptofuzz --from-wycheproof={},$SRC/cryptofuzz-seed-corpus/ \;
 
     # Unpack corpora from other projects
     unzip -n $SRC/corpus_bearssl.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null

projects/wolfssl/project.yaml

@@ -9,12 +9,12 @@ auto_ccs:
   - "testing@wolfssl.com"
   - "dgarske80@gmail.com"
   - "douzzer@mega.nu"
-  - "guidovranken@gmail.com"
   - "jordan@wolfssl.com"
   - "jordanjphillips1@gmail.com"
   - "anthony@wolfssl.com"
   - "anthony.hu.76@gmail.com"
   - "kareem@wolfssl.com"
+  - "sean@wolfssl.com"
 fuzzing_engines:
   - libfuzzer
   - honggfuzz