path: root/ChangeLog

commit 7da618a
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Dec 13 15:10:21 2015 -0800

    Prep for 1.12.9.
    
    Change-Id: I152fc288a3bf4861b2cdf9ceca59e3ba10d2bfaf
    Reviewed-on: https://code.wireshark.org/review/12889
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit d8ed2a8
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Dec 27 08:24:31 2015 -0800

    [Automatic update for 2015-12-27]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I222bc2b24324e40a48a60d8d2fa56b47ae39ec54
    Reviewed-on: https://code.wireshark.org/review/12878
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 67109b1
Author: Martin Kaiser <wireshark@kaiser.cx>
Date:   Wed Dec 23 18:09:10 2015 +0100

    [mp2t] adaptation_field_control for NULL packets should not be 0
    
    just remove the wrong statement, I'll add some expert info later...
    
    Bug: 11921
    Change-Id: I1a4f2e32e9c7c32c54b251445f8750d7c3f5ab6f
    Reviewed-on: https://code.wireshark.org/review/12850
    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
    (cherry picked from commit 1308189348b43e3ec1cfea13bc66060a844edd3d)
    Reviewed-on: https://code.wireshark.org/review/12852

commit 35ae177
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Dec 21 17:50:56 2015 -0800

    Don't use run_and_catch_crashes.
    
    The 1.12 tree doesn't have it.
    
    Change-Id: Idb63bcf061e3e4ced6645f54254b18f350cdf8fb
    Reviewed-on: https://code.wireshark.org/review/12817
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit cc0377b
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Dec 21 14:01:22 2015 -0800

    Don't write out statistics if we don't have any.
    
    We don't know when the capture started or ended (the time stamps of the
    first and last packets aren't necessarily the time when the capture
    started or ended), we don't know how many packets were dropped in the
    capture process, and we don't know how many packets were seen in various
    stages before they were received by whatever software dumped them out as
    text, so we have no statistics to report.
    
    Change-Id: Ic6de25242d2ea536f0f17a1a20a4e05cf03d8416
    Reviewed-on: https://code.wireshark.org/review/12813
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 2052db228c7fa76146517b6c3822ea47f7b3f3de)
    Reviewed-on: https://code.wireshark.org/review/12814

commit 655307e
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Dec 21 13:38:06 2015 -0800

    This now needs the new <wsutil/sha1.h>.
    
    Change-Id: I41d30ecbffae4e83933e02616daf0d09bce9eabe
    Reviewed-on: https://code.wireshark.org/review/12811
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 0a84d89
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Dec 21 12:55:37 2015 -0800

    Always free the decrypted key in AirPDcapDecryptWPABroadcastKey().
    
    If we've allocated it, free it before we return, even if we return an
    error.
    
    Also, zero it out when we allocate it.
    
    Change-Id: I105671074ea007720c0038ec897be7702f486783
    Reviewed-on: https://code.wireshark.org/review/12810
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 0dcd9b1
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Dec 21 12:44:38 2015 -0800

    g_mallocate the encrypted key, but free it in all paths out of the function.
    
    It doesn't need to persist after the function returns.
    
    Change-Id: Ic601a6ef6a0aa0f22f9c8b9a1c586cec95093f27
    Reviewed-on: https://code.wireshark.org/review/12805
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 6ede7d4ba3d7acaf90846618afd0830a57511b64)
    Reviewed-on: https://code.wireshark.org/review/12807

commit 690688d
Author: Alexander Wetzel <alexander.wetzel@web.de>
Date:   Sun Nov 22 14:01:23 2015 +0100

    WPA (IEEE802.11) decryption function cleanups
    
     - Updated AirPDcapPacketProcess function description
     - Try to return better error codes
     - Remove broken/useless return of keys from AirPDcapRsna4WHandshake
    
    Change-Id: I706c129a29016ab1499f1b2fa243da8b70ba6bfb
    Reviewed-on: https://code.wireshark.org/review/12804
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit f42616a
Author: Alexander Wetzel <alexander.wetzel@web.de>
Date:   Sun Nov 1 18:49:42 2015 +0100

    WPA/WPA2 decoding fixes and improvements
    
    - start decoding when we have eapol1+2 packets
      Do not insist on a complete captured handshake, decode what we can.
    
    - more robust way to detect eapol #2 packets
      At least Win 10 is violating the spec on rekey by setting the secure
      bit in #2. Unpatched version shows and handles #2 as #4, breaking
      decoding after rekey.
    
    - fixed eapol rekey key handling
      Inital patch (see https://code.wireshark.org/review/8268)
      is adding redundant keys, since it scans all the time
      and not only once.
    
    - ignore tailing garbage after eapol sections in frame
      See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9065#c8
    
    Included testcase to test decode for incomplete handshakes and eapol2
    packets with secure bit set on rekey.
    
    Change-Id: I5bf8ec442c262e92f2d09b706ec83bc78fec8fec
    Ping-Bug: 9065
    Reviewed-on: https://code.wireshark.org/review/12802
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 3065829
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Wed Oct 7 14:24:56 2015 +0200

    airpdcap: add free_key_string function, fix memleaks
    
    Do not leak the key and SSID. Note that there are still some leaks in
    the GTK UI related to get_wireshark_keys(), but I did not track them
    down.
    
    Caught by LeakSanitizer.
    
    Change-Id: I91308a9cd5d91d601bc778bdf10bfae8254ad2af
    Reviewed-on: https://code.wireshark.org/review/12792
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit bb3c2e5
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Sep 7 22:03:22 2015 -0700

    Move some stuff into the only code path where it's used.
    
    AirPDCapPacketProcess() really does two different things; some of the
    stuff it does in both code paths only needs to be done in one code path.
    Make it so.
    
    Change-Id: Idb231d729150781f323e88ed375c983a3afd2577
    Reviewed-on: https://code.wireshark.org/review/10439
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit f25b8c6784e7dab61e0754159dd3202bda584da9)
    Reviewed-on: https://code.wireshark.org/review/12791

