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.c | |
| 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.c')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 608ddd2e06..188c8903c8 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2136,8 +2136,6 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, } } else { /* try to find the key in the key log */ - if (!ssl_keylog_filename) - break; if (ssl_keylog_lookup(ssl, ssl_keylog_filename, &encrypted_pre_master)<0) break; } @@ -2288,7 +2286,15 @@ dissect_ssl3_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, (tvb_memeql(tvb, offset+33, ssl->session_id.data, session_id_length) == 0)) { /* client/server id match: try to restore a previous cached session*/ - ssl_restore_session(ssl, ssl_session_hash); + if (!ssl_restore_session(ssl, ssl_session_hash)) { + /* If we failed to find the previous session, we may still have + * the master secret in the key log. */ + if (ssl_keylog_lookup(ssl, ssl_keylog_filename, NULL)) { + ssl_debug_printf(" cannot find master secret in keylog file either\n"); + } else { + ssl_debug_printf(" found master secret in keylog file\n"); + } + } } else { tvb_memcpy(tvb,ssl->session_id.data, offset+33, session_id_length); ssl->session_id.data_len = session_id_length; |