URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6f8a25cc805ead360c0d615d7e2e4127f625d830
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
6f8a25c by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: fix decryption when session ticket is not used
Do not use the client-supplied session ticket for decryption when the
session is not resumed as the cached key (associated with that ticket)
is invalid for this new session. SSL Session IDs are unaffected by this
issue as only the server-issued Session ID is considered.
This fixes decryption of a SSL capture which uses the keylog file for
decryption, but where the session tickets are invalid because the server
was restarted.
Additionally, the session and session tickets stores are split to avoid
exporting session tickets via File -> Export SSL Session keys. Session
tickets should only be used internally, the CLIENT_RANDOM identifier is
shorter and is the preferred method to link secrets.
Change-Id: If96d7a4e89389825478e67e9a65401ce0607aa66
Reviewed-on: https://code.wireshark.org/review/13994
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
(cherry picked from commit f4580ac9edc8b53514ad6dc18130e1cd55df509f)
Reviewed-on: https://code.wireshark.org/review/14000
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 6e0d6c0 Correctly set the "short GI" flag in the generic radio information structure.
adds 6f8a25c ssl: fix decryption when session ticket is not used
Summary of changes:
epan/dissectors/packet-ssl-utils.c | 16 ++++++++++++----
epan/dissectors/packet-ssl-utils.h | 6 +++---
2 files changed, 15 insertions(+), 7 deletions(-)