commit 6730ced
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Jun 6 19:29:21 2015 +0200

    airpdcap: fix V512 warning reported by PVS-Studio
    
    A call of the 'memcpy' function will lead to the '& tmp_key' buffer becoming out of range.
    
    Change-Id: I615a6c3e0dab8cfc2d240b6b39cff387e0689f35
    Reviewed-on: https://code.wireshark.org/review/8796
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 99d56fb0f883b07662490644a9459d4ab75baf31)
    Reviewed-on: https://code.wireshark.org/review/12790
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit f96b215
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri Jun 5 15:43:10 2015 +0200

    Fix a few issues reported by PVS-Studio
    
    See http://www.viva64.com/en/b/0328/ for details
    
    Change-Id: I40371db5972ba6ae707116052462f8d1de98c5c4
    Reviewed-on: https://code.wireshark.org/review/12789
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 55a02a0
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun May 10 21:16:47 2015 +0200

    Copy PTK key in its dedicated array, and not at the address of the array
    
    While we are at it, put back some debug logs that were removed in g1439eb6 (otherwise msgbuf is no more initialized)
    
    Change-Id: Ie34c4f2e638bc3ee77a0565446de37a15385dc0d
    Reviewed-on: https://code.wireshark.org/review/8389
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 040641dc598b4d4873171a6700e202f5e8b8c318)
    Reviewed-on: https://code.wireshark.org/review/12788
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit eba5410
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun May 10 11:03:35 2015 -0700

    Don't initialize a variable that's unused before we later set it.
    
    Change-Id: I944cac044a8b091cbe5d85cd63a8c698a82b8559
    Reviewed-on: https://code.wireshark.org/review/8388
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 19aaa18b2cf569523a1e29bfc72e0cbc3f9a9d9d)
    Reviewed-on: https://code.wireshark.org/review/12787

commit 270cb60
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun May 10 11:00:25 2015 -0700

    Pick array sizes based on what they're supposed to hold.
    
    In AirPDcapRsnaPwd2PskStep(), digest[] holds an SSID plus 4 bytes of
    count, so the size is MAX_SSID_LENGTH plus 4, and digest1[] holds an
    SHA-1 digest, so the size is SHA1_DIGEST_LEN.
    
    That makes it a bit clearer why those are the sizes.
    
    Change-Id: I58ed6643f57675375f7f369470d600382323315f
    Reviewed-on: https://code.wireshark.org/review/8387
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 7d4e0c73a3479560b6870f6d3cc7c2bdaab810b3)
    Reviewed-on: https://code.wireshark.org/review/12786

commit 16595d4
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat May 9 23:53:20 2015 -0700

    Add some bounds checks.
    
    Change-Id: I5b0405f814d439c1d5ce329a817475102be483af
    Reviewed-on: https://code.wireshark.org/review/8373
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit be8f9c4cf38594368702eeb0c70e920461a10e6e)
    Reviewed-on: https://code.wireshark.org/review/12785

commit 3ad49f7
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat May 9 19:30:15 2015 -0700

    new_key is used only for TKIP keys; set it only in that part of the code.
    
    Change-Id: I64424731e4d5f94c7b69436b5318b67a14471171
    Reviewed-on: https://code.wireshark.org/review/8372
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit dac801545446180cc593bdd4f13a65488defb6e4)
    Reviewed-on: https://code.wireshark.org/review/12784

commit 239c02b
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat May 9 19:17:57 2015 -0700

    Allocate the unwrapped key in AES_unwrap().
    
    Have it allocate the buffer for the unwrapped key and return a pointer
    to it, rather than having it be handed a buffer for that key.
    
    That makes it a bit easier to validate, in AES_unwrap, that we don't
    write past the end of the buffer.
    
    Change-Id: Id02852c23054b3ed33eeeb383e7aa6cf12d02ed9
    Reviewed-on: https://code.wireshark.org/review/8371
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 1507b4a4170f758d9c1fcd5f9ae9e39c8a801c0b)
    Reviewed-on: https://code.wireshark.org/review/12783

commit b2c9e5a
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat May 9 16:35:45 2015 -0700

    Define the SHA-1 digest length in wsutil/sha1.h and use it.
    
    Hopefully that'll make it a little easier to make sure that we're not
    overflowing arrays.
    
    Change-Id: Id68d304cbae47bce3cd96b87cda4ba7dd6efc7af
    Reviewed-on: https://code.wireshark.org/review/12779
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 854e49e
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri May 8 21:14:10 2015 +0200

    airpdcap: ensure that buffer put on stack is big enough to hold the result of AirPDcapRsnaPwd2PskStep()
    
    g1439eb6 changed AIRPDCAP_WPA_PSK_LEN from 64 bytes to 32 bytes, leading to a stack corruption in AirPDcapRsnaPwd2Psk() function
    
    Change-Id: Ibf51f6749715055cd84906a144214ed44c85256b
    Reviewed-on: https://code.wireshark.org/review/8358
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit db3412051ff3e20526f2f4bbf11271da4d70ef56)
    Reviewed-on: https://code.wireshark.org/review/12778
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit bac021c
Author: deagol <alexander.wetzel@web.de>
Date:   Fri May 1 22:56:50 2015 +0200

    IEEE 802.11: 802.1X (WPA-EAP) rekeying support
    
    This patch extends the existing decryption support for WPA to also
    handle rekeys by checking each decrypted packet for a 4-way-handshake.
    
    Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise
    (WPA-EAP).
    
    For decrypting WPA-EAP secured packets the user must provide all used PMK's
    of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark
    via the existing interface.
    (The capture must have all 4-way-handshakes included also, starting with
    the first unencrypted one.)
    
    Every decrypted unicast packet will habe the used PMK and TK shown in the
    CCMP/TKIP section below the key index in the GUI. Group packets will display the
    GTK instead.
    
    Additionally this fixes a small issue with group rekey handling, so every packet
    can be selected in the GUI in random order, removing the need to manually find
    the correct group keying packets prior to that.
    
    It was tested primary with WPA-CCMP, but TKIP is also working.
    
    One section in the code touch bluetooth 802.1X support. It should do
    exactly the same, but will now also examine all decypted packets for rekeys.
    
    Ping-Bug: 11172
    Change-Id: I19d055581fce6268df888da63485a48326046748
    Reviewed-on: https://code.wireshark.org/review/8268
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    Reviewed-on: https://code.wireshark.org/review/12777
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 8110a70
Author: Martin Kaiser <wireshark@kaiser.cx>
Date:   Sun Dec 20 15:47:28 2015 +0100

    [airpdcap] check the length of the WPA broadcast key we calculated
    
    return an error if our key is shorter than the key type required for the
    encryption method we detected
    
    this check prevents an out-of-bounds memory access when the key is copied
    
    Bug: 11826
    Change-Id: Ic779b5d87aa97a3b2d2b2c92ce12d0fff4a85adc
    Reviewed-on: https://code.wireshark.org/review/12743
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-on: https://code.wireshark.org/review/12771
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

