DTLS: add DSB support, use the key log file from the TLS dissector
authorPeter Wu <peter@lekensteyn.nl>
Thu, 17 Jan 2019 16:52:52 +0000 (17:52 +0100)
committerPeter Wu <peter@lekensteyn.nl>
Thu, 17 Jan 2019 21:33:25 +0000 (21:33 +0000)
commitcbe7f26a86c2d24e3525bdea9faa3b2b307d8c95
treeae40757d75a0e9a86246bbc6cea73fbd406c1525
parentcda1a591e9a835f626aacc0843a71bc6f25ce13b
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@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
docbook/release-notes.asciidoc
epan/dissectors/packet-dtls.c
epan/dissectors/packet-tls-utils.c
epan/dissectors/packet-tls-utils.h
epan/dissectors/packet-tls.c
test/captures/dtls12-aes128ccm8-dsb.pcapng [new file with mode: 0644]
test/suite_decryption.py