URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e7c9dd0687823bd1cc275f969536760fd8064c53
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark
Commits:
e7c9dd0 by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: fix duplicate dissections with multiple PDUs in a stream
The previous fix was incomplete and would still result in duplicate PDU
dissections starting from the second reassembled PDU in a TLS stream.
The reason for that is that "nxtseq" is the absolute offset within a TLS
application data stream where the current segment ends while the
reassembled PDU length ("ipfd_head->datalen") is likely smaller than
"nxtseq".
Note: this fix assumes that the there won't be another (partial) PDU
following a reassembled PDU in a single packet (that is, the condition
"nxtseq > msp->nxtpdu" is assumed not to occur). If that is not the
case, a different issue occurs which needs another fix (more work):
"Reassembly error, protocol SSL: Frame already added in first pass".
Change-Id: Ib546f6e85baa0670c2c6a31ee8de87422004ecf3
Bug: 14596
Fixes: v2.1.0rc0-1521-gcefd1d4910 ("ssl: avoid duplicate PDU dissections")
Reviewed-on: https://code.wireshark.org/review/26935
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit f9ed58759fca787b6d3b4c2a988d714014b5ddc6)
Reviewed-on: https://code.wireshark.org/review/26971
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 5a274e5 Qt: Do not show MaxMind DB path when not enabled
adds e7c9dd0 ssl: fix duplicate dissections with multiple PDUs in a stream
Summary of changes:
epan/dissectors/packet-ssl.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)