Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prevent unneeded copies in QUIC C++ helper code

Browse source
This commit is contained in:
Benjamin Bannier 2025-01-14 13:42:55 +01:00
parent b2222e97a1
commit a14dd511a5
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/analyzer/protocol/quic/decrypt_crypto.cc
View file

@ -25,7 +25,6 @@ refactors as C++ development is not our main profession.
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include <string>
#include <vector> #include <vector>
// OpenSSL imports // OpenSSL imports
@ -366,11 +365,11 @@ public:
0x71, 0x75, 0x69, 0x63, 0x20, 0x68, 0x70, 0x00}; 0x71, 0x75, 0x69, 0x63, 0x20, 0x68, 0x70, 0x00};
std::vector<HkdfCtxParam> hkdf_ctx_params = { std::vector<HkdfCtxParam> hkdf_ctx_params = {
{&hkdf_ctxs.client_in_ctx, CLIENT_INITIAL_INFO}, {&hkdf_ctxs.client_in_ctx, std::move(CLIENT_INITIAL_INFO)},
{&hkdf_ctxs.server_in_ctx, SERVER_INITIAL_INFO}, {&hkdf_ctxs.server_in_ctx, std::move(SERVER_INITIAL_INFO)},
{&hkdf_ctxs.key_info_ctx, KEY_INFO}, {&hkdf_ctxs.key_info_ctx, std::move(KEY_INFO)},
{&hkdf_ctxs.iv_info_ctx, IV_INFO}, {&hkdf_ctxs.iv_info_ctx, std::move(IV_INFO)},
{&hkdf_ctxs.hp_info_ctx, HP_INFO}, {&hkdf_ctxs.hp_info_ctx, std::move(HP_INFO)},
}; };
QuicPacketProtection::Initialize(hkdf_ctx_params); QuicPacketProtection::Initialize(hkdf_ctx_params);
@ -419,11 +418,11 @@ public:
0x75, 0x69, 0x63, 0x76, 0x32, 0x20, 0x68, 0x70, 0x00}; 0x75, 0x69, 0x63, 0x76, 0x32, 0x20, 0x68, 0x70, 0x00};
std::vector<HkdfCtxParam> hkdf_ctx_params = { std::vector<HkdfCtxParam> hkdf_ctx_params = {
{&hkdf_ctxs.client_in_ctx, CLIENT_INITIAL_INFO_V2}, {&hkdf_ctxs.client_in_ctx, std::move(CLIENT_INITIAL_INFO_V2)},
{&hkdf_ctxs.server_in_ctx, SERVER_INITIAL_INFO_V2}, {&hkdf_ctxs.server_in_ctx, std::move(SERVER_INITIAL_INFO_V2)},
{&hkdf_ctxs.key_info_ctx, KEY_INFO_V2}, {&hkdf_ctxs.key_info_ctx, std::move(KEY_INFO_V2)},
{&hkdf_ctxs.iv_info_ctx, IV_INFO_V2}, {&hkdf_ctxs.iv_info_ctx, std::move(IV_INFO_V2)},
{&hkdf_ctxs.hp_info_ctx, HP_INFO_V2}, {&hkdf_ctxs.hp_info_ctx, std::move(HP_INFO_V2)},
}; };
QuicPacketProtection::Initialize(hkdf_ctx_params); QuicPacketProtection::Initialize(hkdf_ctx_params);
@ -483,7 +482,7 @@ hilti::rt::Bytes QUIC_decrypt_crypto_payload(const hilti::rt::integer::safe<uint
DecryptionInformation decryptInfo = remove_header_protection(hp, encrypted_offset, all_data); DecryptionInformation decryptInfo = remove_header_protection(hp, encrypted_offset, all_data);
// Calculate the correct nonce for the decryption // Calculate the correct nonce for the decryption
decryptInfo.nonce = calculate_nonce(iv, decryptInfo.packet_number); decryptInfo.nonce = calculate_nonce(std::move(iv), decryptInfo.packet_number);
return decrypt(key, all_data, payload_length, decryptInfo); return decrypt(key, all_data, payload_length, decryptInfo);
} }