From f7e0a8cc38afd91a9a176781daa05fc499d50589 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Fri, 25 Mar 2016 12:46:34 +0100 Subject: [PATCH] QUIC: Add new tag found with version Q30 * CSCT: Signed cert timestamp (RFC6962) of leaf cert Change-Id: I487090830ea8fa1d7597fbd7eef9e801f5e1fb65 Reviewed-on: https://code.wireshark.org/review/14626 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-quic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index 485269a3df..cfb1088319 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -138,6 +138,7 @@ static int hf_quic_tag_sfcw = -1; static int hf_quic_tag_cetv = -1; static int hf_quic_tag_xlct = -1; static int hf_quic_tag_nonp = -1; +static int hf_quic_tag_csct = -1; static int hf_quic_tag_unknown = -1; static int hf_quic_padding = -1; @@ -332,6 +333,7 @@ static const value_string message_tag_vals[] = { #define TAG_CETV 0x43455456 #define TAG_XLCT 0x584C4354 #define TAG_NONP 0x4E4F4E50 +#define TAG_CSCT 0x43534354 static const value_string tag_vals[] = { { TAG_PAD, "Padding" }, @@ -366,6 +368,7 @@ static const value_string tag_vals[] = { { TAG_CETV, "Client encrypted tag-value" }, { TAG_XLCT, "Expected leaf certificate" }, { TAG_NONP, "Client Proof Nonce" }, + { TAG_CSCT, "Signed cert timestamp (RFC6962) of leaf cert" }, { 0, NULL } }; @@ -1186,6 +1189,11 @@ dissect_quic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree, guint tag_offset += 32; tag_len -= 32; break; + case TAG_CSCT: + proto_tree_add_item(tag_tree, hf_quic_tag_csct, tvb, tag_offset_start + tag_offset, tag_len, ENC_NA); + tag_offset += tag_len; + tag_len -= tag_len; + break; default: proto_tree_add_item(tag_tree, hf_quic_tag_unknown, tvb, tag_offset_start + tag_offset, tag_len, ENC_NA); expert_add_info_format(pinfo, ti_tag, &ei_quic_tag_undecoded, @@ -2099,6 +2107,11 @@ proto_register_quic(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_quic_tag_csct, + { "Signed cert timestamp", "quic.tag.csct", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, { &hf_quic_tag_unknown, { "Unknown tag", "quic.tag.unknown", FT_BYTES, BASE_NONE, NULL, 0x0,