diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-02-07 18:05:44 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-02-07 18:48:46 +0000 |
| commit | cecf9f13fe4aa283bba131e53ae2c84a4a68ccfb (patch) | |
| tree | 1958ef9ce4aa7eeed1a78ff83f8f86f8f3695fba /epan/dissectors/packet-ssl.c | |
| parent | f958dd5acecda5a9f38500687718dce3ece26ed4 (diff) | |
| download | wireshark-cecf9f13fe4aa283bba131e53ae2c84a4a68ccfb.tar.gz | |
TLS13: update NewSessionTicket dissection
The new ticket_age_add field resulted in a dissector exception. With
this fixed, the tls13-18-picotls-earlydata.pcap capture can now be fully
decrypted.
Also add validation for the ticket length (using ssl_add_vector).
Change-Id: I167038f682b47b2d1da020a8f241daaf7af22017
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/19992
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl.c')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 7ae36978fb..a0d2789964 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2112,8 +2112,8 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, case SSL_HND_NEWSESSION_TICKET: /* no need to load keylog file here as it only links a previous * master key with this Session Ticket */ - ssl_dissect_hnd_new_ses_ticket(&dissect_ssl3_hf, tvb, - ssl_hand_tree, offset, ssl, + ssl_dissect_hnd_new_ses_ticket(&dissect_ssl3_hf, tvb, pinfo, + ssl_hand_tree, offset, offset + length, session, ssl, ssl_master_key_map.tickets); break; |