Commit graph

280 commits

Author SHA1 Message Date
mathewmarcus
4a8b677de0 added fix for AES256 GCM decryption 2018-07-05 08:08:36 -05:00
mathewmarcus
c46019cc62 added case insensitive string comparison macro 2018-07-05 08:08:36 -05:00
mathewmarcus
98a233fc40 added support for AES GCM decryption 2018-07-05 08:08:36 -05:00
mathewmarcus
f788c3a67a use sslkeylogfile to get MS if possible 2018-07-05 08:06:49 -05:00
mathewmarcus
4ef8eb376a added function to extract MS from sslkeylogfile 2018-07-05 08:06:49 -05:00
mathewmarcus
cc3446a1ce added GCM specific ciphersuite info 2018-07-05 08:06:49 -05:00
mathewmarcus
b261b21574 added sslkeylogfile pointer to decode ctx 2018-07-05 08:06:49 -05:00
mathewmarcus
3020239022 fix decoding and printing of DiffieHellman Client params 2018-07-05 08:06:49 -05:00
mathewmarcus
170158a65b add l option for SSLKEYLOGFILE 2018-07-05 08:06:49 -05:00
9f5d85eec0
Merge pull request #17 from mathewmarcus/fix_extension_bug
correctly handle case where server hello does not request extension s…
2018-07-05 09:32:42 +02:00
mathewmarcus
f27bc9fe2a improve syntax 2018-07-02 09:45:12 -05:00
mathewmarcus
0a6dada0f1 correctly handle case where server hello does not request extension specified by client 2018-07-02 09:34:15 -05:00
c36c411547
Merge pull request #16 from mathewmarcus/tls_extensions
Tls extensions
2018-06-30 21:53:55 +02:00
mathewmarcus
7589ee5eb0 code cleanup 2018-06-24 23:43:19 -05:00
mathewmarcus
4765bb22d1 added support for SNI 2018-06-24 22:57:40 -05:00
mathewmarcus
57fc64ac77 added support for encrypt-then-mac 2018-06-24 22:54:10 -05:00
mathewmarcus
0d0a0b79b7 finished support for extended master secret 2018-06-24 12:37:19 -05:00
mathewmarcus
b4cd538dfa calculate session hash 2018-06-22 14:56:48 -05:00
mathewmarcus
5d804ef1a4 added struct to store extensions 2018-06-22 14:56:48 -05:00
mathewmarcus
1a7113a0ec added struct to store extensions 2018-06-22 07:18:39 -05:00
Mathew Marcus
83627b7c8f Revert "moved struct ssl_decoder_ definition into header file because we need it in ssl.enums.c"
This reverts commit 193c600108.
2018-06-20 10:28:35 -05:00
mathewmarcus
193c600108 moved struct ssl_decoder_ definition into header file because we need it in ssl.enums.c 2018-06-20 09:11:42 -05:00
mathewmarcus
a066b61dfe added handler for extended master secret extension 2018-06-20 09:06:09 -05:00
mathewmarcus
919684d5ae rename functions 2018-06-20 08:27:53 -05:00
Mathew Marcus
1086c102d6 record handshake messages for session hash 2018-06-19 23:32:11 -05:00
mathewmarcus
157a906228 include extensions in output 2018-06-19 17:36:49 -05:00
430d57af39
Merge pull request #15 from Whissi/update-ciphers
Update ciphers
2018-01-14 15:41:28 +01:00
Thomas Deutschmann
f5a73a61bc
Adjust cipher suite formation 2018-01-02 17:36:13 +01:00
Thomas Deutschmann
76cbb5cd15
Add TLS 1.3 cipher suites 2018-01-02 17:36:13 +01:00
Thomas Deutschmann
b1b339ff0f
Add fallback signaling cipher suite 2018-01-02 17:36:13 +01:00
Thomas Deutschmann
17a84809c9
Add CHACHA20_POLY1305 cipher suite 2018-01-02 17:36:06 +01:00
af19c316ca Merge pull request #14 from davidkretch/fix-typo
Fix a typo in the man page
2017-10-26 08:19:43 +02:00
David Kretch
959a2c53a3 Fix a typo in the man page
Delete the extra "to" in "To decrypt traffic to to host" under the examples section.
2017-10-25 20:44:34 -04:00
f7585c4bee Merge pull request #13 from alperakcan/master
fix ssl record queue data read
2017-06-12 14:05:19 +02:00
Alper Akcan
e6cd50ed6c - fix mis calculation of read_left if queue already has some data, which might not be bigger than ssl_header_size
- update q->ptr only if q->data is changed
2017-06-10 16:16:34 +03:00
Alper Akcan
2c602e876a Merge pull request #1 from adulau/master
Merge pull request #12 from alperakcan/master
2017-06-10 16:07:33 +03:00
f96ec877dd Merge pull request #12 from alperakcan/master
Fix packet length calculation if IP length is 0, due to TSO
2017-05-29 14:57:49 +02:00
Alper Akcan
d18d2fce01 Fix packet length calculation if IP length is 0, due to TSO 2017-05-29 15:54:19 +03:00
a875af0611 Typo fixed 2016-11-20 11:28:57 +01:00
94e2dd4adb Explanation added in a new README 2016-11-20 11:26:24 +01:00
4529d03a50 Merge pull request #9 from PequalsNP-team/master
updated configure for new libpcap location on most linux distro
2016-07-26 09:29:21 +02:00
thez3ro
a27e6028c7 updated configure for new libpcap location on most linux distro 2015-11-23 20:06:38 +01:00
4dcaf2054c Merge pull request #7 from knowtoto/master
Fix a null pointer dereference bug
2015-09-09 14:47:41 +02:00
hyunkyu.oh
66673e4407 Fix a null pointer dereference bug of tls12_prf be caused by invalid extern declaration for digests variable. 2015-09-09 17:20:49 +09:00
d4ce6d1ff7 Merge pull request #5 from wllm-rbnt/master
More code cleaning
2015-05-18 21:54:31 +02:00
William Robinet
e49030e3b4 Include string.h (remove warnings about memcpy) 2015-05-18 16:07:18 +02:00
William Robinet
2e0d67c172 Fix order of arguments in calls to calloc 2015-05-18 15:40:22 +02:00
William Robinet
e82f01e3fb "Each invocation of va_start() must be matched by a corresponding invocation of va_end()" 2015-05-13 16:11:06 +02:00
William Robinet
d1b3a2ac07 Remove dead code 2015-05-13 16:07:22 +02:00
William Robinet
03d490159c Do not use uninitialized variable 2015-05-13 15:47:08 +02:00