From b83e9f20e7f01807ad97d62d9a076dba9d5f4b45 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 9 Mar 2022 22:37:56 +0100 Subject: [PATCH] QUIC: fix dissection of draft-34 (#1484) QUIC-34 is probably not used in production, but fixing it is trivial and it doesn't add any noise to the already complex QUIC code. --- src/lib/protocols/quic.c | 9 +++++---- tests/pcap/quic-34.pcap | Bin 0 -> 4924 bytes tests/result/quic-34.pcap.out | 13 +++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 tests/pcap/quic-34.pcap create mode 100644 tests/result/quic-34.pcap.out diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c index f107f87fb..631f47d42 100644 --- a/src/lib/protocols/quic.c +++ b/src/lib/protocols/quic.c @@ -97,9 +97,10 @@ static uint8_t get_u8_quic_ver(uint32_t version) /* IETF Draft versions */ if((version >> 8) == 0xff0000) return (uint8_t)version; - /* QUIC (final?) constants for v1 are defined in draft-33 */ + /* QUIC (final?) constants for v1 are defined in draft-33, but latest + draft version is -34 */ if (version == 0x00000001) { - return 33; + return 34; } if (version == V_MVFST_22) @@ -195,7 +196,7 @@ int is_version_with_v1_labels(uint32_t version) if(((version & 0xFFFFFF00) == 0x51303500) /* Q05X */ || ((version & 0xFFFFFF00) == 0x54303500)) /* T05X */ return 1; - return is_quic_ver_less_than(version, 33); + return is_quic_ver_less_than(version, 34); } int quic_len(const uint8_t *buf, uint64_t *value) @@ -912,7 +913,7 @@ static int quic_derive_initial_secrets(uint32_t version, err = hkdf_extract(GCRY_MD_SHA256, handshake_salt_draft_29, sizeof(handshake_salt_draft_29), cid, cid_len, secret); - } else if (is_quic_ver_less_than(version, 33)) { + } else if (is_quic_ver_less_than(version, 34)) { err = hkdf_extract(GCRY_MD_SHA256, handshake_salt_v1, sizeof(handshake_salt_v1), cid, cid_len, secret); diff --git a/tests/pcap/quic-34.pcap b/tests/pcap/quic-34.pcap new file mode 100644 index 0000000000000000000000000000000000000000..42fab203b5188447658691c638d6d0425dc5dd19 GIT binary patch literal 4924 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 192.168.56.198:4443 [proto: 188/QUIC][Encrypted][Confidence: DPI][cat: Web/5][1 pkts/1294 bytes <-> 3 pkts/3542 bytes][Goodput ratio: 97/96][0.00 sec][ALPN: h3-34;hq-34;h3-33;hq-33;h3-32;hq-32;h3-31;hq-31;h3-29;hq-29;h3-30;hq-30;h3-28;hq-28;h3-27;hq-27;h3;hq-interop][TLS Supported Versions: TLSv1.3;TLSv1.3 (draft);TLSv1.3 (draft);TLSv1.3 (draft)][Risk: ** Known Protocol on Non Standard Port **** Missing SNI TLS Extension **][Risk Score: 100][TLSv1.3][JA3C: 0299b052ace53a14c3a04aceb5efd247][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,25,0,0]