Wireshark-commits: [Wireshark-commits] master 10e84a6: ssl: really fix session resumption expert in
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=10e84a612b629341acd9cd20876517e5bab63d37
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
10e84a6 by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: really fix session resumption expert info
In a two-pass dissection with renegotiated sessions, the
is_session_resumed flag is not updated according to the current protocol
flow. Fix this by performing detection of abbreviated handshakes in
all cases, do not limit it to the decryption stage (where ssl != NULL).
Reset the resumption assumption after the first ChangeCipherSpec
(normally from the server side, but explicitly add this in case client
packets somehow arrive earlier in the capture). This should not have a
functional effect on normal TLS captures with Session Tickets.
Bug: 12793
Change-Id: I1eb2a8262b4e359b8c1d3d0a1e004a9e856bec8c
Reviewed-on: https://code.wireshark.org/review/17483
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from c8de455 zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
adds 10e84a6 ssl: really fix session resumption expert info
Summary of changes:
epan/dissectors/packet-dtls.c | 9 +++++++--
epan/dissectors/packet-ssl-utils.c | 10 ++++++----
epan/dissectors/packet-ssl-utils.h | 1 -
epan/dissectors/packet-ssl.c | 9 +++++++--
4 files changed, 20 insertions(+), 9 deletions(-)