Wireshark-commits: [Wireshark-commits] master cbe7f26: DTLS: add DSB support, use the key log file
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cbe7f26a86c2d24e3525bdea9faa3b2b307d8c95
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
cbe7f26 by Peter Wu (peter@xxxxxxxxxxxxx):
DTLS: add DSB support, use the key log file from the TLS dissector
The DTLS and TLS dissectors already share code for parsing the key log
file contents but the actual key material was stored separately. As
implementations (like GnuTLS) write the TLS and DTLS secrets to the same
file (specified by the SSLKEYLOGFILE environment variable), it seems
reasonable to combine them.
This also enables use of the pcapng Decryption Secrets Block for
decryption of DTLS traces. The dtls.keylog_file preference has become
obsolete and can no longer be used (this was not tested anyway).
A new test was added based on dtls12-aes128ccm8.pcap, the master secret
was extracted using the tls.debug_file preference.
Bug: 15252
Change-Id: Idfd52c251da966fe111dea37bc3fb143d968f744
Reviewed-on: https://code.wireshark.org/review/31577
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from cda1a59 smpp: Make it clearer that it's a heuristic dissector.
add cbe7f26 DTLS: add DSB support, use the key log file from the TLS dissector
Summary of changes:
docbook/release-notes.asciidoc | 2 +-
epan/dissectors/packet-dtls.c | 22 ++++++++--------------
epan/dissectors/packet-tls-utils.c | 10 +++++++++-
epan/dissectors/packet-tls-utils.h | 10 +++++++++-
epan/dissectors/packet-tls.c | 12 +++++++++++-
test/captures/dtls12-aes128ccm8-dsb.pcapng | Bin 0 -> 2044 bytes
test/suite_decryption.py | 10 ++++++++++
7 files changed, 48 insertions(+), 18 deletions(-)
create mode 100644 test/captures/dtls12-aes128ccm8-dsb.pcapng
