Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] rev 40952: /trunk/epan/dissectors/ /trunk/epan/dissectors/:

Date: Fri, 10 Feb 2012 23:08:47 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=40952

User: morriss
Date: 2012/02/10 03:08 PM

Log:
 Fix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817 :
 
 r40200 made ssl_parse()/dtls_parse() post-update-callbacks for those
 dissector's UATs so that the dissector would be updated when the user changed
 the UAT.  (This allows SSL/DTLS keys to be taken into account without requiring
 Wireshark to be restarted.)
 
 But, those functions also update the UAT themselves if the old-style keys_list
 preference is used, creating an infinite recursion.
 
 Fix this by splitting the *_parse() functions into two: one for the UAT and one
 for the old-style keys list.

Directory: /trunk/epan/dissectors/
  Changes    Path             Action
  +39 -26    packet-dtls.c    Modified
  +23 -15    packet-ssl.c     Modified