diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-02-06 12:35:09 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-09 14:03:34 +0000 |
| commit | e190253478cea8ab10903e83daafeb3574ad0f04 (patch) | |
| tree | b1a6619a21c6979bb598dcb6f2c3d6f76cc66c20 /epan/dissectors/packet-xmpp-utils.h | |
| parent | 93ed72642b3bc0771c6099c4861a39c080040b0e (diff) | |
Fix STARTTLS handling in various dissectors
This patch lets a dissector hand over control to the SSL dissector which
simplifies dissector code ("TCP | App | SSL | App" becomes
"TCP | SSL | App").
After this patch, all of the affected dissectors will now be dissected
as SSL with its Application Data being treated as the protocol before
STARTTLS. This was previously not the case because the port was not
registered for dissection via ssl_dissector_add.
The desegmentation issue within the MySQL dissector is now also gone.
Convert some tvb_length[_remaining] users in pop and smtp as well.
Tested against mysql-ssl.pcapng and mysql-ssl-larger.pcapng(*1),
Tested against pop-ssl.pcapng (note: only first stream is decrypted,
either the key after negotiation is wrong or there is a bug),
Tested against smtp-ssl.pcapng and smtp2525-ssl.pcapng (with Decode As)
and smtp-ssl.pcapng with filter "tcp.len>0",
Tested against xmpp-ssl.pcapng,
http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys
*1) mysql-ssl-larger has MySQL dissector errors for the fragmented
SSL packet, but reassembly seems to work. Needs further
investigation.
Bug: 9515
Change-Id: I408ef8ff30d9edc8954dab9b3615900666dfa932
Reviewed-on: https://code.wireshark.org/review/6981
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-xmpp-utils.h')
| -rw-r--r-- | epan/dissectors/packet-xmpp-utils.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/epan/dissectors/packet-xmpp-utils.h b/epan/dissectors/packet-xmpp-utils.h index 24907c0bee..20de98b1c1 100644 --- a/epan/dissectors/packet-xmpp-utils.h +++ b/epan/dissectors/packet-xmpp-utils.h @@ -118,7 +118,6 @@ typedef struct _xmpp_conv_info_t { wmem_tree_t *ibb_sessions; wmem_tree_t *gtalk_sessions; guint32 ssl_start; - guint32 ssl_proceed; } xmpp_conv_info_t; /** Struct conatins frame numbers (request frame(IQ set/get) and |