Wireshark-commits: [Wireshark-commits] master a69a63f: ssl: fix SSL keylog file live-capture use ca
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a69a63f5d1563d504d51400cd574db6812374150
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
a69a63f by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: fix SSL keylog file live-capture use case
Patch "ssl,dtls: simplify keyfile handling" did not account for the use
case where packets are captured and decrypted on the fly using
SSLKEYLOGFILE.
This patch restores that functionality by reading additional lines from
the keylog file when needed (to preserve the benefit of not having to
read the full file) and by watching the open file for deletions.
"Deletion" is detected by comparing st_dev and st_ino. Since these may
be useless on Windows, the size is also checked.
Change-Id: Ieadaef1426a9270587293db28f4dda33b3d17334
Reviewed-on: https://code.wireshark.org/review/3190
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Petri-Dish: Evan Huus <eapache@xxxxxxxxx>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from 7939d32 ssl,dtls: simplify keyfile handling
adds a69a63f ssl: fix SSL keylog file live-capture use case
Summary of changes:
epan/dissectors/packet-dtls.c | 11 ++-
epan/dissectors/packet-ssl-utils.c | 139 +++++++++++++++++++++++-------------
epan/dissectors/packet-ssl-utils.h | 10 ++-
epan/dissectors/packet-ssl.c | 11 ++-
4 files changed, 114 insertions(+), 57 deletions(-)