phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#32118: fuzz: wallet: fix crypter target

Browse source 
28dc118001 fuzz: wallet: fix crypter target (brunoerg)

Pull request description:

  The crypter target has an issue, it's calling `DecryptKey` with a random secret and a random public key that will unlikely be related to the key used to encrypt, so it won't have any effect. This PR changes fixes it and also removes the `DecryptSecret` call since this function is already (and only) called within `DecryptKey`.

ACKs for top commit:
  maflcko:
    lgtm ACK 28dc118001 🥊

Tree-SHA512: e96b7d33879bf06eeec0726e74e8e0d7020997659bf97dfca5d7c1a7ba65c4d93c78e666b97eebde110564cef2eefc7209d3e3586e4658145827b14d1b01dfc9
This commit is contained in:
merge-script 2025-04-02 13:17:49 +08:00
commit 40de19164c
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/wallet/test/fuzz/crypter.cpp
View file

@ -20,6 +20,7 @@ void initialize_crypter()
FUZZ_TARGET(crypter, .init = initialize_crypter)
{
SeedRandomStateForTest(SeedRand::ZEROS);
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
bool good_data{true};
@ -42,6 +43,11 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
/*derivation_method=*/derivation_method);
}
CKey random_ckey;
random_ckey.Set(random_key.begin(), random_key.end(), /*fCompressedIn=*/fuzzed_data_provider.ConsumeBool());
if (!random_ckey.IsValid()) return;
CPubKey pubkey{random_ckey.GetPubKey()};
LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
{
CallOneOf(
@ -60,26 +66,21 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
(void)crypt.Decrypt(cipher_text_ed, plain_text_ed);
},
[&] {
const CKeyingMaterial master_key(random_key.begin(), random_key.end());
const uint256 iv = ConsumeUInt256(fuzzed_data_provider);
(void)EncryptSecret(master_key, plain_text_ed, iv, cipher_text_ed);
const CKeyingMaterial master_key(random_key.begin(), random_key.end());;
(void)EncryptSecret(master_key, plain_text_ed, pubkey.GetHash(), cipher_text_ed);
},
[&] {
const CKeyingMaterial master_key(random_key.begin(), random_key.end());
const uint256 iv = ConsumeUInt256(fuzzed_data_provider);
(void)DecryptSecret(master_key, cipher_text_ed, iv, plain_text_ed);
},
[&] {
std::optional<CPubKey> random_pub_key = ConsumeDeserializable<CPubKey>(fuzzed_data_provider);
std::optional<CPubKey> random_pub_key{ConsumeDeserializable<CPubKey>(fuzzed_data_provider)};
if (!random_pub_key) {
good_data = false;
return;
}
const CPubKey pub_key = *random_pub_key;
pubkey = *random_pub_key;
},
[&] {
const CKeyingMaterial master_key(random_key.begin(), random_key.end());
const std::vector<unsigned char> crypted_secret = ConsumeRandomLengthByteVector(fuzzed_data_provider, 64);
CKey key;
(void)DecryptKey(master_key, crypted_secret, pub_key, key);
(void)DecryptKey(master_key, cipher_text_ed, pubkey, key);
});
}
}