From 8d3d2aeec26497c8099cc49990d7300a706c4e40 Mon Sep 17 00:00:00 2001
From: Kartik Agarwala <agarwala.kartik@gmail.com>
Date: Tue, 2 Jul 2024 12:23:31 +0530
Subject: [PATCH 1/3] Use bitcoin's fuzz.[cpp, h]

---
 Makefile                         |  2 +-
 fuzzer.cpp                       | 46 --------------------------------
 targets/addrv2.cpp               |  9 +++----
 targets/addrv2.h                 |  7 -----
 targets/bech32.cpp               |  8 +++---
 targets/bech32.h                 |  7 -----
 targets/block_des.cpp            |  8 +++---
 targets/block_des.h              |  7 -----
 targets/cmpctblocks.cpp          |  7 +++--
 targets/cmpctblocks.h            |  7 -----
 targets/miniscript_string.cpp    |  7 +++--
 targets/miniscript_string.h      |  7 -----
 targets/prefilledtransaction.cpp |  4 +--
 targets/prefilledtransaction.h   |  7 -----
 targets/psbt.cpp                 |  7 ++---
 targets/psbt.h                   |  7 -----
 targets/script.cpp               |  7 +++--
 targets/script.h                 |  7 -----
 targets/tx_des.cpp               |  8 +++---
 targets/tx_des.h                 |  7 -----
 20 files changed, 31 insertions(+), 145 deletions(-)
 delete mode 100644 fuzzer.cpp
 delete mode 100644 targets/addrv2.h
 delete mode 100644 targets/bech32.h
 delete mode 100644 targets/block_des.h
 delete mode 100644 targets/cmpctblocks.h
 delete mode 100644 targets/miniscript_string.h
 delete mode 100644 targets/prefilledtransaction.h
 delete mode 100644 targets/psbt.h
 delete mode 100644 targets/script.h
 delete mode 100644 targets/tx_des.h

diff --git a/Makefile b/Makefile
index 557e266..f19982b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ endif
 .PHONY: bitcoinfuzz bitcoin cargo go clean
 
 bitcoinfuzz: set $(OBJS) bitcoin cargo go
-	$(CXX) fuzzer.cpp -o $@ $(OBJS) $(CXXFLAGS) $(LDFLAGS)
+	$(CXX) dependencies/bitcoin/src/test/fuzz/fuzz.cpp -o $@ $(OBJS) $(CXXFLAGS) $(LDFLAGS)
 
 $(OBJS) : build/%.o: %.cpp
 	@[ -d $(@D) ] || mkdir -p $(@D)
diff --git a/fuzzer.cpp b/fuzzer.cpp
deleted file mode 100644
index c116a62..0000000
--- a/fuzzer.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <assert.h>
-#include <ctype.h>
-#include <iostream>
-#include <stdio.h>
-#include <string>
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-#include "targets/miniscript_string.h"
-#include "targets/block_des.h"
-#include "targets/prefilledtransaction.h"
-#include "targets/tx_des.h"
-#include "targets/bech32.h"
-#include "targets/psbt.h"
-#include "targets/script.h"
-#include "targets/addrv2.h"
-#include "targets/cmpctblocks.h"
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-    FuzzedDataProvider provider(data, size);
-
-    char *t = std::getenv("FUZZ");
-    std::string target = t ? t : ""; 
-
-    if (target == "miniscript_string") {
-        MiniscriptFromString(provider);
-    } else if (target == "block_deserialization") {
-        BlockDes(provider);
-    } else if (target == "prefilledtransaction") {
-        PrefilledTransactionTarget(provider);
-    } else if (target == "tx_deserialization") {
-        TransactionDes(provider);
-    } else if (target == "bech32") {
-        Bech32(provider);
-    } else if (target == "psbt") {
-        Psbt(provider);
-    } else if (target == "script") {
-        Script(provider);
-    } else if (target == "addrv2") {
-        Addrv2(provider);
-    } else if (target == "cmpctblocks") {
-        CmpctBlocks(provider);
-    }
-
-    return 0; // Values other than 0 and -1 are reserved for future use.
-}
diff --git a/targets/addrv2.cpp b/targets/addrv2.cpp
index 8f299ce..087713e 100644
--- a/targets/addrv2.cpp
+++ b/targets/addrv2.cpp
@@ -3,12 +3,12 @@
 #include <optional>
 #include <stdio.h>
 
-#include "addrv2.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/protocol.h"
 #include "bitcoin/src/streams.h"
 
