Build 3.2.15.wireshark-3.2.15v3.2.15

[skip ci]

4 files changed, 401 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..74cdd7cc83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,366 @@
+commit de81179c4d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jul 13 10:29:23 2021 -0700
+
+    Prep for 3.2.15.
+
+commit 9cf8d5f2a8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 11 10:17:49 2021 +0000
+
+    [Automatic update for 2021-07-11]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit ce61af0063
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Fri Jun 25 09:44:35 2021 +0100
+
+    DT2000: Fix buffer length in wiretap code
+    
+    CID: 1477941
+    
+    
+    (cherry picked from commit af57fb94ac664a9f4a4262fdc5e4afa8b8e379bf)
+
+commit 8934513154
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Fri Jun 25 10:04:01 2021 +0100
+
+    Snort config: Avoid leaks when fail to open config file.
+    
+    CID: 1477713
+    CID: 1477850
+    
+    
+    (cherry picked from commit bbcd42be8763b5b91b4f3bca51b169cec5487ff5)
+
+commit c5069e0137
+Author: Taisuke Sasaki <taisasak@cisco.com>
+Date:   Tue Jun 29 19:17:30 2021 +0900
+
+    OSPF: Fixed SRLB and SRMS Preference TLV types (rfc8665)
+    
+    - Fixed TLV types of SRLB and SRMS Preference
+    - Added type/length for unknown Opaque RI TLV
+    
+    
+    (cherry picked from commit d8ee53e078ea8985db207e5d25b1a88913838f8a)
+
+commit 8a9923326a
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Thu Jul 8 18:37:32 2021 +0100
+
+    RSL: Fix mask of eMLPP Priority field.
+    
+    9.3.49 in 48.058wq
+    
+    
+    (cherry picked from commit ba0d6f69abac4b381d38308b981a52b490d36a08)
+
+commit 59b49ad0a0
+Author: ZhongYao Luo <LuoZhongYao@gmail.com>
+Date:   Wed Jun 16 22:05:54 2021 +0800
+
+    Fix null pointer
+    
+    In some cases, the fds parameter of frame_data_sequence_find is invalid,
+    causing the software to crash, For example, this command
+    echo'{"req":"frame","bytes":"yes","proto":"yes","frame":"1" }'|sharkd-
+    
+    
+    (cherry picked from commit 64155132ea001dab7db030df96ce00b90a958277)
+
+commit 4229d84cee
+Author: João Valverde <j@v6e.pt>
+Date:   Sun Jun 20 19:02:53 2021 +0100
+
+    Change my email address
+    
+    
+    (cherry picked from commit ab37610f0859a1136c89a43c991e48b320bb2bc6)
+
+commit 6cb7599ffa
+Author: Martin Tschoepe <martin.tschoepe@web.de>
+Date:   Wed Jun 30 08:41:49 2021 +0200
+
+    PROFINET: Ensure multiple submodules are parsed
+    
+    GSML parsing has a bug related to multiple submodules,
+    such that, the first submodule found in the GSDML needs
+    to be the PROFIsafe element, otherwise the description
+    is not parsed.
+    
+    
+    (cherry picked from commit d3ec582c26ffa1d98b7dc863e4452fc42f0399db)
+
+commit d9497073c4
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Sat Jun 26 10:31:59 2021 +0200
+
+    DNP: use the proper free function
+    
+    g618661b22e introduced a free for a so called memory leak (which wasn't
+    a real leak due to the pinfo->pool garbage collector) but used the wrong
+    free function. Let's keep the explicit free but use the right function.
+    
+    Closes #17462
+    
+    
+    (cherry picked from commit 029a7fcec5c6fc9407bd7f50ad6c3ce79f4d393b)
+
+commit 83ff57b5af
+Author: Andreas Schultz <andreas.schultz@travelping.com>
+Date:   Wed Jul 7 18:54:22 2021 +0200
+
+    GTPv2: fix decoding of (extended) eNodeB id
+    
+    3GPP TS 29.274, clause 8.21.7 and 8.21.8 clearly specify a total
+    length of 6 bytes for these fields.
+    
+    
+    (cherry picked from commit 4992806dba09e67ec55921f0f8c964b0a9a0e8c5)
+
+commit e581319fec
+Author: Andre Luyer <andre@luyer.nl>
+Date:   Sun Jul 4 17:43:02 2021 +0200
+
+    tshark/wireshark: Fix check ring buffer option for packets
+    
+    tshark and wireshark did not allow only -b packets:value option, while dumpcap does.
+    This change adds the same check in tshark and wireshark as in dumpcap.
+    
+    Quick fix for issue mentioned at https://ask.wireshark.org/question/23437/why-does-tshark-b-packetsvalue-not-work/
+    
+    
+    (cherry picked from commit 9f8e6b1acb83a74c9efda70f97b5fb9f1771d2b8)
+
+commit 62c3350982
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jul 4 10:18:04 2021 +0000
+
+    [Automatic update for 2021-07-04]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 010d2c0633
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Sun Jul 4 12:03:45 2021 +0200
+
+    NR RRC: fix dissection of MeasTriggerQuantityOffset element
+    
+    (cherry picked from commit aa5df68171f021e19bbf9ed4753e451ecf08b1a4)
+    
+    Conflicts:
+            epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
+            epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
+            epan/dissectors/packet-nr-rrc.c
+
+commit f815545f70
+Author: Guy Harris <gharris@sonic.net>
+Date:   Mon Jun 28 14:18:41 2021 -0700
+
+    wireless timeline: add a destructor to free the hash table.
+    
+    Destroy the hash table if we're destroying the timeline widget, so that
+    it doesn't leak.
+    
+    
+    (cherry picked from commit ad3e6b1be6490834d90575535d3efb6a8125767d)
+
+commit 421c66dc44
+Author: Guy Harris <gharris@sonic.net>
+Date:   Mon Jun 28 02:22:13 2021 -0700
+
+    wireless_timeline: make sure the hash table is always allocated.
+    
+    At least on my Mac, if I start up Wireshark, start a capture
+    (non-monitor-mode) on the Wi-Fi adapter, add a comment to the SHB and
+    the first packet while it's capturing, stop the capture, and try to save
+    it, it warns that the wireless timeline hash table pointer is null.
+    
+    Allocate it in the constructor.
+    
+    
+    (cherry picked from commit 693a02e76068de331c45df191f372ac14e6686d2)
+
+commit 0a35a2e7f1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 27 10:17:35 2021 +0000
+
+    [Automatic update for 2021-06-27]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 61e4196325
+Author: Guy Harris <gharris@sonic.net>
+Date:   Sun Jun 20 15:39:58 2021 -0700
+
+    mergecap: improve the example.
+    
+    Explain, in detail, exactly what it's trying to do and, for each of the
+    three commands in the example, what each step does, as well as
+    explaining what the calculation using the end time of one capture and
+    start time of another capture is doing.
+    
+    (Where did this example come from?  What is the real-world goal of this
+    exercise?  And why is it an example in which all the fancy stuff is done
+    in commands *other* than mergecap?)
+    
+    
+    (cherry picked from commit 628fe2549a47f4f246dd645d5d15dad3edc35cb7)
+
+commit 32d391e810
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 20 10:18:09 2021 +0000
+
+    [Automatic update for 2021-06-20]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 59926c9dfe
+Author: Guy Harris <gharris@sonic.net>
+Date:   Fri Jun 18 17:43:36 2021 -0700
+
+    pcap-common: set the time stamp precision correctly for LINKTYPE_ERF.
+    
+    LINKTYPE_ERF pcap files are really ERF files inside a thin pcap wrapper
+    (don't even ask what a pcapng file with some or all interfaces being
+    LINKTYPE_ERF is...), so the time stamp comes from the ERF record, not
+    from the pcap packet header or pcapng block header.
+    
+    The time stamp reslution for the record should reflect that, so set it
+    to WTAP_TSPREC_NSEC (ERF time stamps are fractional-power-of-2, not
+    fractional-power-of-10, so that's the best we can do).
+    
+    
+    (cherry picked from commit 39315979c638b916d76a9dbf8c7ffb089721f01a)
+
+commit f5ec991c0e
+Author: Guy Harris <gharris@sonic.net>
+Date:   Fri Jun 18 01:24:41 2021 -0700
+
+    erf: set the tsprecision value of a newly-created IDB.
+    
+    Don't assume the default is correct, because there's no guarantee of
+    that - in fact, there's currently a guarantee that it's not, as it's
+    initialized to 0, which is WTAP_TSPREC_SECS.
+    
+    
+    (cherry picked from commit 49ec11f5aad2c6c29b02036ef9744c5680ee88a0)
+
+commit 82bb4f50cf
+Author: Guy Harris <gharris@sonic.net>
+Date:   Wed Jun 16 00:43:07 2021 -0700
+
+    wslua_tvb: fix documentation for reported_length_remaining().
+    
+    In the past, tvb_reported_length_remaining(), and thus
+    Tvb:reported_length_remaining(), may have returned -1 if the offset was
+    invalid.  That's no longer the case; the former returns 0, and, as the
+    latter just returns the former's return value, that's true of the latter
+    as well.
+    
+    (backported from commit 6c043d5c73e3bdbb84f988a82ebdfc18d77489b9)
+
+commit cfce22c839
+Author: Guy Harris <gharris@sonic.net>
+Date:   Tue Jun 15 23:24:01 2021 -0700
+
+    wslua: a tvbuff doesn't have an "actual length".
+    
+    It has a "reported length", which is the closes thing to an "actual
+    length", as it represents the length the packet, or subset thereof, had
+    on the network, and a "captured length", which is the amount of the
+    packet that the capture process saved.
+    
+    In 99.999999999999999999999999999999% of all cases, a dissector should
+    look at the "reported length", not at the "captured length".
+    
+    Rename the "len" method to "captured_len", leaving "len" around for
+    backwards compatibility.
+    
+    Fix the documentation to reflect reality, to avoid issues such as #15655.
+    
+    (backported from commit bd9ceaebef86a30f5f45a8887fd01883dd0d1993)
+
+commit c57c6125fe
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 13 10:17:42 2021 +0000
+
+    [Automatic update for 2021-06-13]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 22c59f79c4
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jun 9 19:43:02 2021 +0000
+
+    wifi-nan: Fix length for availability attribute
+    
+    Issue reported by Behzad Mokhtari
+    
+    Fix #17431
+    
+    
+    (cherry picked from commit b716e2f1a2a1a592aff2c71662f0827527d72f68)
+
+commit a6c1d90bf0
+Author: João Valverde <j@v6e.pt>
+Date:   Thu Jun 10 16:58:54 2021 +0100
+
+    wsutil: argv[] is a NULL terminated array
+    
+    
+    (cherry picked from commit 70cea91c8a3b5c4cea33ec53dab022531b44297b)
+
+commit c274f5966f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jun 6 10:17:10 2021 +0000
+
+    [Automatic update for 2021-06-06]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+
+commit 0a9aebe0fb
+Author: Guy Harris <gharris@sonic.net>
+Date:   Fri Jun 4 14:48:24 2021 -0700
+
+    file-pcapng: fix name of expert info.
+    
+    The entry was copied and pasted, and the variable name and descriptive
+    text were changed, but the field name wasn't.
+    
+    
+    (cherry picked from commit deb6786ed455fa9433caeb4d3c542be4e5918102)
+
+commit 098f9cc672
+Author: Simon Barber <simon.barber@meraki.net>
+Date:   Wed Jun 2 21:47:03 2021 +0000
+
+    ieee80211_radio: Use calculated bitrate if not supplied
+    
+    For 802.11n if the bitrate is not supplied then the calculated bitrate is used. This change does the same for 11ac.
+    
+    Sniffer traces taken on recent versions of Macos no longer supply the bitrate for 11ac frames in the RADIOTAP header, this change allows the wireless timeline to work with these traces.
+    
+    Fixes #17419.
+    
+    (backported from commit 5202119239f76af3df20540b35c618d7095c99c6)
+
+commit 87ab6286e2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 2 13:47:15 2021 -0700
+
+    GitLab CI: Add a Debian Stable APT Test job.
+    
+    Copy over the Debian Stable APT Test job from the 3.4 branch, including
+    the dfilter-list artifact.
+
+commit 199b3db65a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jun 2 12:24:49 2021 -0700
+
+    Version: 3.2.14 → 3.2.15
+    
+    [skip ci]
diff --git a/NEWS b/NEWS
index fd5f073bf8..1753c2d83f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,19 @@ Wireshark 3.2.15 Release Notes
 
   Bug Fixes
 
+   The following vulnerabilities have been fixed:
+
+     • wnpa-sec-2021-06[1] DNP dissector crash. Issue 17462[2].
+       CVE-2021-22235[3].
+
    The following bugs have been fixed:
 
+     • No wlan_radio.duration calculated for PHY type: 802.11ac (VHT)
+       Issue 17419[4].
+
+     • NAN Dissector has wrong minimum length for availability attribute
+       Issue 17431[5].
+
   New and Updated Features
 
    There are no new features in this release.
@@ -21,9 +32,12 @@ Wireshark 3.2.15 Release Notes
 
   Updated Protocol Support
 
+   DNP, GTPv2, IEEE 802.11 Radio, NAN, NR RRC, OSPF, pcapng, PNIO, RSL,
+   and Snort config
+
   New and Updated Capture File Support
 
-   There is no new or updated capture file support in this release.
+   Catapult DCT2000, ERF, and pcap
 
  Getting Wireshark
 
@@ -35,7 +49,7 @@ Wireshark 3.2.15 Release Notes
    Most Linux and Unix vendors supply their own Wireshark packages. You
    can usually install or upgrade Wireshark using the package management
    system specific to that platform. A list of third-party packages can
-   be found on the download page[1] on the Wireshark web site.
+   be found on the download page[6] on the Wireshark web site.
 
  File Locations
 
@@ -49,22 +63,27 @@ Wireshark 3.2.15 Release Notes
   The User’s Guide, manual pages and various other documentation can be
   found at https://www.wireshark.org/docs/
 
-  Community support is available on Wireshark’s Q&A site[2] and on the
+  Community support is available on Wireshark’s Q&A site[7] and on the
   wireshark-users mailing list. Subscription information and archives
-  for all of Wireshark’s mailing lists can be found on the web site[3].
+  for all of Wireshark’s mailing lists can be found on the web site[8].
 
-  Issues and feature requests can be reported on the issue tracker[4].
+  Issues and feature requests can be reported on the issue tracker[9].
 
  Frequently Asked Questions
 
-  A complete FAQ is available on the Wireshark web site[5].
+  A complete FAQ is available on the Wireshark web site[10].
 
-  Last updated 2021-07-11 09:56:03 UTC
+  Last updated 2021-07-14 16:31:08 UTC
 
  References
 
-   1. https://www.wireshark.org/download.html#thirdparty
-   2. https://ask.wireshark.org/
-   3. https://www.wireshark.org/lists/
-   4. https://gitlab.com/wireshark/wireshark/-/issues
-   5. https://www.wireshark.org/faq.html
+   1. https://www.wireshark.org/security/wnpa-sec-2021-06
+   2. https://gitlab.com/wireshark/wireshark/-/issues/17462
+   3. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22235
+   4. https://gitlab.com/wireshark/wireshark/-/issues/17419
+   5. https://gitlab.com/wireshark/wireshark/-/issues/17431
+   6. https://www.wireshark.org/download.html#thirdparty
+   7. https://ask.wireshark.org/
+   8. https://www.wireshark.org/lists/
+   9. https://gitlab.com/wireshark/wireshark/-/issues
+  10. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc
index 50d12a7128..fe38ea386a 100644
--- a/docbook/release-notes.adoc
+++ b/docbook/release-notes.adoc
@@ -29,7 +29,7 @@ The following vulnerabilities have been fixed:
 * wssalink:2021-06[]
 DNP dissector crash.
 wsbuglink:17462[].
-// cveidlink:2021-xxxx[].
+cveidlink:2021-22235[].
 // Fixed in master: 029a7fcec5
 // Fixed in release-3.4: 490fe2684b
 // Fixed in master-3.2: d9497073c4
diff --git a/wireshark.appdata.xml b/wireshark.appdata.xml
index 722067d8cc..aa6aa5ab1a 100644
--- a/wireshark.appdata.xml
+++ b/wireshark.appdata.xml
@@ -48,6 +48,9 @@
     </screenshots>
     <update_contact>wireshark-dev_at_wireshark.org</update_contact>
     <releases>
+        <release version="3.2.15" date="2021-07-14">
+            <url>https://www.wireshark.org/docs/relnotes/wireshark-3.2.15.html</url>
+        </release>
         <release version="3.2.14" date="2021-06-02">
             <url>https://www.wireshark.org/docs/relnotes/wireshark-3.2.14.html</url>
         </release>