commit 8d9e4aa
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Dec 20 18:21:35 2015 -0800

    Squelch another warning.
    
    Change-Id: I7340954d9ca2fd11a6db2aa7cd5493d870181e23
    Reviewed-on: https://code.wireshark.org/review/12765
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit c9670e334c38f98da485b53bbd09571047836064)
    Reviewed-on: https://code.wireshark.org/review/12767

commit b5ffe6f
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Dec 20 16:41:24 2015 -0800

    Squelch some compiler warnings.
    
    Change-Id: Iee46c43498f42e19dfab0178e80743d35d843d2d
    Reviewed-on: https://code.wireshark.org/review/12762
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit f553431ad0340355885fc9820f5727205c44e7c4)
    Reviewed-on: https://code.wireshark.org/review/12764

commit 71c2d1c
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Dec 20 16:30:39 2015 -0800

    Rename some variables to make it a bit clearer what they are.
    
    rec_length_remaining is the amount of data we haven't already read from
    the record; it starts out as the record length and gets decreased.  It
    is not the length of data in the packet.
    
    Change-Id: I767c3afc4cd78efbe3fe59275001f869454f0263
    Reviewed-on: https://code.wireshark.org/review/12761
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 3a3ddbd
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Dec 20 15:18:37 2015 -0800

    Add bounds checks and fix a length argument.
    
    Before reading the record header of a REC_FRAME{2,4,6} record, make sure
    the record length is >= the length of that header.
    
    Whe calling fix_pseudo_header(), pass the actual length of the packet
    data, not the remaining length of the record (which may include
    padding), so we don't read past the end of the packet data.
    
    Bug: 11827
    Change-Id: I1c63a4cb014c4616ffdd202660e68c576f266872
    Reviewed-on: https://code.wireshark.org/review/12756
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 53a3e53fce30523d11ab3df319fba7b75d63076f)
    Reviewed-on: https://code.wireshark.org/review/12758

commit 916c88e
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Dec 20 08:24:29 2015 -0800

    [Automatic update for 2015-12-20]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Iddacc470de7dc427f9886ee9b526c13c0d4883f8
    Reviewed-on: https://code.wireshark.org/review/12749
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 38da859
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat Dec 19 10:24:47 2015 -0800

    Add missing ERF types, mention another missing type, mention reserved space.
    
    Add the TYPE_COLOR_HASH_POS and TYPE_COLOR_HASH_ETH types, note that
    type 26 has no #define, mention that types 28 through 31 are reserved
    for future record types.
    
    Change-Id: If4280740bb3522cfc5ef79e9136a26ccadcc0bf2
    Reviewed-on: https://code.wireshark.org/review/12730
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit bf25bf9
Author: Anthony Coddington <anthony.coddington@endace.com>
Date:   Thu Nov 19 16:23:53 2015 +1300

    ERF: Add basic no-break support for ERF_TYPE_META.
    
    Update erf_open heuristic to not break when ERF_TYPE_META records are present.
    Remove check for maximum non-pad ERF type and add defines for reserved types.
    No dissection in this commit beyond record type name, this will come later.
    
    Change-Id: Ib2e77edeec5b28234577dede1d8ba51e3c7ddb44
    Reviewed-on: https://code.wireshark.org/review/12727
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 640846b
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Dec 15 17:19:37 2015 -0800

    Report an error if the IP total length is bigger than the containing length.
    
    Change-Id: Ib5990fce89304808a585a99164c0176899acbbb7
    Reviewed-on: https://code.wireshark.org/review/12667
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit a257ede0fa46e5cd9e81313d7a9c9c48294edb9b)
    Reviewed-on: https://code.wireshark.org/review/12669

commit 0880b43
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Dec 15 16:39:27 2015 -0800

    Don't report an error for a non-multiple-of-4 chunk length.
    
    To quote RFC 4960:
    
    Chunk Length: 16 bits (unsigned integer)
    
          This value represents the size of the chunk in bytes, including
          the Chunk Type, Chunk Flags, Chunk Length, and Chunk Value fields.
          Therefore, if the Chunk Value field is zero-length, the Length
          field will be set to 4.  *The Chunk Length field does not count any
          chunk padding.*
    
          Chunks (including Type, Length, and Value fields) are padded out
          by the sender with all zero bytes to be a multiple of 4 bytes
          long.  This padding MUST NOT be more than 3 bytes in total.  The
          Chunk Length value does not include terminating padding of the
          chunk.  However, it does include padding of any variable-length
          parameter except the last parameter in the chunk.  The receiver
          MUST ignore the padding.
    
          Note: A robust implementation should accept the chunk whether or
          not the final padding has been included in the Chunk Length.
    
    so the the chunk is *not* required to include the length of the final
    padding in the chunk, although any padding *between* variable-length
    parameters in the chunk must be included in the length (obviously, as
    it's part of the chunk data).
    
    Change-Id: I691de489ffc800813dc9a6ab59ecc108540512d1
    Reviewed-on: https://code.wireshark.org/review/12666
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit a6c381e
Author: Gerald Combs <gerald@wireshark.org>
Date:   Mon Dec 14 10:45:50 2015 -0800

    Perl: Using "defined(@array)" is deprecated.
    
    Perl deprecated "defined(@array)" long ago and versions >= 5.16.0
    trigger a warning when it's used.
    
    Change-Id: I27195e1afa027449acde3783b07cea52b9ee74e2
    Reviewed-on: https://code.wireshark.org/review/12627
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit ddecc1a
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Oct 31 13:08:11 2014 -0700

    Don't force a verbose build.
    
    That was probably something I put in while debugging.  It can be put
    back - or added to some other make command - as necessary.
    
    Change-Id: I184a5b8537c43c87844e6e75f65dd3c0accde9ac
    Reviewed-on: https://code.wireshark.org/review/5033
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    Reviewed-on: https://code.wireshark.org/review/12601

commit 7f9c86b
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Oct 31 12:27:30 2014 -0700

    Undo my personal disabling of the Qt download/build/install.
    
    I did that because I didn't want to wait a day for Qt to build, but
    didn't intend to make that change in the official source.
    
    In the longer term, we should perhaps change the script to download and
    install a binary package; sadly, their installers can't be made 100%
    command-line and automated, but, well, the CMake installer pops up a
    dialog, too, and if you don't have Java installed, some of the configure
    scripts that check for Java pop up non-blocking "do you want to install
    Java?" dialogs from OS X.
    
    Change-Id: I99781d5e54529955bf9363a7ee9d4122403fa955
    Reviewed-on: https://code.wireshark.org/review/5032
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    Reviewed-on: https://code.wireshark.org/review/12600

commit 1caf362
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Oct 31 12:11:22 2014 -0700

    For OS X, don't rigidly tie the SDK version to the minimum target version.
    
    According to
    
    	https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html#//apple_ref/doc/uid/10000163i-CH1-SW1
    
    the deployment target (minimum target OS version) and SDK version aren't
    necessarily the same and, in fact, Apple typically only ship two SDKs
    with each Xcode release, so if you want to build for 10.6 with the 10.6
    SDK, you have to use a version of Xcode sufficiently old to have the
    10.6 SDK.
    
    Here, we instead search for the oldest SDK for an OS whose version is
    greater than or equal to the deployment target.  Note that this may not
    work for X11-based Wireshark, as the X11 libraries can change
    incompatibly between releases.  (Fortunately, our plan is to kick
    X11-based Wireshark to the curb for OS X, removing a large pile of
    aggravation for users.)
    
    This also requires some fixes when building Qt and gdk-pixbuf, as some
    cases where we were using the minimum OS target version we needed to be
    using the SDK version.
    
    For CMake, we're using its native "deployment target" support for OS X,
    and hope that it will somehow do the right thing.
    
    Change-Id: I801c404311062fd3685014df7fa0b766093fd44d
    Reviewed-on: https://code.wireshark.org/review/12599
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit a07e1df
Author: Stig Bjørlykke <stig@bjorlykke.org>
Date:   Sun Dec 13 13:32:34 2015 +0100

    ui: Read and write correct recent timestamp format
    
    Rewrite to use value_string to ensure correct value strings used,
    to add backward compatibility and to avoid global-buffer-overflow
    in possible future inconsistencies.
    
    This bug was introduced in 2a088c1d when adding new timestamp formats.
    
    Change-Id: Idbf0d176250a7468b4631a106683eba091013f94
    Reviewed-on: https://code.wireshark.org/review/12598
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 37d5b92
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Dec 13 10:05:06 2015 -0800

    Explicitly specify the template for the mktemp command.
    
    Not all versions of mktemp support omitting the template; in particular,
    the one provided by some BSD-flavored OSes don't.
    
    Change-Id: I657e002559dce165c677a473aa10bb17cc506037
    Reviewed-on: https://code.wireshark.org/review/12592
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit e01f8fb3ad4e635a09f8beb88cb1fcc0baeb0232)
    Reviewed-on: https://code.wireshark.org/review/12594

