diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-08-22 11:01:59 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-09-16 22:31:43 +0000 |
| commit | d32b116d408bfc64f74d7a98ad518e7cd0d4d688 (patch) | |
| tree | aa659a9c89142e7fa431a3f5c1e1be4f3251c490 /epan/dissectors/packet-ssl-utils.c | |
| parent | 7319887c3169adba91d0f3fd1b5201354e246979 (diff) | |
| download | wireshark-d32b116d408bfc64f74d7a98ad518e7cd0d4d688.tar.gz | |
TLS(1.3): Add (experimental) extension 'Draft version TLS 1.3'
Coming from https://github.com/tlswg/tls13-spec/wiki/Implementations#version-negotiation
Bug: 12779
Change-Id: Ieca74eac737b5ba6c101b719e2e5e3aecf931279
Reviewed-on: https://code.wireshark.org/review/17226
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index c886233745..93fe413ead 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1152,6 +1152,7 @@ const value_string tls_hello_extension_types[] = { { SSL_HND_HELLO_EXT_SESSION_TICKET, "SessionTicket TLS" }, /* RFC 4507 */ { SSL_HND_HELLO_EXT_NPN, "next_protocol_negotiation"}, /* http://technotes.googlecode.com/git/nextprotoneg.html */ { SSL_HND_HELLO_EXT_RENEG_INFO, "renegotiation_info" }, /* RFC 5746 */ + { SSL_HND_HELLO_EXT_DRAFT_VERSION_TLS13, "Draft version of TLS 1.3" }, /* for experimentation only https://www.ietf.org/mail-archive/web/tls/current/msg20853.html */ /* http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 https://twitter.com/ericlaw/status/274237352531083264 */ { SSL_HND_HELLO_EXT_CHANNEL_ID_OLD, "channel_id_old" }, @@ -6558,6 +6559,11 @@ ssl_dissect_hnd_hello_ext(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *t case SSL_HND_HELLO_EXT_RENEG_INFO: offset = ssl_dissect_hnd_hello_ext_reneg_info(hf, tvb, ext_tree, offset, ext_len); break; + case SSL_HND_HELLO_EXT_DRAFT_VERSION_TLS13: + proto_tree_add_item(ext_tree, hf->hf.hs_ext_draft_version_tls13, + tvb, offset, 2, ENC_BIG_ENDIAN); + offset += ext_len; + break; case SSL_HND_HELLO_EXT_SERVER_NAME: offset = ssl_dissect_hnd_hello_ext_server_name(hf, tvb, ext_tree, offset, ext_len); break; |