2 files changed, 51 insertions, 1 deletions
diff --git a/src/test/fuzz/crypto.cpp b/src/test/fuzz/crypto.cpp
index 3edcf96495..664e65accc 100644
--- a/src/test/fuzz/crypto.cpp
+++ b/src/test/fuzz/crypto.cpp
@@ -7,6 +7,7 @@
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
+#include <crypto/sha3.h>
 #include <crypto/sha512.h>
 #include <hash.h>
 #include <test/fuzz/FuzzedDataProvider.h>
@@ -32,6 +33,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     CSHA1 sha1;
     CSHA256 sha256;
     CSHA512 sha512;
+    SHA3_256 sha3;
     CSipHasher sip_hasher{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
 
     while (fuzzed_data_provider.ConsumeBool()) {
@@ -51,6 +53,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
             (void)ripemd160.Write(data.data(), data.size());
             (void)sha1.Write(data.data(), data.size());
             (void)sha256.Write(data.data(), data.size());
+            (void)sha3.Write(data);
             (void)sha512.Write(data.data(), data.size());
             (void)sip_hasher.Write(data.data(), data.size());
 
@@ -65,11 +68,12 @@ void test_one_input(const std::vector<uint8_t>& buffer)
             (void)ripemd160.Reset();
             (void)sha1.Reset();
             (void)sha256.Reset();
+            (void)sha3.Reset();
             (void)sha512.Reset();
             break;
         }
         case 2: {
-            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 8)) {
+            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 9)) {
             case 0: {
                 data.resize(CHash160::OUTPUT_SIZE);
                 hash160.Finalize(data);
@@ -115,9 +119,21 @@ void test_one_input(const std::vector<uint8_t>& buffer)
                 data[0] = sip_hasher.Finalize() % 256;
                 break;
             }
+            case 9: {
+                data.resize(SHA3_256::OUTPUT_SIZE);
+                sha3.Finalize(data);
+                break;
+            }
             }
             break;
         }
         }
     }
+    if (fuzzed_data_provider.ConsumeBool()) {
+        uint64_t state[25];
+        for (size_t i = 0; i < 25; ++i) {
+            state[i] = fuzzed_data_provider.ConsumeIntegral<uint64_t>();
+        }
+        KeccakF(state);
+    }
 }
diff --git a/src/test/fuzz/signet.cpp b/src/test/fuzz/signet.cpp
new file mode 100644
index 0000000000..4736ae27f5
--- /dev/null
+++ b/src/test/fuzz/signet.cpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <chainparams.h>
+#include <consensus/validation.h>
+#include <primitives/block.h>
+#include <signet.h>
+#include <streams.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/util.h>
+
+#include <cstdint>
+#include <optional>
+#include <vector>
+
+void initialize()
+{
+    InitializeFuzzingContext(CBaseChainParams::SIGNET);
+}
+
+void test_one_input(const std::vector<uint8_t>& buffer)
+{
+    FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    const std::optional<CBlock> block = ConsumeDeserializable<CBlock>(fuzzed_data_provider);
+    if (!block) {
+        return;
+    }
+    (void)CheckSignetBlockSolution(*block, Params().GetConsensus());
+    if (GetWitnessCommitmentIndex(*block) != NO_WITNESS_COMMITMENT) {
+        (void)SignetTxs(*block, ConsumeScript(fuzzed_data_provider));
+    }
+}