-extern "C" bool rust_bitcoin_addrv2(uint8_t *data, size_t len, uint64_t *count);
-extern "C" bool go_btcd_addrv2(uint8_t *data, size_t len, uint64_t *count);
+extern "C" bool rust_bitcoin_addrv2(const uint8_t *data, size_t len, uint64_t *count);
+extern "C" bool go_btcd_addrv2(const uint8_t *data, size_t len, uint64_t *count);
 
 std::optional<std::pair<uint64_t, uint64_t>> Addrv2Core(Span<const uint8_t> buffer) 
 {
@@ -29,9 +29,8 @@ std::optional<std::pair<uint64_t, uint64_t>> Addrv2Core(Span<const uint8_t> buff
     return std::make_pair(addrs.size(), clearnet_tor_count);
 }
 
-void Addrv2(FuzzedDataProvider& provider)
+FUZZ_TARGET(Addrv2)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
     uint64_t count_rust = 0, count_btcd = 0;
     [[maybe_unused]] bool rust_bitcoin{rust_bitcoin_addrv2(buffer.data(), buffer.size(), &count_rust)};
     [[maybe_unused]] bool btcd{go_btcd_addrv2(buffer.data(), buffer.size(), &count_btcd)};
diff --git a/targets/addrv2.h b/targets/addrv2.h
deleted file mode 100644
index b7b061d..0000000
--- a/targets/addrv2.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef NET_ADDRESS_H
-#define NET_ADDRESS_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void Addrv2(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/bech32.cpp b/targets/bech32.cpp
index 8ad5e2c..4479c95 100644
--- a/targets/bech32.cpp
+++ b/targets/bech32.cpp
@@ -3,11 +3,11 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "bech32.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/bech32.h"
 #include "bitcoin/src/streams.h"
 
-extern "C" char* go_btcd_bech32(uint8_t *data, size_t len);
+extern "C" char* go_btcd_bech32(const uint8_t *data, size_t len);
 
 std::string Bech32Core(Span<const uint8_t> buffer)
 {
@@ -20,10 +20,8 @@ std::string Bech32Core(Span<const uint8_t> buffer)
 }
 
 
-void Bech32(FuzzedDataProvider& provider) 
+FUZZ_TARGET(Bech32)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
-
     std::string core{Bech32Core(buffer)};
     std::string go_btcd{go_btcd_bech32(buffer.data(), buffer.size())};
 
diff --git a/targets/bech32.h b/targets/bech32.h
deleted file mode 100644
index 4d02fcd..0000000
--- a/targets/bech32.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef BECH32_H
-#define BECH32_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void Bech32(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/block_des.cpp b/targets/block_des.cpp
index e328dbf..565233e 100644
--- a/targets/block_des.cpp
+++ b/targets/block_des.cpp
@@ -3,12 +3,12 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "block_des.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/primitives/block.h"
 #include "bitcoin/src/streams.h"
 
 extern "C" char* rust_bitcoin_des_block(const uint8_t *data, size_t len);
-extern "C" char* go_btcd_des_block(uint8_t *data, size_t len);
+extern "C" char* go_btcd_des_block(const uint8_t *data, size_t len);
 
 std::string BlockDesCore(Span<const uint8_t> buffer)
 {
@@ -24,10 +24,8 @@ std::string BlockDesCore(Span<const uint8_t> buffer)
 }
 
 // This target is expected to crash, needs some verification (e.g. segwit version).
-void BlockDes(FuzzedDataProvider& provider) 
+FUZZ_TARGET(BlockDes)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
-
     std::string core{BlockDesCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_des_block(buffer.data(), buffer.size())};
     std::string go_btcd{go_btcd_des_block(buffer.data(), buffer.size())};
diff --git a/targets/block_des.h b/targets/block_des.h
deleted file mode 100644
index d1e954e..0000000
--- a/targets/block_des.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef BLOCK_DES_H
-#define BLOCK_DES_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void BlockDes(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/cmpctblocks.cpp b/targets/cmpctblocks.cpp
index 6e34122..b7d43e4 100644
--- a/targets/cmpctblocks.cpp
+++ b/targets/cmpctblocks.cpp
@@ -2,11 +2,11 @@
 #include <string>
 #include <iostream>
 
-#include "cmpctblocks.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/blockencodings.h"
 #include "bitcoin/src/streams.h"
 
-extern "C" int rust_bitcoin_cmpctblocks(uint8_t *data, size_t len);
+extern "C" int rust_bitcoin_cmpctblocks(const uint8_t *data, size_t len);
 
 int CmpctBlocksCore(Span<const uint8_t> buffer) 
 {
@@ -22,9 +22,8 @@ int CmpctBlocksCore(Span<const uint8_t> buffer)
     return block_header_and_short_txids.BlockTxCount();
 }
 
-void CmpctBlocks(FuzzedDataProvider& provider)
+FUZZ_TARGET(CmpctBlocks)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
     int core{CmpctBlocksCore(buffer)};
     int rust_bitcoin{rust_bitcoin_cmpctblocks(buffer.data(), buffer.size())};
 
diff --git a/targets/cmpctblocks.h b/targets/cmpctblocks.h
deleted file mode 100644
index 602cd3e..0000000
--- a/targets/cmpctblocks.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef CMPCT_BLOCKS_H
-#define CMPCT_BLOCKS_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void CmpctBlocks(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/miniscript_string.cpp b/targets/miniscript_string.cpp
index 89b4ead..f6fda8c 100644
--- a/targets/miniscript_string.cpp
+++ b/targets/miniscript_string.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <script/miniscript.h>
 
-#include "miniscript_string.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/pubkey.h"
 #include "bitcoin/src/key.h"
 
@@ -184,8 +184,11 @@ bool BitcoinCoreString(const std::string& input_str)
     return false;
 }
 
