From 410b40d37145ac217db41ea6bc403c36ab53195d Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 16 Feb 2015 10:50:02 +0100 Subject: Export CLIENT_RANDOM with Export SSL Session Keys This allows for exporting the SSL session keys for captures which were decrypted using a RSA certificate, but where the server does not support session resumption. To avoid frequent reallocations, the expected length is used as initial string size. Tested against a nginx server with ssl_session_cache off. Note that all keys loaded via ssl.keylog_file are exported, not just the displayed ones! Change-Id: Ie3a93d3692885502f46442953fa53303d16672d7 Reviewed-on: https://code.wireshark.org/review/7175 Reviewed-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman --- epan/dissectors/packet-ssl.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'epan/dissectors/packet-ssl.h') diff --git a/epan/dissectors/packet-ssl.h b/epan/dissectors/packet-ssl.h index 0b8cd9cd46..499ba8d22e 100644 --- a/epan/dissectors/packet-ssl.h +++ b/epan/dissectors/packet-ssl.h @@ -25,7 +25,10 @@ #include "ws_symbol_export.h" +/** Maps Session-ID to pre-master secrets. */ WS_DLL_PUBLIC GHashTable *ssl_session_hash; +/** Maps Client Random to pre-master secrets. */ +WS_DLL_PUBLIC GHashTable *ssl_crandom_hash; WS_DLL_PUBLIC void ssl_dissector_add(guint port, const gchar *protocol, gboolean tcp); WS_DLL_PUBLIC void ssl_dissector_delete(guint port, const gchar *protocol, gboolean tcp); -- cgit v1.2.3