diff options
| author | Adam Schwalm <adam.schwalm@dynetics.com> | 2016-03-16 19:12:14 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 16:57:41 +0000 |
| commit | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (patch) | |
| tree | a9fd45f5a707a2e12cb5845dde752cca58c76b70 | |
| parent | b5bd3dfe6ae157580924efcaf707e989eae4de35 (diff) | |
Fix incorrect table being used to store Session Tickets
A regression was introduced at f4580ac9edc8b5351 where an additional
hash table was introduced to store TLS Session Tickets separately
from Session IDs. However, the New Session Ticket dissector was
still storing the the Session Ticket in the ID table, causing lookups
to fail.
Change-Id: Iff49202f50afb8cb6ef62c774f6155682b8e48a6
Reviewed-on: https://code.wireshark.org/review/14499
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index e6ae754201..34361d2458 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1289,7 +1289,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, * master key with this Session Ticket */ ssl_dissect_hnd_new_ses_ticket(&dissect_dtls_hf, sub_tvb, ssl_hand_tree, 0, ssl, - dtls_master_key_map.session); + dtls_master_key_map.tickets); break; case SSL_HND_CERTIFICATE: diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 6d94d2a665..2645c50063 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2047,7 +2047,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, * master key with this Session Ticket */ ssl_dissect_hnd_new_ses_ticket(&dissect_ssl3_hf, tvb, ssl_hand_tree, offset, ssl, - ssl_master_key_map.session); + ssl_master_key_map.tickets); break; case SSL_HND_CERTIFICATE: |