osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

QUIC (TLS): Remove support of draft < 08 

negotiated_version is encrypted_extensions now

No longer supported by QUIC dissector ( >= draft-08)

Bug:13881
Change-Id: Id1fca0b5b6ce59c854b50d7091cce1079213db68
Reviewed-on: https://code.wireshark.org/review/26043
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2018-02-23 10:01:11 +01:00 committed by Anders Broman
parent 794b1e7569
commit 38425dd78d
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/dissectors/packet-ssl-utils.c
View File

@ -6445,7 +6445,7 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
proto_tree *tree, guint32 offset, guint32 offset_end,
guint8 hnd_type, SslDecryptSession *ssl _U_)
{
guint32 quic_length, parameter_length, supported_versions_length, next_offset, version;
guint32 quic_length, parameter_length, supported_versions_length, next_offset;
/* https://tools.ietf.org/html/draft-ietf-quic-transport-08#section-7.4
* uint32 QuicVersion;
@ -6481,23 +6481,14 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
*/
switch (hnd_type) {
case SSL_HND_CLIENT_HELLO:
version = tvb_get_ntohl(tvb, offset);
if(version <= 0xff000007){ /* No longer negotiated_version on Client Hello with >= draft-07 */
proto_tree_add_item(tree, hf->hf.hs_ext_quictp_negotiated_version,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
}
proto_tree_add_item(tree, hf->hf.hs_ext_quictp_initial_version,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
break;
case SSL_HND_ENCRYPTED_EXTENSIONS:
version = tvb_get_ntohl(tvb, offset);
if(version > 0xff000007){ /* Now negotiated_version on Encrypted Extensions (>= draft-08) */
proto_tree_add_item(tree, hf->hf.hs_ext_quictp_negotiated_version,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
}
proto_tree_add_item(tree, hf->hf.hs_ext_quictp_negotiated_version,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* QuicVersion supported_versions<4..2^8-4>;*/
if (!ssl_add_vector(hf, tvb, pinfo, tree, offset, offset_end, &supported_versions_length,
hf->hf.hs_ext_quictp_supported_versions_len, 4, G_MAXUINT8-3)) {