commit ca0e3bf
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Dec 13 08:25:45 2015 -0800

    [Automatic update for 2015-12-13]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I4039d9d8882c5081adc74680b43b70707ae75817
    Reviewed-on: https://code.wireshark.org/review/12590
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 884d49c
Author: Anish Bhatt <anish@chelsio.com>
Date:   Sat Dec 12 13:54:29 2015 -0800

    NBAP : Verify conversation proto data exists before trying to access it
    
    
    Bug 11841
    Change-Id: Ic0dea6491a68a042ddc0f2dbee19739e4568b18c
    Reviewed-on: https://code.wireshark.org/review/12576
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 23379ae3624df82c170f48e5bb3250a97ec61c13)
    Reviewed-on: https://code.wireshark.org/review/12585
    (cherry picked from commit 254731ee05ab663fb79f3431ac0aa141b7065de0)
    Reviewed-on: https://code.wireshark.org/review/12586

commit 6b3755c
Author: Michael Mann <mmann78@netscape.net>
Date:   Fri Dec 11 21:48:58 2015 -0500

    Increase ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT to match ZBEE_ZCL_APPL_EVTALT_COUNT_NUM_MASK, to prevent invalid ett_ array access.
    
    Change-Id: I67e79e97e13081a77bb5202cbbc1e4f1ee872c95
    Reviewed-on: https://code.wireshark.org/review/12556
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit eb0c034f6e4cdbf5ae36dd9ba8e2743630b7bd38)
    Reviewed-on: https://code.wireshark.org/review/12570
    (cherry picked from commit 07dbf78872b7436a05c4cfe412f48dbde24c4eda)
    Reviewed-on: https://code.wireshark.org/review/12571

commit 49e7e7f
Author: Michael Mann <mmann78@netscape.net>
Date:   Fri Dec 11 21:43:53 2015 -0500

    Range check ett_ array access.
    
    Bug: 11830
    Change-Id: I010093f0ee6f876161de0aca24ea5037616d0039
    Reviewed-on: https://code.wireshark.org/review/12555
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 9352616ec9742f2ed3d2802d0c8c100d51ca410b)
    Reviewed-on: https://code.wireshark.org/review/12568
    (cherry picked from commit b11c868857f98ffdf4b2d3dc8ae30d0219278709)
    Reviewed-on: https://code.wireshark.org/review/12569

commit f899e8a
Author: Michael Mann <mmann78@netscape.net>
Date:   Fri Dec 11 22:23:59 2015 -0500

    [RSL] Just return rest of packet if TLV type is unknown
    
    Bug: 11829
    Change-Id: Id31ec9ee970c3a1e1fe64e3bf823f9ab78f7cd9e
    Reviewed-on: https://code.wireshark.org/review/12558
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 2930d3105c3ff2bfb1278b34ad10e2e71c3b8fb0)
    Reviewed-on: https://code.wireshark.org/review/12564

commit 1a44ff1
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Dec 11 17:00:05 2015 -0800

    Clamp zooming so that we don't get zero or negative font sizes.
    
    Those are obviously wrong.
    
    Also, clean up some stuff left over from the GTK+ 1.x days; GTK+ 2.x
    doesn't expose raw XLFD font names, it lets you specify a font by name
    and size, and font_zoom() doesn't determine whether the font is
    resizeable - it just constructs a new font name/size pair and leaves it
    up to its callers to try to load the font, so "there's no such font as
    Wingdings Gothic" and "you can't blow up Fraktur to 10 million points"
    both show up as errors loading the font by name.
    
    Bug: 8854
    Change-Id: I6af142c75c9ebabd1a95308c203f8cb1f36dd82f
    Reviewed-on: https://code.wireshark.org/review/12549
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit b8b77aecc38f8ada88de78939e4d35d0fa535bd4)
    Reviewed-on: https://code.wireshark.org/review/12551

