tools/wireshark, branch wireshark-1.6.11

Add a CVE ID.

2012-10-02T15:53:18+00:00

svn path=/trunk-1.6/; revision=45257

Build 1.6.11.

2012-10-02T15:41:06+00:00

svn path=/trunk-1.6/; revision=45255

Copy over revisions from the trunk:

2012-10-01T23:47:22+00:00

  ------------------------------------------------------------------------
  r45229 | morriss | 2012-10-01 00:14:03 -0700 (Mon, 01 Oct 2012) | 5 lines
  Changed paths:
     M /trunk/doc/wireshark.pod.template

  The -B option is no longer only available in Win32: remove the Win32
  restriction from the Synopsis.

  This is the man page for Wireshark, not Tshark (fix a cut-n-pasteo).
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=45248

Copy over revisions from the trunk:

2012-10-01T18:13:02+00:00

  ------------------------------------------------------------------------
  r45142 | jake | 2012-09-25 14:02:13 -0700 (Tue, 25 Sep 2012) | 1 line
  Changed paths:
     M /trunk/doc/README.plugins
     A /trunk/plugins/Custom.m4.example
     A /trunk/plugins/Custom.make.example
     M /trunk/plugins/Custom.nmake.example
     M /trunk/plugins/Makefile.am

  Implement and document the Custom plugin system. Create relevant example files and add them to the distribution. Rewrite README.plugins to describe how to use this system.
  ------------------------------------------------------------------------
  r45150 | cmaynard | 2012-09-26 09:48:20 -0700 (Wed, 26 Sep 2012) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-smb-common.c

  In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ...

  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r45111 | pascal | 2012-09-24 12:42:12 -0700 (Mon, 24 Sep 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-scsi.c

  From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7753 :
  Fix display of WRITE BUFFER and SEND DIAGNOSTIC fields in SCSI dissector
  ------------------------------------------------------------------------
  r45146 | cmaynard | 2012-09-25 20:30:48 -0700 (Tue, 25 Sep 2012) | 3 lines
  Changed paths:
     M /trunk/ipmap.html
     M /trunk/ui/gtk/hostlist_table.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5016 - No markers show up when maps are displayed.
  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------
  r45148 | cmaynard | 2012-09-26 05:54:46 -0700 (Wed, 26 Sep 2012) | 3 lines
  Changed paths:
     M /trunk/ui/gtk/hostlist_table.c

  Revision 45146 fixed only the first map.  This patch fixes all maps.
  #BACKPORT(1.6, 1.8)
  ------------------------------------------------------------------------
  r45174 | cmaynard | 2012-09-27 07:02:37 -0700 (Thu, 27 Sep 2012) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-image-jfif.c

  Allow dissection of partial jpegs by a modification of the heuristics.
  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230
  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=45236

Copy over revisions from the trunk:

2012-10-01T17:56:38+00:00

  ------------------------------------------------------------------------
  r44790 | alagoutte | 2012-09-06 01:55:16 -0700 (Thu, 06 Sep 2012) | 16 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ieee80211.c

  From Masashi Honma via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691
  TKIP dissection : wrong IS_TKIP macro

  In [1] "11.4.2.2 TKIP MPDU formats", we could see below sentence.
  "WEPSeed[1] is not used to construct the TSC, but is set to (TSC1 | 0x20) &
  0x7f."

  But the IS_TKIP macro only checks (WEPSeed[1] & 0x20).
  So sometimes IS_TKIP macro mis-dissects a CCMP frame as a TKIP frame.

  This patch changes IS_TKIP macro to do more better check.

  [1] IEEE Std 802.11.-2012

  #BACKPORT(1.8, 1.6)
  ------------------------------------------------------------------------
  r44844 | morriss | 2012-09-10 08:18:17 -0700 (Mon, 10 Sep 2012) | 6 lines
  Changed paths:
     M /trunk/epan/emem.c

  Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699
  and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979 :

  Don't cast the buffer address to int on Win32: a 64-bit address won't
  fit in an integer.
  ------------------------------------------------------------------------
  r44880 | morriss | 2012-09-11 06:11:33 -0700 (Tue, 11 Sep 2012) | 4 lines
  Changed paths:
     M /trunk/epan/emem.c

  As suggested by Anatoly in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699 :

  Followup to r44844: use a better cast (intptr_t instead of long long).
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r44881 | pascal | 2012-09-12 03:21:00 -0700 (Wed, 12 Sep 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-gtpv2.c

  From Esa Haapamäki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7718 :
  Fix dissection of NAS Uplink and Downlink Count in MM Context IE
  ------------------------------------------------------------------------
  r44940 | etxrab | 2012-09-17 07:51:08 -0700 (Mon, 17 Sep 2012) | 1 line
  Changed paths:
     M /trunk/ui/gtk/voip_calls.c

  callsinfo->stop_fd not set in all branches for UNISTIM.
  ------------------------------------------------------------------------
  r45007 | cmaynard | 2012-09-19 10:57:54 -0700 (Wed, 19 Sep 2012) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-icmp.c
     M /trunk/epan/dissectors/packet-icmpv6.c

  Fix request/response tracking with checksum corner case.
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=45235

Copy over r44749 from the trunk:

2012-10-01T17:35:57+00:00

  ------------------------------------------------------------------------
  r44749 | pascal | 2012-09-03 05:48:57 -0700 (Mon, 03 Sep 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-drda.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666 :
  Check that DRDA command has a minimum length of 10 bytes to prevent a potential infinite loop
  ------------------------------------------------------------------------


Update the release notes.

svn path=/trunk-1.6/; revision=45234

Copy over r44500 from the trunk:

2012-10-01T17:28:52+00:00

  ------------------------------------------------------------------------
  r44510 | pascal | 2012-08-14 15:12:31 -0700 (Tue, 14 Aug 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-per.c

  From Jan de Jongh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624 :
  dissect_per_constrained_integer_64b fails for 64 bits
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r44513 | pascal | 2012-08-15 06:42:46 -0700 (Wed, 15 Aug 2012) | 2 lines
  Changed paths:
     M /trunk/asn1/lpp/lpp.cnf
     M /trunk/asn1/pcap/pcap.cnf
     M /trunk/asn1/ranap/ranap.cnf
     M /trunk/asn1/rrc/rrc.cnf
     M /trunk/asn1/rrlp/rrlp.cnf
     M /trunk/epan/dissectors/packet-lpp.c
     M /trunk/epan/dissectors/packet-pcap.c
     M /trunk/epan/dissectors/packet-ranap.c
     M /trunk/epan/dissectors/packet-rrc.c
     M /trunk/epan/dissectors/packet-rrlp.c

  Fix field type for some 64 bits header fields
  ------------------------------------------------------------------------
  r44533 | pascal | 2012-08-15 13:43:00 -0700 (Wed, 15 Aug 2012) | 2 lines
  Changed paths:
     M /trunk/asn1/rrlp/rrlp.cnf
     M /trunk/epan/dissectors/packet-rrlp.c

  Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits
  ------------------------------------------------------------------------

Regenerate the ASN.1 dissectors.

Update the release notes.

svn path=/trunk-1.6/; revision=45233

[Automatic manuf, services and enterprise-numbers update for 2012-09-30]

2012-09-30T15:04:11+00:00

svn path=/trunk-1.6/; revision=45222

Implement and document the Custom plugin system. Create relevant example files and add them to the distribution. Rewrite README.plugins to describe how to use this system.

2012-09-25T21:02:13+00:00

svn path=/trunk/; revision=45142

Note that it's a smart card standard.

2012-09-25T21:00:10+00:00

svn path=/trunk/; revision=45141