Update fuzzers to match rust-lightning boilerplate

fuzz/Cargo.toml

@@ -1,4 +1,3 @@
-
 [package]
 name = "bitcoin-fuzz"
 version = "0.0.1"
@@ -8,15 +7,27 @@ publish = false
 [package.metadata]
 cargo-fuzz = true
 
-[dependencies.bitcoin]
-path = ".."
-[dependencies.libfuzzer-sys]
-git = "https://github.com/rust-fuzz/libfuzzer-sys.git"
+[features]
+afl_fuzz = ["afl"]
+honggfuzz_fuzz = ["honggfuzz"]
+
+[dependencies]
+honggfuzz = { version = "0.5", optional = true }
+afl = { version = "0.3", optional = true }
+bitcoin = { path = "..", features = ["fuzztarget"] }
 
 # Prevent this from interfering with workspaces
 [workspace]
 members = ["."]
 
 [[bin]]
-name = "fuzzer_script_1"
-path = "fuzzers/fuzzer_script_1.rs"
+name = "deserialize_block"
+path = "fuzz_targets/deserialize_block.rs"
+
+[[bin]]
+name = "deserialize_script"
+path = "fuzz_targets/deserialize_script.rs"
+
+[[bin]]
+name = "deserialize_transaction"
+path = "fuzz_targets/deserialize_transaction.rs"

fuzz/fuzz_targets/deserialize_block.rs

@@ -0,0 +1,52 @@
+extern crate bitcoin;
+type BResult = Result<bitcoin::blockdata::block::Block, bitcoin::util::Error>;
+fn do_test(data: &[u8]) {
+    let _: BResult = bitcoin::network::serialize::deserialize(data);
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+    afl::read_stdio_bytes(|data| {
+        do_test(&data);
+    });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+    loop {
+        fuzz!(|data| {
+            do_test(data);
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+        let mut b = 0;
+        for (idx, c) in hex.as_bytes().iter().enumerate() {
+            b <<= 4;
+            match *c {
+                b'A'...b'F' => b |= c - b'A' + 10,
+                b'a'...b'f' => b |= c - b'a' + 10,
+                b'0'...b'9' => b |= c - b'0',
+                _ => panic!("Bad hex"),
+            }
+            if (idx & 1) == 1 {
+                out.push(b);
+                b = 0;
+            }
+        }
+    }
+
+    #[test]
+    fn duplicate_crash() {
+        let mut a = Vec::new();
+        extend_vec_from_hex("00", &mut a);
+        super::do_test(&a);
+    }
+}

fuzz/fuzz_targets/deserialize_script.rs

@@ -0,0 +1,52 @@
+extern crate bitcoin;
+type BResult = Result<bitcoin::blockdata::script::Script, bitcoin::util::Error>;
+fn do_test(data: &[u8]) {
+    let _: BResult = bitcoin::network::serialize::deserialize(data);
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+    afl::read_stdio_bytes(|data| {
+        do_test(&data);
+    });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+    loop {
+        fuzz!(|data| {
+            do_test(data);
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+        let mut b = 0;
+        for (idx, c) in hex.as_bytes().iter().enumerate() {
+            b <<= 4;
+            match *c {
+                b'A'...b'F' => b |= c - b'A' + 10,
+                b'a'...b'f' => b |= c - b'a' + 10,
+                b'0'...b'9' => b |= c - b'0',
+                _ => panic!("Bad hex"),
+            }
+            if (idx & 1) == 1 {
+                out.push(b);
+                b = 0;
+            }
+        }
+    }
+
+    #[test]
+    fn duplicate_crash() {
+        let mut a = Vec::new();
+        extend_vec_from_hex("00", &mut a);
+        super::do_test(&a);
+    }
+}

fuzz/fuzz_targets/deserialize_transaction.rs

@@ -0,0 +1,52 @@
+extern crate bitcoin;
+type BResult = Result<bitcoin::blockdata::transaction::Transaction, bitcoin::util::Error>;
+fn do_test(data: &[u8]) {
+    let _: BResult = bitcoin::network::serialize::deserialize(data);
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+    afl::read_stdio_bytes(|data| {
+        do_test(&data);
+    });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+    loop {
+        fuzz!(|data| {
+            do_test(data);
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+        let mut b = 0;
+        for (idx, c) in hex.as_bytes().iter().enumerate() {
+            b <<= 4;
+            match *c {
+                b'A'...b'F' => b |= c - b'A' + 10,
+                b'a'...b'f' => b |= c - b'a' + 10,
+                b'0'...b'9' => b |= c - b'0',
+                _ => panic!("Bad hex"),
+            }
+            if (idx & 1) == 1 {
+                out.push(b);
+                b = 0;
+            }
+        }
+    }
+
+    #[test]
+    fn duplicate_crash() {
+        let mut a = Vec::new();
+        extend_vec_from_hex("00", &mut a);
+        super::do_test(&a);
+    }
+}

fuzz/fuzzers/fuzzer_script_1.rs

@@ -1,13 +0,0 @@
-#![no_main]
-#[macro_use] extern crate libfuzzer_sys;
-extern crate bitcoin;
-
-type BResult = Result<bitcoin::blockdata::script::Script, bitcoin::util::Error>;
-//type BResult = Result<bitcoin::blockdata::transaction::Transaction, bitcoin::util::Error>;
-//type BResult = Result<bitcoin::blockdata::transaction::TxIn, bitcoin::util::Error>;
-//type BResult = Result<bitcoin::blockdata::transaction::TxOut, bitcoin::util::Error>;
-//type BResult = Result<bitcoin::network::constants::Network, bitcoin::util::Error>;
-
-fuzz_target!(|data: &[u8]| {
-    let _: BResult = bitcoin::network::serialize::deserialize(data);
-});