commit 9c62fc6
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
Date:   Fri Dec 11 01:04:13 2015 +0000

    6LowPAN: Check for NHC IPv6 No Next Header
    
    Bug: 11728
    Change-Id: I7b7cc72b4200e53856283e0716383d661a16fa77
    Reviewed-on: https://code.wireshark.org/review/12512
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit e8b8568b7c5d0035a13b6f0dd93a5406ffff0b13)
    Reviewed-on: https://code.wireshark.org/review/12523
    (cherry picked from commit e8ef139d9d2b40b5d076c678ab3330236a66f4dd)
    Reviewed-on: https://code.wireshark.org/review/12524

commit 7d1f775
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Sun Dec 6 19:57:50 2015 +0100

    MIP6: Don't no need to have a another subtree (with wrong length for LLA)
    
    Conflicts:
    	epan/dissectors/packet-mip6.c
    
    Bug: 10627
    Change-Id: Ia6940ef7624a92d453cada6693bcd7f4e145a5b6
    Reviewed-on: https://code.wireshark.org/review/12453
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 0d2fce11894f9e91959341ad9ee38bf9da296547)
    Reviewed-on: https://code.wireshark.org/review/12458
    (cherry picked from commit 29daa1d29496b2d92c1bb8a701e51d962c94715b)
    Reviewed-on: https://code.wireshark.org/review/12465
    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

commit 4e00398
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Dec 6 08:24:34 2015 -0800

    [Automatic update for 2015-12-06]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I84b8de8520e9d18de71b31be7a01171fd14ee075
    Reviewed-on: https://code.wireshark.org/review/12452
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 96d8e98
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Wed Dec 2 09:19:41 2015 +0100

    OSTIP: fix typo found by PVS Studio (V519)
    
    The 'pinfo->clnp_dstref' variable is assigned values twice successively
    
    Change-Id: I02b8ae54728f88c2173b4522d436bd2f7b1b7bc0
    Reviewed-on: https://code.wireshark.org/review/12365
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 1f363e5c4bf493c9581d8a1bdf9fa9796856628a)
    Reviewed-on: https://code.wireshark.org/review/12379
    (cherry picked from commit fd0a18e16b2507b7190fab166c9ec3312a9397f0)
    Reviewed-on: https://code.wireshark.org/review/12380

commit 97452dd
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
Date:   Sat Aug 22 18:31:41 2015 +0100

    Do not treat all unknown IP protocols as unknown IPv6 extension headers
    
    Bug: 9996
    Change-Id: I229260ce668b60a9756cd3f2e343c278ae27c211
    Reviewed-on: https://code.wireshark.org/review/12278
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Petri-Dish: Anders Broman <a.broman58@gmail.com>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit 9f2e4d7
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Dec 1 17:31:25 2015 -0800

    Fix field long name.
    
    (Copy-and-pasteo.)
    
    Add some comments while we're at it.
    
    Change-Id: If03a43203a2ee7fad54b76cbdaf9318768edc1b0
    Reviewed-on: https://code.wireshark.org/review/12354
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit dd74e49166943a8e2345ce0ce0fbcc14c1060915)
    Reviewed-on: https://code.wireshark.org/review/12356

commit ea517f9
Author: Michael Mann <mmann78@netscape.net>
Date:   Tue Dec 1 16:53:34 2015 -0500

    [NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_Size
    
    Bug: 11815
    Change-Id: I107cf90df87bdafa23bd4b81acbc25d98773b223
    Reviewed-on: https://code.wireshark.org/review/12347
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit d2644aef369af0667220b5bd69996915b29d753d)
    Reviewed-on: https://code.wireshark.org/review/12350
    (cherry picked from commit 4c499f54d38b2749a3da634da297c019582ebadd)
    Reviewed-on: https://code.wireshark.org/review/12351

commit 3e1cd49
Author: Michael Mann <mmann78@netscape.net>
Date:   Mon Nov 30 23:42:33 2015 -0500

    [NBAP] Prevent crash.
    
    If no previous conversation exists, a memcpy will try to copy from NULL destination.
    
    Bug: 11835
    Change-Id: I445480bb425834c5a918f1ffa148cb83d6c9750c
    Reviewed-on: https://code.wireshark.org/review/12326
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 5b4ada17723ed8af7e85cb48d537437ed614e417)
    Reviewed-on: https://code.wireshark.org/review/12329

commit 9cf09cf
Author: Michael Mann <mmann78@netscape.net>
Date:   Sat Nov 28 16:17:22 2015 -0500

    Fix out-of-bounds read in ascend_seek.
    
    Bug: 11794
    Change-Id: I74517806b119729ae6d9780bbd4bb094701ff05e
    Reviewed-on: https://code.wireshark.org/review/12266
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 338da1c0ea0b2f8595d3a7b6d6c9548f7da3e27b)
    Reviewed-on: https://code.wireshark.org/review/12296
    (cherry picked from commit 7abfa36686850a0d81ef1ef280a181d09e5e639c)
    Reviewed-on: https://code.wireshark.org/review/12297

commit 51ccf92
Author: Michael Mann <mmann78@netscape.net>
Date:   Sat Nov 28 19:08:11 2015 -0500

    Add bounds checking to find_signature.
    
    Bug: 11791
    Change-Id: Ibaa2c16229c1b78818283ba5f954b09f3894dc60
    Reviewed-on: https://code.wireshark.org/review/12270
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 185911de7d337246044c8e99da2f5b4bac74c0d5)
    Reviewed-on: https://code.wireshark.org/review/12294
    (cherry picked from commit e4267dd4d03b81c74cd6bc9f574f3f10936ee354)
    Reviewed-on: https://code.wireshark.org/review/12295

commit 01433a4
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun Nov 29 17:57:02 2015 +0100

    GSM SMS: fix reassembly of UCS2 encoded SMS
    
    Bug: 11809
    Change-Id: I5cbf43cbc9d0f33fa527aef1be4d5105f1d795a7
    Reviewed-on: https://code.wireshark.org/review/12288
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 257938f66c255e2e978d0bf697f1d0e780620d55)
    Reviewed-on: https://code.wireshark.org/review/12291

