highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-17 12:21:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #21185: fuzz: Remove expensive and redundant muhash from crypto fuzz target

Browse Source 
ffff84a9cb659562b3f560d3a489d4a62c71f793 fuzz: Remove expensive and redundant muhash from crypto fuzz target (MarcoFalke)

Pull request description:

  Remove because it is redundant with `src/test/fuzz/muhash.cpp` and incredibly expensive

ACKs for top commit:
  practicalswift:
    Tested ACK ffff84a9cb659562b3f560d3a489d4a62c71f793

Tree-SHA512: c91ea2406db857127c789b9cdeb714a719d88b54132e9cef74fffd229532d874b6c043353793ec687504b5784afc74995f8982243d41f976b63d57454a5ed339
This commit is contained in:
MarcoFalke 2021-02-16 07:54:21 +01:00
commit b55dc3ad84
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/fuzz/crypto.cpp
View File

@ -4,7 +4,6 @@
#include <crypto/hmac_sha256.h> #include <crypto/hmac_sha256.h>
#include <crypto/hmac_sha512.h> #include <crypto/hmac_sha512.h>
#include <crypto/muhash.h>
#include <crypto/ripemd160.h> #include <crypto/ripemd160.h>
#include <crypto/sha1.h> #include <crypto/sha1.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
@ -36,7 +35,6 @@ FUZZ_TARGET(crypto)
CSHA512 sha512; CSHA512 sha512;
SHA3_256 sha3; SHA3_256 sha3;
CSipHasher sip_hasher{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>()}; CSipHasher sip_hasher{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
MuHash3072 muhash;
while (fuzzed_data_provider.ConsumeBool()) { while (fuzzed_data_provider.ConsumeBool()) {
CallOneOf( CallOneOf(
@ -63,12 +61,6 @@ FUZZ_TARGET(crypto)
(void)Hash(data); (void)Hash(data);
(void)Hash160(data); (void)Hash160(data);
(void)sha512.Size(); (void)sha512.Size();
if (fuzzed_data_provider.ConsumeBool()) {
muhash *= MuHash3072(data);
} else {
muhash /= MuHash3072(data);
}
}, },
[&] { [&] {
(void)hash160.Reset(); (void)hash160.Reset();
@ -78,7 +70,6 @@ FUZZ_TARGET(crypto)
(void)sha256.Reset(); (void)sha256.Reset();
(void)sha3.Reset(); (void)sha3.Reset();
(void)sha512.Reset(); (void)sha512.Reset();
muhash = MuHash3072();
}, },
[&] { [&] {
CallOneOf( CallOneOf(
@ -122,10 +113,6 @@ FUZZ_TARGET(crypto)
[&] { [&] {
data.resize(SHA3_256::OUTPUT_SIZE); data.resize(SHA3_256::OUTPUT_SIZE);
sha3.Finalize(data); sha3.Finalize(data);
},
[&] {
uint256 out;
muhash.Finalize(out);
}); });
}); });
} }

10
src/test/fuzz/muhash.cpp
View File

@ -41,6 +41,11 @@ FUZZ_TARGET(muhash)
muhash.Finalize(out2); muhash.Finalize(out2);
assert(out == out2); assert(out == out2);
MuHash3072 muhash3;
muhash3 *= muhash;
uint256 out3;
muhash3.Finalize(out3);
assert(out == out3);
// Test that removing all added elements brings the object back to it's initial state // Test that removing all added elements brings the object back to it's initial state
muhash /= muhash; muhash /= muhash;
@ -50,4 +55,9 @@ FUZZ_TARGET(muhash)
muhash2.Finalize(out2); muhash2.Finalize(out2);
assert(out == out2); assert(out == out2);
muhash3.Remove(data);
muhash3.Remove(data2);
muhash3.Finalize(out3);
assert(out == out3);
} }