URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=df7af28f39b5b104fb85f76ddd9b887a74cf2d63
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
df7af28 by Peter Wu (peter@xxxxxxxxxxxxx):
Add new Secrets API and allow TLS to use pcapng decryption secrets
Add a new secrets API to the core, one that can outlive the lifetime of
a single capture file. Expose decryption secrets from wiretap through a
callback and let the secrets API route it to a dissector.
Bug: 15252
Change-Id: Ie2f1867bdfd265bad11fc58f1e8d8e7295c0d1e7
Reviewed-on: https://code.wireshark.org/review/30705
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from e2e0fd1 editcap: add --inject-secrets option
add df7af28 Add new Secrets API and allow TLS to use pcapng decryption secrets
Summary of changes:
debian/libwireshark0.symbols | 1 +
debian/libwiretap0.symbols | 1 +
epan/CMakeLists.txt | 2 ++
epan/dissectors/packet-tls-utils.c | 15 +++++----
epan/dissectors/packet-tls-utils.h | 2 +-
epan/dissectors/packet-tls.c | 9 +++++
epan/epan.c | 3 ++
epan/secrets.c | 58 ++++++++++++++++++++++++++++++++
epan/secrets.h | 68 ++++++++++++++++++++++++++++++++++++++
file.c | 2 ++
sharkd.c | 2 ++
test/suite_decryption.py | 10 ++++++
tshark.c | 2 ++
wiretap/pcapng.c | 6 ++++
wiretap/wtap-int.h | 1 +
wiretap/wtap.c | 5 +++
16 files changed, 179 insertions(+), 8 deletions(-)
create mode 100644 epan/secrets.c
create mode 100644 epan/secrets.h