commit 8194323
Author: Michael Mann <mmann78@netscape.net>
Date:   Sun Nov 29 08:45:28 2015 -0500

    Replace my_dgt_tbcd_unpack with the safer tvb_bcd_dig_to_wmem_packet_str.
    
    Bug: 11797
    Change-Id: Iecca888d68e7710b871fa67af2a1174a294d9594
    Reviewed-on: https://code.wireshark.org/review/12273
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 8f04763
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Nov 29 08:29:44 2015 -0800

    [Automatic update for 2015-11-29]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Idea2b72312a9d3d685b426085a78bcfb06513f54
    Reviewed-on: https://code.wireshark.org/review/12286
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 7adf696
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
Date:   Sat Nov 28 22:53:51 2015 +0000

    IPv6: Fix RPL routing header computed address count if ip6r_len == 0
    
    Bug: 11803
    Change-Id: I6de6a240dee1cfb310c41976853c0c3683b0b80a
    Reviewed-on: https://code.wireshark.org/review/12277
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

commit 5d20997
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Nov 28 14:47:28 2015 +0100

    RSVP: copy all rsvp_request_key info in file scope
    
    This is needed as it is later used for comparisons in the request hash table
    
    Bug: 11793
    Change-Id: I2ee1c894892c6ae88c4eac23237991b547a0983b
    Reviewed-on: https://code.wireshark.org/review/12258
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit fef89fc
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sat Nov 28 10:54:16 2015 +0100

    vwr: fix buffer overrun in getRate
    
    Bug: 11789
    Change-Id: Ieba9f32928b91be5d07b25bf54005155f7cc79f6
    Reviewed-on: https://code.wireshark.org/review/12261
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 135c8f050f7f0145b54d952b38ca73eb0d1060cf)
    Reviewed-on: https://code.wireshark.org/review/12262

commit 644bc78
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Nov 28 11:45:24 2015 +0100

    Diameter: check IPv6 prefix length before copying it in e_in6_addr structure
    
    Bug: 11792
    Change-Id: I37a07044d40f10e9a1a90025d90753fdb3db2278
    Reviewed-on: https://code.wireshark.org/review/12248
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit aaa28a9d39158ca1033bbd3372cf423abbf4f202)
    Reviewed-on: https://code.wireshark.org/review/12252

commit a6e8fc8
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sat Nov 28 01:24:12 2015 +0100

    Add boundary check for 802.11 decryption
    
    Fixed stack-based buffer overflow when the frame length exceeds 8KB.
    
    Bug: 11790
    Change-Id: I20db8901765a7660e587057e955d4fb5a8645574
    Reviewed-on: https://code.wireshark.org/review/12237
    Petri-Dish: Anders Broman <a.broman58@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    (cherry picked from commit 40b283181c63cb28bc6f58d80315eccca6650da0)
    [resolved conflict by accepting comments from v2.1.0rc0-764-g9cd66b2]
    Reviewed-on: https://code.wireshark.org/review/12247

commit 56bb0ac
Author: Michael Mann <mmann78@netscape.net>
Date:   Thu Nov 26 09:09:23 2015 -0500

    [LDAP] Bugfix counting of search results.
    
    Bug: 11761
    Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553
    Reviewed-on: https://code.wireshark.org/review/12184
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit c51f207308d04bda005f84828b59cec4104e4b8f)
    Reviewed-on: https://code.wireshark.org/review/12221
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit d752a7b
Author: Nicolas S. Dade <nic.dade@gmail.com>
Date:   Wed Nov 25 23:24:52 2015 -0800

    L2TP: Correct L2TP over IP SHA1 message digest
    
    It should match the MD5 code, and skip over the 0x00000000 session id
    at the start of tvb.
    
    Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e
    Reviewed-on: https://code.wireshark.org/review/12168
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b)
    Reviewed-on: https://code.wireshark.org/review/12177

commit 39a50f4
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Wed Nov 25 17:53:30 2015 +0100

    SCTP: verify frame pointer before dereferencing it
    
    Bug: 11767
    Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4
    Reviewed-on: https://code.wireshark.org/review/12146
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 2259bf8a827088081bef101f98e4983de8aa8099)
    Conflicts:
    	epan/dissectors/packet-sctp.c
    Reviewed-on: https://code.wireshark.org/review/12174

commit ff0220f
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sun Nov 22 18:16:46 2015 +0100

    Fix buffer overrun in zlib decompression
    
    After updating next_in (to remove the gzip header), avail_in must also
    be updated. Failing to do makes zlib read past the input buffer. In
    theory this would resukt in a buffer overrun of at most double the input
    length, in practice zlib returns as soon as the compression fails (after
    reading a few bytes).
    
    Bug: 11548
    Change-Id: If71691a2846338f46d866964a77cc4e74a9b61dd
    Reviewed-on: https://code.wireshark.org/review/12038
    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    (cherry picked from commit cec0593ae6c3bca65eff65741c2a10f3de3e0afe)
    Reviewed-on: https://code.wireshark.org/review/12138

commit 7f90e4e
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Tue Nov 24 18:44:22 2015 +0100

    VoIP: fix a crash when trying to retrieve the time of a T.38 tapped packet
    
    Rather than trying to retrieve frame_data from the packet number row (while it could be filtered) let's use pinfo
    
    Bug: 11596
    Change-Id: Iadbae7630da012c72b29628384a0825511672692
    Reviewed-on: https://code.wireshark.org/review/12106
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 4245d2b
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Nov 23 21:50:08 2015 -0800

    Fix indentation.
    
    Change-Id: I2a64b9919d257ee0f7a57ba40c33bea1690ae0ad
    Reviewed-on: https://code.wireshark.org/review/12086
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit da8854144d17b197d367e4bb35afd47d24b50b12)
    Reviewed-on: https://code.wireshark.org/review/12088

commit 2c59970
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Nov 23 21:48:04 2015 -0800

    Check *how many* fields sscanf() found.
    
    In the code that parses a GeneralizedTime field, don't assume that all
    fields were found; check the return value from sscanf().
    
    This should clean up a fuzz failure on the 2.0 buildbot:
    
    https://buildbot.wireshark.org/wireshark-2.0/builders/Fuzz%20Test/builds/13/steps/valgrind-wireshark/logs/stdio
    
    Change-Id: I431d7ed69ac1697bd42c22a37ca1451cfc85c94e
    Reviewed-on: https://code.wireshark.org/review/12083
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 921bb07115fbffc081ec56a5022b4a9d58db6d39)
    Reviewed-on: https://code.wireshark.org/review/12085

