URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cefd1d4910a31f71ddab6cc4b4c5d5a8f7ffe91e
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
cefd1d4 by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: avoid duplicate PDU dissections
When a single frame contains multiple SSL segments and the higher-level
PDU requests desegmentation, then each segment will trigger a
dissection, resulting in a new tree for each.
This seems to happen because the SSL dissector tries to complete a
reassembly whenever a segment is found in the last frame. When doing the
second pass, the fully reassembled segment is known and as a result the
payload dissector is called for all SSL segments in a single frame.
Fix this by checking whether the end of the segment covers the whole
reassembled data. Another workaround is added to avoid "[SSL segment of
a reassembled PDU]" in the Info column when desegmentation finishes.
Also fix the SSL version in the Protocol column when a segment is part
of a reassembled PDU.
Bug: 11079
Change-Id: I9ae0c8ae5c56ed0dd7b071dec8bcc87e838a068d
Reviewed-on: https://code.wireshark.org/review/12307
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 4f94f25 DICOM: fix addition of item subtrees
adds cefd1d4 ssl: avoid duplicate PDU dissections
Summary of changes:
epan/dissectors/packet-ssl.c | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)