summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-ssl-utils.h
diff options
context:
space:
mode:
authorAdam Pridgen <adam.pridgen@thecoverofnight.com>2015-06-07 01:17:50 -0500
committerPeter Wu <peter@lekensteyn.nl>2015-06-16 08:31:51 +0000
commitc392db5b08b63adfeca86f84f76db19c829174ac (patch)
tree92230e785ef96f1d97d44de4a7898b0d7c259eb5 /epan/dissectors/packet-ssl-utils.h
parenta1859b7254683eb661555a0bd7612c68e5bdb2cd (diff)
downloadwireshark-c392db5b08b63adfeca86f84f76db19c829174ac.tar.gz
TLS Decryption is now possible with a user provided PMS and Client Random values
Bug: 11263 Change-Id: I1476948ed823fc34de2cecdeb1bddafccbb8ec39 Reviewed-on: https://code.wireshark.org/review/8803 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
-rw-r--r--epan/dissectors/packet-ssl-utils.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 6c202bf93a..722bfa5019 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -444,6 +444,7 @@ typedef struct {
GHashTable *crandom; /* Client Random to master secret */
GHashTable *pre_master; /* First 8 bytes of encrypted pre-master secret to
pre-master secret */
+ GHashTable *pms; /* Client Random to unencrypted pre-master secret */
} ssl_master_key_map_t;
gint ssl_get_keyex_alg(gint cipher);