Use libfuzzer instead of honggfuzz

Author: shinghim

.github/docker/Dockerfile.s390x

@@ -0,0 +1,37 @@
+FROM ubuntu:24.04
+
+# Install both native (x86_64) and cross (s390x) compilation toolchains
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gcc g++ \
+    gcc-13-s390x-linux-gnu \
+    g++-13-s390x-linux-gnu \
+    libc6-dev-s390x-cross \
+    qemu-user-static \
+    binfmt-support \
+    curl \
+    ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+# Set up alternatives to use GCC 13 for s390x
+RUN update-alternatives --install /usr/bin/s390x-linux-gnu-gcc s390x-linux-gnu-gcc /usr/bin/s390x-linux-gnu-gcc-13 100 && \
+    update-alternatives --install /usr/bin/s390x-linux-gnu-g++ s390x-linux-gnu-g++ /usr/bin/s390x-linux-gnu-g++-13 100
+
+# Register QEMU for s390x binary execution
+RUN update-binfmts --enable qemu-s390x || true
+
+# Verify GCC versions
+RUN gcc --version && \
+    s390x-linux-gnu-gcc --version && \
+    s390x-linux-gnu-g++ --version
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
+ENV PATH="/root/.cargo/bin:${PATH}"
+RUN rustup target add s390x-unknown-linux-gnu
+
+# Set up cross-compilation environment
+ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
+    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x-static -L /usr/s390x-linux-gnu" \
+    CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
+    CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++

.github/workflows/cron-daily-fuzz.yml

@@ -59,7 +59,6 @@ jobs:
         with:
           persist-credentials: false
       - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-
         id: cache-fuzz
         with:
           path: |
@@ -97,4 +96,4 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
       - run: find executed_* -type f -exec cat {} + | sort > executed
-      - run: source ./fuzz/fuzz-util.sh && listTargetNames | sort | diff - executed
+      - run: cargo fuzz list | sort | diff - executed

.github/workflows/rust.yml

@@ -263,7 +263,10 @@ jobs:
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable
       - name: "Add architecture i386"
-        run: sudo dpkg --add-architecture i386
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update -y
+          sudo apt-get install -y gcc-multilib g++-multilib
       - name: "Install i686 gcc"
         run: sudo apt-get update -y && sudo apt-get install -y gcc-multilib
       - name: "Install target"
@@ -288,7 +291,7 @@ jobs:
         run: rustup target add s390x-unknown-linux-gnu
       - name: "Install cross"
         run: cargo install cross --locked
-      - name: "Run cross test"
+      - name: "Run s390x tests"
         run: cross test --target s390x-unknown-linux-gnu
 
   Embedded:

.gitignore

@@ -1,4 +1,5 @@
 # .gitignore for rust-bitcoin repository workspace.
+fuzz/hfuzz_input/
 
 # Lock files
 Cargo.lock
@@ -16,9 +17,5 @@ hashes/target
 bitcoin/dep_test
 mutants.out*
 
-# Fuzz artifacts
-hfuzz_target
-hfuzz_workspace
-
 # Local tooling
 .maintainer-tools

Cargo-minimal.lock

@@ -97,7 +97,7 @@ dependencies = [
  "bitcoin",
  "bitcoin-consensus-encoding",
  "bitcoin-p2p-messages",
- "honggfuzz",
+ "libfuzzer-sys",
  "serde",
  "serde_json",
  "standard_test",
@@ -202,9 +202,15 @@ checksum = "60f0b0d4c0a382d2734228fd12b5a6b5dac185c60e938026fd31b265b94f9bd2"
 
 [[package]]
 name = "cc"
-version = "1.0.28"
+version = "1.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
+checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -219,6 +225,12 @@ dependencies = [
  "hex-conservative 0.3.0",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
 [[package]]
 name = "getrandom"
 version = "0.3.0"
@@ -252,29 +264,20 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "honggfuzz"
-version = "0.5.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8319f3cc8fe416e7aa1ab95dcc04fd49f35397a47d0b2f0f225f6dba346a07"
-dependencies = [
- "lazy_static",
- "memmap2",
- "rustc_version",
- "semver",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 
 [[package]]
-name = "lazy_static"
-version = "1.5.0"
+name = "jobserver"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "libc"
@@ -283,12 +286,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
-name = "memmap2"
-version = "0.9.0"
+name = "libfuzzer-sys"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
- "libc",
+ "arbitrary",
+ "cc",
 ]
 
 [[package]]
@@ -346,15 +350,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.0"
@@ -381,12 +376,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76b5842e81eb9bbea19276a9dbbda22ac042532f390a67ab08b895617978abf3"
-
 [[package]]
 name = "serde"
 version = "1.0.195"
@@ -427,6 +416,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "standard_test"
 version = "0.1.0"