Wireshark-commits: [Wireshark-commits] rev 36574: /trunk-1.2/ /trunk-1.2/epan/dissectors/: packet-s
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36574
User: gerald
Date: 2011/04/11 05:43 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r36174 | wmeier | 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) | 6 lines
Changed paths:
M /trunk/epan/dissectors/packet-ssl-utils.c
Check that imported private key is RSA; Prevents a crash.
Fixes Bug #5662
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662
------------------------------------------------------------------------
r36232 | sake | 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) | 3 lines
Changed paths:
M /trunk/wiretap/netscreen.c
Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off).
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r36162 | sake | 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-tcp.c
Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
------------------------------------------------------------------------
r36190 | gerald | 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) | 2 lines
Changed paths:
M /trunk/asn1/ldap/ldap.cnf
M /trunk/epan/dissectors/packet-ldap.c
Properly initialize our filter counters.
------------------------------------------------------------------------
r36471 | tuexen | 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) | 3 lines
Changed paths:
M /trunk/text2pcap.c
Fix a typo in the help message.
Reported by Matthias Wellmeyer.
------------------------------------------------------------------------
Directory: /trunk-1.2/epan/dissectors/
Changes Path Action
+14 -0 packet-ssl-utils.c Modified
+3 -3 packet-tcp.c Modified
Directory: /trunk-1.2/docbook/
Changes Path Action
+24 -87 release-notes.xml Modified
Directory: /trunk-1.2/packaging/nsis/
Changes Path Action
+3 -0 wireshark.nsi Modified
Directory: /trunk-1.2/tools/
Changes Path Action
+1 -1 win32-setup.sh Modified
+1 -1 win64-setup.sh Modified
Directory: /trunk-1.2/
Changes Path Action
+6 -0 Makefile.nmake Modified
+2 -2 config.nmake Modified
+1 -1 text2pcap.c Modified
Directory: /trunk-1.2/wiretap/
Changes Path Action
+1 -1 netscreen.c Modified