From b36382a9ce1bfec94527b41e5bf50e2467787fe3 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 12 Oct 2016 22:30:23 +0200 Subject: [PATCH] TLS(1.3): with draft-16, Server Hello return draft release (0x7fxx) set server_version to TLS 1.3 Change-Id: Id4d3d5d21ae996f447d826e98c0cf60880e7c0ce Reviewed-on: https://code.wireshark.org/review/18171 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- epan/dissectors/packet-ssl-utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 303868e326..b49f606bbc 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -6264,6 +6264,9 @@ ssl_dissect_hnd_srv_hello(ssl_common_dissect_t *hf, tvbuff_t *tvb, /* This version is always better than the guess at the Record Layer */ server_version = tvb_get_ntohs(tvb, offset); + if((server_version & 0xFF00) == 0x7f00) { /* if server_version start with 0x7f, it is (and force) TLS 1.3 */ + server_version = TLSV1DOT3_VERSION; + } ssl_try_set_version(session, ssl, SSL_ID_HANDSHAKE, SSL_HND_SERVER_HELLO, is_dtls, server_version); col_set_str(pinfo->cinfo, COL_PROTOCOL,