osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6596 :

Browse source 
Allow reading SSL keylog files with carriage returns.

svn path=/trunk/; revision=52197
This commit is contained in:
Jeff Morriss 2013-09-24 00:31:49 +00:00
parent d456079b7e
commit 6d255f8633
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
epan/dissectors/packet-ssl-utils.c
View file

@ -4194,6 +4194,10 @@ ssl_keylog_lookup(SslDecryptSession* ssl_session,
line[bytes_read - 1] = 0;
bytes_read--;
}
if (bytes_read > 0 && line[bytes_read - 1] == '\r') {
line[bytes_read - 1] = 0;
bytes_read--;
}
ssl_debug_printf(" checking keylog line: %s\n", line);