-void MiniscriptFromString(FuzzedDataProvider& provider) 
+FUZZ_TARGET(MiniscriptFromString)
 {
+    if (buffer.empty()) return;
+    FuzzedDataProvider provider(buffer.data(), buffer.size());
+
     std::string input_str{provider.ConsumeRemainingBytesAsString().c_str()};
     const bool core{BitcoinCoreString(input_str)};
     const std::string rust_miniscript{rust_miniscript_from_str_check_key(input_str.c_str())};
diff --git a/targets/miniscript_string.h b/targets/miniscript_string.h
deleted file mode 100644
index 8c2f78d..0000000
--- a/targets/miniscript_string.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef RUST_MINISCRIPT_STRING_H
-#define RUST_MINISCRIPT_STRING_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void MiniscriptFromString(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/prefilledtransaction.cpp b/targets/prefilledtransaction.cpp
index 99580c2..f0d1a61 100644
--- a/targets/prefilledtransaction.cpp
+++ b/targets/prefilledtransaction.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 #include <stdio.h>
 
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/blockencodings.h"
 #include "bitcoin/src/streams.h"
 
@@ -20,9 +21,8 @@ std::optional<uint16_t> PrefilledTransactionCore(Span<const uint8_t> buffer)
     return tx.index;
 }
 
-void PrefilledTransactionTarget(FuzzedDataProvider& provider) 
+FUZZ_TARGET(PrefilledTransaction)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
     auto core{PrefilledTransactionCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_prefilledtransaction(buffer.data(), buffer.size())};
     if (rust_bitcoin == "unsupported segwit version") return;
diff --git a/targets/prefilledtransaction.h b/targets/prefilledtransaction.h
deleted file mode 100644
index 1ccc076..0000000
--- a/targets/prefilledtransaction.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PREFILLEDTRANSACTION_H
-#define PREFILLEDTRANSACTION_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void PrefilledTransactionTarget(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/psbt.cpp b/targets/psbt.cpp
index 72eba33..babfdd3 100644
--- a/targets/psbt.cpp
+++ b/targets/psbt.cpp
@@ -4,11 +4,13 @@
 #include <stdio.h>
 
 #include "psbt.h"
+
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/psbt.h"
 #include "bitcoin/src/span.h"
 #include "bitcoin/src/node/psbt.h"
 
-extern "C" char* rust_bitcoin_psbt(uint8_t *data, size_t len);
+extern "C" char* rust_bitcoin_psbt(const uint8_t *data, size_t len);
 
 bool PSBTCore(Span<const uint8_t> buffer)
 {
@@ -21,9 +23,8 @@ bool PSBTCore(Span<const uint8_t> buffer)
 }
 
 
