Skip to content

Commit 83c8657

Browse files
committed
fuzz: Provide correct MAC tag to assist v2 transport fuzzing
before commit: 121218 REDUCE cov: 1889 ft: 2574 corp: 36/2305b lim: 877 exec/s: 939 rss: 442Mb L: 345/345 after commit: 119632 REDUCE cov: 2692 ft: 3657 corp: 57/8816b lim: 1021 exec/s: 61 rss: 478Mb L: 1000/1013
1 parent c0c1ee9 commit 83c8657

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

src/test/fuzz/p2p_v2_transport_serialization.cpp

+30-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <compat/endian.h>
66
#include <crypto/chacha_poly_aead.h>
7+
#include <crypto/poly1305.h>
78
#include <key.h>
89
#include <net.h>
910
#include <netmessagemaker.h>
@@ -14,21 +15,35 @@
1415

1516
FUZZ_TARGET(p2p_v2_transport_serialization)
1617
{
17-
const CPrivKey k1(32, 0);
18-
const CPrivKey k2(32, 0);
18+
const CPrivKey k1(CHACHA20_POLY1305_AEAD_KEY_LEN, 0);
19+
const CPrivKey k2(CHACHA20_POLY1305_AEAD_KEY_LEN, 0);
1920

2021
// Construct deserializer, with a dummy NodeId
2122
V2TransportDeserializer deserializer{(NodeId)0, k1, k2};
2223
V2TransportSerializer serializer{k1, k2};
2324
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
2425

2526
bool length_assist = fuzzed_data_provider.ConsumeBool();
27+
28+
// There is no sense is providing a mac assist if the length is incorrect.
29+
bool mac_assist = length_assist && fuzzed_data_provider.ConsumeBool();
2630
auto payload_bytes = fuzzed_data_provider.ConsumeRemainingBytes<uint8_t>();
2731

28-
if (length_assist && payload_bytes.size() >= CHACHA20_POLY1305_AEAD_AAD_LEN + CHACHA20_POLY1305_AEAD_TAG_LEN) {
29-
uint32_t packet_length = payload_bytes.size() - CHACHA20_POLY1305_AEAD_AAD_LEN - CHACHA20_POLY1305_AEAD_TAG_LEN;
30-
packet_length = htole32(packet_length);
31-
memcpy(payload_bytes.data(), &packet_length, 3);
32+
if (payload_bytes.size() >= CHACHA20_POLY1305_AEAD_AAD_LEN + CHACHA20_POLY1305_AEAD_TAG_LEN) {
33+
if (length_assist) {
34+
uint32_t packet_length = payload_bytes.size() - CHACHA20_POLY1305_AEAD_AAD_LEN - CHACHA20_POLY1305_AEAD_TAG_LEN;
35+
packet_length = htole32(packet_length);
36+
memcpy(payload_bytes.data(), &packet_length, 3);
37+
}
38+
39+
if (mac_assist) {
40+
unsigned char pseudorandom_bytes[CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_KEYLEN];
41+
memset(pseudorandom_bytes, 0, sizeof(pseudorandom_bytes));
42+
ChaCha20Forward4064 chacha{k1.data(), CHACHA20_POLY1305_AEAD_KEY_LEN};
43+
chacha.Crypt(pseudorandom_bytes, pseudorandom_bytes, CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_KEYLEN);
44+
45+
poly1305_auth(payload_bytes.data() + (payload_bytes.size() - POLY1305_TAGLEN), payload_bytes.data(), (payload_bytes.size() - POLY1305_TAGLEN), pseudorandom_bytes + CHACHA20_POLY1305_AEAD_AAD_LEN);
46+
}
3247
}
3348

3449
Span<const uint8_t> msg_bytes{payload_bytes};
@@ -42,6 +57,15 @@ FUZZ_TARGET(p2p_v2_transport_serialization)
4257
bool reject_message{true};
4358
bool disconnect{true};
4459
CNetMessage result{deserializer.GetMessage(m_time, reject_message, disconnect)};
60+
61+
if (mac_assist) {
62+
assert(!disconnect);
63+
}
64+
65+
if (length_assist && mac_assist) {
66+
assert(!reject_message);
67+
}
68+
4569
if (!reject_message) {
4670
assert(result.m_command.size() <= CMessageHeader::COMMAND_SIZE);
4771
assert(result.m_raw_message_size <= buffer.size());

0 commit comments

Comments
 (0)