Wireshark · Wireshark-commits: [Wireshark-commits] rev 50272: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-xmpp.c

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50272

User: morriss
Date: 2013/06/30 04:25 PM

Log:
 From David Richards via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8871 :
 
 TLS decryption fails when trying to decrypt XMPP sessions using start_tls as
 the port in the key list of the SSL preferences.
 
 Looking at the code, the XMPP dissector has 2 issues:
 
 1) The crude XML element detection for XMPP segmentation is run before
 checking if the SSL dissector should be called.  As a result, the SSL dissector
 is not called at the appropriate times.
 
 2) The SSL dissector is called withoug resetting the desegment flags are not
 manipulated as the SMTP dissector does so segmented SSL packets are not properly
 reconstructed.  Generally this causes the server hello not to be detected.
 
 A proposed patch to fix these issues is attached.

Directory: /trunk/epan/dissectors/
  Changes    Path             Action
  +18 -4     packet-xmpp.c    Modified