fuzz: Add fuzz test for v2 transport {de}serialization

src/Makefile.test.include

@@ -291,6 +291,7 @@ test_fuzz_fuzz_SOURCES = \
  test/fuzz/netbase_dns_lookup.cpp \
  test/fuzz/node_eviction.cpp \
  test/fuzz/p2p_transport_serialization.cpp \
+ test/fuzz/p2p_v2_transport_serialization.cpp \
  test/fuzz/parse_hd_keypath.cpp \
  test/fuzz/parse_numbers.cpp \
  test/fuzz/parse_script.cpp \

src/crypto/rfc8439.cpp

@@ -4,7 +4,6 @@
 
 #include <crypto/rfc8439.h>
 
-#include <crypto/chacha20.h>
 #include <crypto/common.h>
 
 #include <cstring>

src/crypto/rfc8439.h

@@ -5,6 +5,7 @@
 #ifndef BITCOIN_CRYPTO_RFC8439_H
 #define BITCOIN_CRYPTO_RFC8439_H
 
+#include <crypto/chacha20.h>
 #include <crypto/poly1305.h>
 #include <span.h>
 
@@ -19,4 +20,11 @@ void RFC8439Encrypt(const Span<const std::byte> aad, const Span<const std::byte>
 
 // returns false if authentication fails
 bool RFC8439Decrypt(const Span<const std::byte> aad, const Span<const std::byte> key, const std::array<std::byte, 12>& nonce, const Span<const std::byte> input, Span<std::byte> plaintext);
+
+void ComputeRFC8439Tag(const std::array<std::byte, POLY1305_KEYLEN>& polykey,
+                       Span<const std::byte> aad, Span<const std::byte> ciphertext,
+                       Span<std::byte> tag_out);
+
+std::array<std::byte, POLY1305_KEYLEN> GetPoly1305Key(ChaCha20& c20);
+
 #endif // BITCOIN_CRYPTO_RFC8439_H

src/test/fuzz/p2p_v2_transport_serialization.cpp

@@ -0,0 +1,110 @@
+// Copyright (c) 2019-2021 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 <compat/endian.h>
+#include <crypto/bip324_suite.h>
+#include <crypto/rfc8439.h>
+#include <key.h>
+#include <net.h>
+#include <netmessagemaker.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+
+#include <array>
+#include <cassert>
+#include <cstddef>
+
+FUZZ_TARGET(p2p_v2_transport_serialization)
+{
+    FuzzedDataProvider fdp{buffer.data(), buffer.size()};
+
+    // Picking constant keys seems to give us higher fuzz test coverage
+    // The BIP324 Cipher suite is separately fuzzed, so we don't have to
+    // pick fuzzed keys here.
+    BIP324Key key_L, key_P;
+    memset(key_L.data(), 1, BIP324_KEY_LEN);
+    memset(key_P.data(), 2, BIP324_KEY_LEN);
+
+    // Construct deserializer, with a dummy NodeId
+    V2TransportDeserializer deserializer{(NodeId)0, key_L, key_P};
+    V2TransportSerializer serializer{key_L, key_P};
+    FSChaCha20 fsc20{key_L, REKEY_INTERVAL};
+    ChaCha20 c20{reinterpret_cast<unsigned char*>(key_P.data())};
+
+    std::array<std::byte, 12> nonce;
+    memset(nonce.data(), 0, 12);
+    c20.SetRFC8439Nonce(nonce);
+
+    bool length_assist = fdp.ConsumeBool();
+
+    // There is no sense in providing a mac assist if the length is incorrect.
+    bool mac_assist = length_assist && fdp.ConsumeBool();
+    auto encrypted_packet = fdp.ConsumeRemainingBytes<uint8_t>();
+    bool is_decoy_packet{false};
+
+    if (encrypted_packet.size() >= V2_MIN_PACKET_LENGTH) {
+        if (length_assist) {
+            uint32_t contents_len = encrypted_packet.size() - BIP324_LENGTH_FIELD_LEN - BIP324_HEADER_LEN - RFC8439_EXPANSION;
+            contents_len = htole32(contents_len);
+            fsc20.Crypt({reinterpret_cast<std::byte*>(&contents_len), BIP324_LENGTH_FIELD_LEN},
+                        {reinterpret_cast<std::byte*>(encrypted_packet.data()), BIP324_LENGTH_FIELD_LEN});
+        }
+
+        if (mac_assist) {
+            std::array<std::byte, RFC8439_EXPANSION> tag;
+            ComputeRFC8439Tag(GetPoly1305Key(c20), {},
+                              {reinterpret_cast<std::byte*>(encrypted_packet.data()) + BIP324_LENGTH_FIELD_LEN,
+                               encrypted_packet.size() - BIP324_LENGTH_FIELD_LEN - RFC8439_EXPANSION},
+                              tag);
+            memcpy(encrypted_packet.data() + encrypted_packet.size() - RFC8439_EXPANSION, tag.data(), RFC8439_EXPANSION);
+
+            std::vector<std::byte> dec_header_and_contents(
+                encrypted_packet.size() - BIP324_LENGTH_FIELD_LEN - RFC8439_EXPANSION);
+            RFC8439Decrypt({}, key_P, nonce,
+                           {reinterpret_cast<std::byte*>(encrypted_packet.data() + BIP324_LENGTH_FIELD_LEN),
+                            encrypted_packet.size() - BIP324_LENGTH_FIELD_LEN},
+                           dec_header_and_contents);
+            if (BIP324HeaderFlags((uint8_t)dec_header_and_contents.at(0) & BIP324_IGNORE) != BIP324_NONE) {
+                is_decoy_packet = true;
+            }
+        }
+    }
+
+    Span<const uint8_t> pkt_bytes{encrypted_packet};
+    while (pkt_bytes.size() > 0) {
+        const int handled = deserializer.Read(pkt_bytes);
+        if (handled < 0) {
+            break;
+        }
+        if (deserializer.Complete()) {
+            const std::chrono::microseconds m_time{std::numeric_limits<int64_t>::max()};
+            bool reject_message{true};
+            bool disconnect{true};
+            CNetMessage result{deserializer.GetMessage(m_time, reject_message, disconnect)};
+
+            if (mac_assist) {
+                assert(!disconnect);
+            }
+
+            if (is_decoy_packet) {
+                assert(reject_message);
+            }
+
+            if (!reject_message) {
+                assert(result.m_type.size() <= CMessageHeader::COMMAND_SIZE);
+                assert(result.m_raw_message_size <= buffer.size());
+
+                auto message_type_size = result.m_raw_message_size - V2_MIN_PACKET_LENGTH - result.m_message_size;
+                assert(message_type_size <= 13);
+                assert(message_type_size >= 1);
+                assert(result.m_time == m_time);
+
+                std::vector<unsigned char> header;
+                auto msg = CNetMsgMaker{result.m_recv.GetVersion()}.Make(result.m_type, MakeUCharSpan(result.m_recv));
+                // if decryption succeeds, encryption must succeed
+                assert(serializer.prepareForTransport(msg, header));
+            }
+        }
+    }
+}