commit c6efada
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon Nov 23 11:40:42 2015 +0100

    HiSLIP: remove a DISSECTOR_ASSERT
    
    It should not be used for request/response tracking
    
    Change-Id: Ic93884cad5bcea40e082081097575908011871c8
    Ping-Bug: 11752
    Reviewed-on: https://code.wireshark.org/review/12063
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 8fa938d27b7388e6b5881718d45abd3315a0583c)
    Conflicts:
    	epan/dissectors/packet-hislip.c
    Reviewed-on: https://code.wireshark.org/review/12072
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 39e8dcc
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Nov 16 14:33:32 2015 -0800

    Create C handles for pipes before running dumpcap.
    
    If the C handles can't be created, there's no point in running dumpcap.
    
    Catch some more possible _open_osfhandle() failures while we're at it.
    
    Change-Id: I5b805552630034a1eaea2a6d2bfe6039cd6d7727
    Reviewed-on: https://code.wireshark.org/review/11904
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 90bc4af
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Nov 16 11:49:35 2015 -0800

    Catch failure of _open_osfhandle().
    
    This may at least prevent the crash in bug 11702, by not returning
    "success" with bogus file handles of -1, if the opens fail due to
    leaks chewing up all the available slots.  More investigation needs to
    be done to see why we're leaking.
    
    Change-Id: Iaa0fdac415ea1047255d64fa8597529ad31d63d1
    Reviewed-on: https://code.wireshark.org/review/11889
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit 7a801e1
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Nov 15 08:23:01 2015 -0800

    [Automatic update for 2015-11-15]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I51ffb979cc03249d4d2bfb06e6a8699f9f0c5bbb
    Reviewed-on: https://code.wireshark.org/review/11840
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 960ac0b
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Sun Feb 22 12:43:25 2015 +0100

    DNS: Ignore Client Subnet option's data length when > 16
    
    When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy
    
    Issue reported by Boaz
    
    Bug:10988
    Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438
    Reviewed-on: https://code.wireshark.org/review/7308
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 30651ab18b42e666f57ea239e58f3ff3a5e9c4ad)
    Reviewed-on: https://code.wireshark.org/review/11824
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 146485d
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Nov 10 12:00:11 2015 -0800

    Add CMakeLists.txt.user* to .gitignore.
    
    Qt Creator uses CMakeLists.txt.user to store CMake build settings.
    
    Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e
    Reviewed-on: https://code.wireshark.org/review/11700
    Reviewed-by: Gerald Combs <gerald@wireshark.org>
    (cherry picked from commit ec303c13b3f8df1feeae449830f57f20660229eb)
    Reviewed-on: https://code.wireshark.org/review/11710
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

commit 4905d2b
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Nov 8 11:05:56 2015 -0800

    [Automatic update for 2015-11-08]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I8cfa75911e483e0c2216f059678e116d18b0901c
    Reviewed-on: https://code.wireshark.org/review/11645
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit f30de77
Author: Gloria Pozuelo <gloria.pozuelo@bics.com>
Date:   Tue Nov 3 16:49:32 2015 +0100

    GTP sequence number fix for allowing to have sequence number equal to 0
    
    Change-Id: Id8aad52198905eb33ecccf5ace01287954f31d2e
    Reviewed-on: https://code.wireshark.org/review/11526
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 0b3091fa359492a0fe7af50a42a2f70d85377a35)
    Reviewed-on: https://code.wireshark.org/review/11642

commit a91df74
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Nov 7 16:44:47 2015 +0100

    NSIS: clear errors before checking WinPcap uninstall registry entry
    
    Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry
    
    Bug: 10867
    Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5
    Reviewed-on: https://code.wireshark.org/review/11621
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit cdcf27255ab8907e7fe29b4518fca1c4e53202ab)
    Reviewed-on: https://code.wireshark.org/review/11623

commit 61581bb
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Nov 1 08:25:39 2015 -0800

    [Automatic update for 2015-11-01]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I7e6a7d2a417805b783b974edc3e869c0fefa9c3c
    Reviewed-on: https://code.wireshark.org/review/11479
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit e654611
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri Oct 30 19:09:39 2015 +0100

    RPC: fix crash when calling NLMv4 SRT statistics
    
    Packet scope is not valid when called from GUI.
    As master-1.12 does not benefit from the code refactring done in master, we
    cannot use the same solution as in g59f4c1c
    Instead allow to leak a bit of memory by allocating in the epan scope.
    
    Bug: 11654
    Change-Id: Ia896299766f7e132b944af48a210fd44d8412282
    Reviewed-on: https://code.wireshark.org/review/11447
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit 916dfc5
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri Oct 30 14:53:33 2015 +0100

    NLM: fix double memory free when using "Match MSG/RES packets for async NLM" option
    
    Change-Id: I8ac8bbb7830a49c1a0973b16378515b00a1a7b65
    Reviewed-on: https://code.wireshark.org/review/11432
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 8daac4a
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Mon Sep 14 00:33:27 2015 +0200

    spdy: do not overwrite HTTPS registration
    
    Setting a zero port still allows it for selection in the UAT dialog
    while not breaking HTTPS dissection.
    
    (In theory the UAT setting would work. In practice it would still call
    ssl_dissector_add and take over the SSL registration for all tcp/443
    traffic. On removal with ssl_dissector_remove, the HTTPS port is not
    added back again until a restart (or until the HTTPS ports list is
    changed from the default) because the spdy registration overwrites the
    HTTP one...)
    
    Also note that NPN detection for SPDY is not implemented, only ALPN
    detection is supported.
    
    Bug: 10984
    Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254
    Reviewed-on: https://code.wireshark.org/review/10517
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    (cherry picked from commit bb7f7d32688abcbc05e954bf380d5759a0b9bf47)
    Reviewed-on: https://code.wireshark.org/review/11422
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Peter Wu <peter@lekensteyn.nl>

commit 3690d13
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Thu Oct 29 13:53:26 2015 +0100

    EtherCAT: wrong display name
    
    Wireshark is showing 2 consecutive bytes named "SubIdx" in a SDO info request (OpCode = 0x5) and response (OpCode = 0x6). But the second byte should be the "ValueInfo" instead in both request and response.
    
    Issue reported by ThoKu
    
    Bug:11652
    Change-Id: I7f6395208d38e714071de5dbb40e3ddb9829f210
    Reviewed-on: https://code.wireshark.org/review/11397
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 6c9ddbda65408ed15af69d74bfaa881e308f63b2)
    Reviewed-on: https://code.wireshark.org/review/11401

