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

EAP: show reassembled TLS fragments only on the final frame 

This avoids multiple dissections on the second pass which could
potentially break decryption and TLS handshake reassembly.

Bug: 15982
Change-Id: I9f83fbd51c732140b831f7d5f29f46e9694e405c
Reviewed-on: https://code.wireshark.org/review/34237
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2019-08-11 17:36:30 +01:00 committed by Anders Broman
parent 4ce6f6040d
commit 7bd3edccf1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-eap.c
View File

@ -1169,8 +1169,8 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
size,
more_fragments, 0);
if (fd_head != NULL) /* Reassembled */
{
if (fd_head != NULL && fd_head->reassembled_in == pinfo->num) {
/* Reassembled */
proto_item *frag_tree_item;
next_tvb = tvb_new_chain(tvb, fd_head->tvb_data);