From 3d6b46670074763277fa326007f87489c8290a9f Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 17 Jun 2020 08:04:52 +0200 Subject: [PATCH] QUIC: Add support of mvfst draft-27 (0xfaceb002) mvfst 0xfaceb002 is compatible with draft-27, see https://github.com/facebookincubator/mvfst/commit/d1a3652a4c4a22dc20f235711753feb83b5130ad This is necessary to support 0xfaceb002 decryption since draft-29 changed the salt again. Bug: 16378 Change-Id: Ib186effdb5e85bc6d48fffbfbb1f3498bf89860d Reviewed-on: https://code.wireshark.org/review/37493 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte --- epan/dissectors/packet-quic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index d528f66134..d04a2e0fcb 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -335,6 +335,10 @@ static inline guint8 quic_draft_version(guint32 version) { if (version == 0xfaceb001) { return 22; } + /* Facebook mvfst, based on draft -27. */ + if (version == 0xfaceb002) { + return 27; + } return 0; } @@ -347,6 +351,7 @@ const value_string quic_version_vals[] = { { 0x00000000, "Version Negotiation" }, { 0x51303434, "Google Q044" }, { 0xfaceb001, "Facebook mvfst (draft-22)" }, + { 0xfaceb002, "Facebook mvfst (draft-27)" }, { 0xff000004, "draft-04" }, { 0xff000005, "draft-05" }, { 0xff000006, "draft-06" },