commit b3f977c
Author: Ryan Doyle <ryan@doylenet.net>
Date:   Thu Oct 29 21:28:46 2015 +1100

    pcp: fix reporting of error status in info column
    
    Typo when the dissector was first written. It should have always been
    the offset.
    
    Change-Id: Ica7e88571d3746811b574834cbfa0f91218d573c
    Reviewed-on: https://code.wireshark.org/review/11393
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    (cherry picked from commit caeb5b0c2f461e1d51e914b0ef5e9adecc45dd76)
    Reviewed-on: https://code.wireshark.org/review/11395

commit 78fee11
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Tue Oct 27 15:42:45 2015 +0100

    GVCP: do not try to append register value to info column when READREG_ACK has an error status
    
    Bug: 11639
    Change-Id: I1389b74092138e3b28cf4f0dd2d2c8967ec8ba12
    Reviewed-on: https://code.wireshark.org/review/11310
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 4f22e9937f72a43e53262d0ca3297f686109f4c4)
    Reviewed-on: https://code.wireshark.org/review/11314

commit 488ca33
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Oct 25 08:23:47 2015 -0700

    [Automatic update for 2015-10-25]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Ia161aa78733c6ec056c1281aca4612fde236650f
    Reviewed-on: https://code.wireshark.org/review/11266
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit e197952
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Oct 24 11:32:16 2015 +0200

    SDP: protect against out of bounds access
    
    Change-Id: I4b24441cb26757b639e8113cab18d64c7f07112f
    Ping-Bug: 9887
    Reviewed-on: https://code.wireshark.org/review/11241
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 2ddd92b6f8f587325b9e14598658626f3a007c5c)
    Reviewed-on: https://code.wireshark.org/review/11261

commit 3b42eab
Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date:   Fri Oct 23 10:58:54 2015 -0400

    802.1ah: call subdissectors even when we have no tree.
    
    Otherwise none of the subdissectors are called on the first pass which means
    none of their analysis (which is generally done on the first pass) is going to
    work.
    
    Bug: 11629
    Change-Id: I6fe8d0692e5cf6f5b5fa099d31a91d01cc5c7c68
    Reviewed-on: https://code.wireshark.org/review/11226
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit ae130f114cd61443c8c93e1c9280e027726a0235)
    Conflicts:
    	epan/dissectors/packet-ieee8021ah.c
    Reviewed-on: https://code.wireshark.org/review/11255
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

commit fcdb061
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Oct 24 11:35:02 2015 +0200

    T38: fix a dereference of NULL pointer
    
    Change-Id: I6d0a87e301145f43af0c0ccba44c1dbb2f84adb2
    Ping-Bug: 9887
    Reviewed-on: https://code.wireshark.org/review/11243
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit eb6ccb1b0c4ad02b828652c3fe6e8d51c30a315e)
    Reviewed-on: https://code.wireshark.org/review/11244

commit 41e646e
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun Oct 18 22:44:09 2015 +0200

    AllJoyn: prevent an infinite loop
    
    Display an expert error when the argument is empty
    
    Bug: 11607
    Change-Id: I8682eab8fe1822f784e848220ff90de4eb5e13ff
    Reviewed-on: https://code.wireshark.org/review/11132
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 40caff2d1fb08262c84aaaa8ac584baa8866dd7c)
    Conflicts:
    	epan/dissectors/packet-alljoyn.c
    Reviewed-on: https://code.wireshark.org/review/11140

commit af920d2
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun Oct 18 23:12:30 2015 +0200

    DCOM: ensure to initialize IPv4 variable put on the stack
    
    Bug: 11610
    Change-Id: I920b88ab035ff34e7cff9eab8158aa2dabe2faac
    Reviewed-on: https://code.wireshark.org/review/11134
    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
    (cherry picked from commit d34267d0503a67235bf259fd2f2f2d2bb8b18cf5)
    Reviewed-on: https://code.wireshark.org/review/11136
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit 3ee75b0
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Oct 18 08:42:11 2015 -0700

    [Automatic update for 2015-10-18]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I8d5497b88606f492ce7062f1e741bb9e79013d29
    Reviewed-on: https://code.wireshark.org/review/11131
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 6ba5403
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun Oct 18 10:58:37 2015 +0200

    UMTS FP: fix another out of bounds access
    
    According to NBAP ASN.1, the maximum DCH ID value is 255
    
    Bug: 11606
    Change-Id: Ic5c85a31eb1a84d59f25baaed4afbd040a7852c5
    Reviewed-on: https://code.wireshark.org/review/11126
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 67b6d4f7e6f2117b40957fd51518aa2a3e659002)
    Reviewed-on: https://code.wireshark.org/review/11128

commit 66f27ab
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Oct 17 17:12:46 2015 +0200

    UMTS FP: fix an out of bounds access
    
    Bug: 11602
    Change-Id: I636a5494a0eda5895e856e80424be29f01c758bf
    Reviewed-on: https://code.wireshark.org/review/11117
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 2ae329a47b7f0ac94089c23e79c6b8bc18ba80ea)
    Conflicts:
    	epan/dissectors/packet-umts_fp.c
    Reviewed-on: https://code.wireshark.org/review/11123

commit daa562c
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sat Oct 17 13:28:19 2015 +0200

    NBAP: avoid dereferencing a NULL pointer
    
    Bug: 11602
    Change-Id: I56b9db19eca416c288f36c1f3a4faa7e22b38c8f
    Reviewed-on: https://code.wireshark.org/review/11109
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    (cherry picked from commit 5bf565690ad9f0771196d8fa237aa37fae3bb7cc)
    Conflicts:
    	epan/dissectors/packet-nbap.c
    Reviewed-on: https://code.wireshark.org/review/11116

commit 5fb38a3
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri Oct 16 16:22:07 2015 +0200

    GSM: fix dissection of additional access technology type
    
    Bug: 11599
    Change-Id: I80e92eefd233ad7939f8fdf684727164bd89abf4
    Reviewed-on: https://code.wireshark.org/review/11094
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit b737d7e1b888a06891f6bd78aa58e62f77fb3f94)
    Reviewed-on: https://code.wireshark.org/review/11098

commit 8eb4b31
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Oct 14 13:01:55 2015 -0700

    1.12.8 → 1.12.9.
    
    Change-Id: Ida58dbef0bdca8149f9825ebf2e99e279ebd0b09
    Reviewed-on: https://code.wireshark.org/review/11045
    Reviewed-by: Gerald Combs <gerald@wireshark.org>