-void Psbt(FuzzedDataProvider& provider)
+FUZZ_TARGET(Psbt)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
     bool core{PSBTCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_psbt(buffer.data(), buffer.size())};
     if (rust_bitcoin == "invalid xonly public key" || 
diff --git a/targets/psbt.h b/targets/psbt.h
deleted file mode 100644
index 4ae2572..0000000
--- a/targets/psbt.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PSBT_H
-#define PSBT_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void Psbt(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/script.cpp b/targets/script.cpp
index 44cfd67..7be79de 100644
--- a/targets/script.cpp
+++ b/targets/script.cpp
@@ -2,11 +2,11 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "script.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/streams.h"
 #include "bitcoin/src/script/script.h"
 
-extern "C" bool rust_bitcoin_script(uint8_t *data, size_t len);
+extern "C" bool rust_bitcoin_script(const uint8_t *data, size_t len);
 
 bool CoreScript(Span<const uint8_t> buffer)
 {
@@ -22,9 +22,8 @@ bool CoreScript(Span<const uint8_t> buffer)
 }
 
 
-void Script(FuzzedDataProvider& provider)
+FUZZ_TARGET(Script)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
     bool core{CoreScript(buffer)};
     bool rust_bitcoin{rust_bitcoin_script(buffer.data(), buffer.size())};
     assert(core == rust_bitcoin);
diff --git a/targets/script.h b/targets/script.h
deleted file mode 100644
index fcf8efb..0000000
--- a/targets/script.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef SCRIPT_H
-#define SCRIPT_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void Script(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file
diff --git a/targets/tx_des.cpp b/targets/tx_des.cpp
index a9b715b..f2588bb 100644
--- a/targets/tx_des.cpp
+++ b/targets/tx_des.cpp
@@ -3,13 +3,13 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "tx_des.h"
+#include "bitcoin/src/test/fuzz/fuzz.h"
 #include "bitcoin/src/consensus/tx_check.h"
 #include "bitcoin/src/consensus/validation.h"
 #include "bitcoin/src/primitives/block.h"
 #include "bitcoin/src/streams.h"
 
-extern "C" char* go_btcd_des_tx(uint8_t *data, size_t len);
+extern "C" char* go_btcd_des_tx(const uint8_t *data, size_t len);
 
 std::string TransactionDesCore(Span<const uint8_t> buffer)
 {
@@ -28,10 +28,8 @@ std::string TransactionDesCore(Span<const uint8_t> buffer)
     return "";
 }
 
-void TransactionDes(FuzzedDataProvider& provider) 
+FUZZ_TARGET(TransactionDes)
 {
-    std::vector<uint8_t> buffer{provider.ConsumeRemainingBytes<uint8_t>()};
-
     std::string core{TransactionDesCore(buffer)};
     std::string go_btcd{go_btcd_des_tx(buffer.data(), buffer.size())};
     assert(core == go_btcd);
diff --git a/targets/tx_des.h b/targets/tx_des.h
deleted file mode 100644
index 6c7ad40..0000000
--- a/targets/tx_des.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef TX_DES_H
-#define TX_DES_H
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-void TransactionDes(FuzzedDataProvider& provider);
-#endif
\ No newline at end of file

From e95e1d8dafb2ce303fb28ce50479cbe40a0add50 Mon Sep 17 00:00:00 2001
From: Kartik Agarwala <agarwala.kartik@gmail.com>
Date: Wed, 3 Jul 2024 00:20:47 +0530
Subject: [PATCH 2/3] Fix CI workflow

---
 .github/workflows/workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 293da84..14381f6 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -62,4 +62,4 @@ jobs:
           fi
 
       - name: Test
-        run: ./bitcoinfuzz -detect_leaks=0 -runs=0
+        run: PRINT_ALL_FUZZ_TARGETS_AND_ABORT=1 ./bitcoinfuzz

From 385d42939dc71a11448d129e5ddd95c4d1875c8f Mon Sep 17 00:00:00 2001
From: Kartik Agarwala <agarwala.kartik@gmail.com>
Date: Wed, 3 Jul 2024 17:52:12 +0530
Subject: [PATCH 3/3] Change names for targets to be more consistent

---
 targets/addrv2.cpp               | 2 +-
 targets/bech32.cpp               | 2 +-
 targets/block_des.cpp            | 2 +-
 targets/cmpctblocks.cpp          | 2 +-
 targets/miniscript_string.cpp    | 2 +-
 targets/prefilledtransaction.cpp | 2 +-
 targets/psbt.cpp                 | 2 +-
 targets/script.cpp               | 2 +-
 targets/tx_des.cpp               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/targets/addrv2.cpp b/targets/addrv2.cpp
index 087713e..2d79c5f 100644
--- a/targets/addrv2.cpp
+++ b/targets/addrv2.cpp
@@ -29,7 +29,7 @@ std::optional<std::pair<uint64_t, uint64_t>> Addrv2Core(Span<const uint8_t> buff
     return std::make_pair(addrs.size(), clearnet_tor_count);
 }
 
-FUZZ_TARGET(Addrv2)
+FUZZ_TARGET(addrv2)
 {
     uint64_t count_rust = 0, count_btcd = 0;
     [[maybe_unused]] bool rust_bitcoin{rust_bitcoin_addrv2(buffer.data(), buffer.size(), &count_rust)};
diff --git a/targets/bech32.cpp b/targets/bech32.cpp
index 4479c95..48e72c5 100644
--- a/targets/bech32.cpp
+++ b/targets/bech32.cpp
@@ -20,7 +20,7 @@ std::string Bech32Core(Span<const uint8_t> buffer)
 }
 
 
-FUZZ_TARGET(Bech32)
+FUZZ_TARGET(bech32)
 {
     std::string core{Bech32Core(buffer)};
     std::string go_btcd{go_btcd_bech32(buffer.data(), buffer.size())};
diff --git a/targets/block_des.cpp b/targets/block_des.cpp
index 565233e..8f1e7ed 100644
--- a/targets/block_des.cpp
+++ b/targets/block_des.cpp
@@ -24,7 +24,7 @@ std::string BlockDesCore(Span<const uint8_t> buffer)
 }
 
 // This target is expected to crash, needs some verification (e.g. segwit version).
-FUZZ_TARGET(BlockDes)
+FUZZ_TARGET(block_des)
 {
     std::string core{BlockDesCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_des_block(buffer.data(), buffer.size())};
diff --git a/targets/cmpctblocks.cpp b/targets/cmpctblocks.cpp
index b7d43e4..aedc933 100644
--- a/targets/cmpctblocks.cpp
+++ b/targets/cmpctblocks.cpp
@@ -22,7 +22,7 @@ int CmpctBlocksCore(Span<const uint8_t> buffer)
     return block_header_and_short_txids.BlockTxCount();
 }
 
-FUZZ_TARGET(CmpctBlocks)
+FUZZ_TARGET(cmpct_blocks)
 {
     int core{CmpctBlocksCore(buffer)};
     int rust_bitcoin{rust_bitcoin_cmpctblocks(buffer.data(), buffer.size())};
diff --git a/targets/miniscript_string.cpp b/targets/miniscript_string.cpp
index f6fda8c..343b072 100644
--- a/targets/miniscript_string.cpp
+++ b/targets/miniscript_string.cpp
@@ -184,7 +184,7 @@ bool BitcoinCoreString(const std::string& input_str)
     return false;
 }
 
-FUZZ_TARGET(MiniscriptFromString)
+FUZZ_TARGET(miniscript_from_string)
 {
     if (buffer.empty()) return;
     FuzzedDataProvider provider(buffer.data(), buffer.size());
diff --git a/targets/prefilledtransaction.cpp b/targets/prefilledtransaction.cpp
index f0d1a61..94d0ebf 100644
--- a/targets/prefilledtransaction.cpp
+++ b/targets/prefilledtransaction.cpp
@@ -21,7 +21,7 @@ std::optional<uint16_t> PrefilledTransactionCore(Span<const uint8_t> buffer)
     return tx.index;
 }
 
-FUZZ_TARGET(PrefilledTransaction)
+FUZZ_TARGET(prefilled_transaction)
 {
     auto core{PrefilledTransactionCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_prefilledtransaction(buffer.data(), buffer.size())};
diff --git a/targets/psbt.cpp b/targets/psbt.cpp
index babfdd3..04191ed 100644
--- a/targets/psbt.cpp
+++ b/targets/psbt.cpp
@@ -23,7 +23,7 @@ bool PSBTCore(Span<const uint8_t> buffer)
 }
 
 
-FUZZ_TARGET(Psbt)
+FUZZ_TARGET(psbt)
 {
     bool core{PSBTCore(buffer)};
     std::string rust_bitcoin{rust_bitcoin_psbt(buffer.data(), buffer.size())};
diff --git a/targets/script.cpp b/targets/script.cpp
index 7be79de..ea71e2d 100644
--- a/targets/script.cpp
+++ b/targets/script.cpp
@@ -22,7 +22,7 @@ bool CoreScript(Span<const uint8_t> buffer)
 }
 
 
-FUZZ_TARGET(Script)
+FUZZ_TARGET(script)
 {
     bool core{CoreScript(buffer)};
     bool rust_bitcoin{rust_bitcoin_script(buffer.data(), buffer.size())};
diff --git a/targets/tx_des.cpp b/targets/tx_des.cpp
index f2588bb..ddb0770 100644
--- a/targets/tx_des.cpp
+++ b/targets/tx_des.cpp
@@ -28,7 +28,7 @@ std::string TransactionDesCore(Span<const uint8_t> buffer)
     return "";
 }
 
-FUZZ_TARGET(TransactionDes)
+FUZZ_TARGET(transaction_des)
 {
     std::string core{TransactionDesCore(buffer)};
     std::string go_btcd{go_btcd_des_tx(buffer.data(), buffer.size())};