[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/05/31 01:35 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37401 | sake | 2011-05-25 14:49:29 -0700 (Wed, 25 May 2011) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ssl-utils.c
      M /trunk/epan/dissectors/packet-ssl.c
 
   Extended the SSL key log import routine to be able to read the following format:
 
   RSA Session-ID:xxxx Master-Key:xxxx
 
   This makes it easy to use the "openssl s_client" output for decryption
   (see: http://ask.wireshark.org/questions/4229/follow-ssl-stream-using-master-key-and-session-id)
 
   It also paves the way for exporting SSL keyring material. See also the enhancement request in:
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444
   ------------------------------------------------------------------------
   r37446 | sake | 2011-05-28 11:17:50 -0700 (Sat, 28 May 2011) | 5 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-ssl-utils.c
      M /trunk/epan/dissectors/packet-ssl.c
      M /trunk/epan/dissectors/packet-ssl.h
      M /trunk/epan/libwireshark.def
      M /trunk/gtk/Makefile.common
      A /trunk/gtk/export_sslkeys.c
      A /trunk/gtk/export_sslkeys.h
      M /trunk/gtk/menus.c
      M /trunk/image/file_dlg_win32.rc
      M /trunk/win32/file_dlg_win32.c
      M /trunk/win32/file_dlg_win32.h
 
   Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
 
   (See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)
   ------------------------------------------------------------------------
   r37447 | guy | 2011-05-28 13:55:21 -0700 (Sat, 28 May 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_sslkeys.c
 
   Get rid of some warnings on Win64.
   ------------------------------------------------------------------------
   r37448 | guy | 2011-05-28 15:17:22 -0700 (Sat, 28 May 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/export_sslkeys.c
 
   More warning squelching.  (Thank you, GLib developers, for using gulong
   rather than gsize as the second argument to the GLib snprintf routines.)
   ------------------------------------------------------------------------
   r37449 | guy | 2011-05-28 15:52:00 -0700 (Sat, 28 May 2011) | 4 lines
   Changed paths:
      M /trunk/win32/file_dlg_win32.c
 
   Squelch yet another warning.
 
   Use the ws_ "routines" (really #defines) for consistency.
   ------------------------------------------------------------------------
   r37450 | guy | 2011-05-28 17:08:27 -0700 (Sat, 28 May 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_sslkeys.c
 
   Make a routine not used outside this file static.
   ------------------------------------------------------------------------
   r37457 | jmayer | 2011-05-29 01:51:04 -0700 (Sun, 29 May 2011) | 1 line
   Changed paths:
      M /trunk/gtk/CMakeLists.txt
 
   Rev 37446 added export_sslkeys.c
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +75 -14    packet-ssl-utils.c    Modified
  +17 -3     packet-ssl.c          Modified
  +2 -0      packet-ssl.h          Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +7 -0      release-notes.xml    Modified

Directory: /trunk-1.6/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified

Directory: /trunk-1.6/gtk/
  Changes    Path               Action
  +1 -0      CMakeLists.txt     Modified
  +2 -0      Makefile.common    Modified
  +5 -0      menus.c            Modified

Directory: /trunk-1.6/image/
  Changes    Path                 Action
  +7 -0      file_dlg_win32.rc    Modified

Directory: /trunk-1.6/
  Changes    Path          Action
  +1 -0      AUTHORS       Modified


(2 files not shown)