URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=21aa7168c7565445ee544ee78fb6c836a63cd4ed
Submitter: Martin Kaiser (wireshark@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
21aa716 by Martin Kaiser (wireshark@xxxxxxxxx):
SSL/TLS payload decryption:
don't make private key and keylog file mutually exclusive
if we find a private key that does not match or is not usable for
getting the pre-master secret (e.g. because we're using an ephemeral
cipher suite), don't give up and exit with an error
continue reading the keylog file and search for our master secret there
Change-Id: I59fb460339e3e606a077b3a902fa1f9777b5e118
Reviewed-on: https://code.wireshark.org/review/590
Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
Actions performed:
from 5de268a Replace "see copyright notice in" message with full license
adds 21aa716 SSL/TLS payload decryption: don't make private key and keylog file mutually exclusive
Summary of changes:
epan/dissectors/packet-ssl-utils.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
