Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

QUIC: Switch initial_destination_conn_id to optional

Browse source
This commit is contained in:
Arne Welzel 2025-05-04 17:52:47 +02:00
parent fe89a521d1
commit fd29b48803
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/analyzer/protocol/quic/QUIC.spicy
View file

@ -31,7 +31,7 @@ function can_decrypt(long_header: LongHeaderPacket, context: ConnectionIDInfo, c
return False; return False;
# Can only decrypt the responder if we've seen the initial destination conn id. # Can only decrypt the responder if we've seen the initial destination conn id.
if ( ! crypto.is_orig && |context.initial_destination_conn_id| == 0 ) if ( ! crypto.is_orig && ! context.initial_destination_conn_id )
return False; return False;
# Only attempt decryption if we haven't flushed some SSL data yet. # Only attempt decryption if we haven't flushed some SSL data yet.
@ -113,7 +113,7 @@ type ConnectionIDInfo = struct {
# will make life miserable. # will make life miserable.
# #
# https://quicwg.org/base-drafts/rfc9001.html#appendix-A # https://quicwg.org/base-drafts/rfc9001.html#appendix-A
initial_destination_conn_id: bytes; initial_destination_conn_id: optional<bytes>;
# Track crypto state. # Track crypto state.
client_crypto: CryptoSinkUnit&; client_crypto: CryptoSinkUnit&;
@ -548,7 +548,7 @@ type Packet = unit(from_client: bool, context: ConnectionIDInfo&) {
self.crypto_sink = Null; self.crypto_sink = Null;
# Reset crypto state! # Reset crypto state!
context.initial_destination_conn_id = b""; context.initial_destination_conn_id = Null;
} }
} }
}; };
@ -570,7 +570,7 @@ type Packet = unit(from_client: bool, context: ConnectionIDInfo&) {
# This is the first INITIAL packet we attempt to decrypt and it is # This is the first INITIAL packet we attempt to decrypt and it is
# coming from the client. Use its destination connection ID for # coming from the client. Use its destination connection ID for
# decryption purposes. # decryption purposes.
if ( |context.initial_destination_conn_id| == 0 ) { if ( ! context.initial_destination_conn_id ) {
context.initial_destination_conn_id = self.long_header.dest_conn_id; context.initial_destination_conn_id = self.long_header.dest_conn_id;
} }
@ -579,7 +579,7 @@ type Packet = unit(from_client: bool, context: ConnectionIDInfo&) {
self.decrypted_data = decrypt_crypto_payload( self.decrypted_data = decrypt_crypto_payload(
self.long_header.version, self.long_header.version,
self.packet_data, self.packet_data,
context.initial_destination_conn_id, *context.initial_destination_conn_id,
self.long_header.encrypted_offset, self.long_header.encrypted_offset,
self.long_header.payload_length, self.long_header.payload_length,
from_client from_client
@ -592,7 +592,7 @@ type Packet = unit(from_client: bool, context: ConnectionIDInfo&) {
self.decrypted_data = decrypt_crypto_payload( self.decrypted_data = decrypt_crypto_payload(
self.long_header.version, self.long_header.version,
self.packet_data, self.packet_data,
context.initial_destination_conn_id, *context.initial_destination_conn_id,
self.long_header.encrypted_offset, self.long_header.encrypted_offset,
self.long_header.payload_length, self.long_header.payload_length,
from_client from_client