diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-06-24 15:24:59 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-06-24 15:24:59 +0000 |
| commit | 9adf66b3fbbae568514c75b5c43641e2a87984d4 (patch) | |
| tree | 36fbbaff9436a02f41fafe9fddffd8d28dfb5b84 /epan/dissectors/packet-ssl-utils.h | |
| parent | 464464d8b6e33ee6c58d831c0073971ca78e1ba2 (diff) | |
From Adam Langley:
Decrypt resumed, SSL sessions from keylog file-
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7396
svn path=/trunk/; revision=43458
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index c7229ec1e5..603059c819 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -438,8 +438,8 @@ ssl_change_cipher(SslDecryptSession *ssl_session, gboolean server); /** Try to find the pre-master secret for the given encrypted pre-master secret from a log of secrets. @param ssl_session the store for the decrypted pre_master_secret - @param ssl_keylog_filename a file that contains a log of pre-master secrets - @param encrypted_pre_master the rsa encrypted pre_master_secret + @param ssl_keylog_filename a file that contains a log of secrets (may be NULL) + @param encrypted_pre_master the rsa encrypted pre_master_secret (may be NULL) @return 0 on success */ int ssl_keylog_lookup(SslDecryptSession* ssl_session, @@ -534,7 +534,7 @@ ssl_parse_key_list(const ssldecrypt_assoc_t * uats, GHashTable *key_hash, GTree* extern void ssl_save_session(SslDecryptSession* ssl, GHashTable *session_hash); -extern void +extern gboolean ssl_restore_session(SslDecryptSession* ssl, GHashTable *session_hash); extern gint |