Revert "debug smb2_set_dcerpc_file_id"

This reverts commit 8ecf221a84211099d8c693ce242c3f50462050f1.

debug smb2_set_dcerpc_file_id

Change-Id: Ic7b922f0b9dd5305ecb69c7ca7e2525ab7c0e719

Revert "TODO SMB2 NegotiateContext...."

This reverts commit df732a47f554f3ba5ce004405089d0d7fbbaf586.

TODO SMB2 NegotiateContext....

Change-Id: Iff854f2d3824c8bf9f85ce7f160979bc707df222

witness: fix build...

Change-Id: Ia9ff22c5e1002df680054bace65bd754fb774124

rerun pidl

Change-Id: I3c5cb5dccbcf13d7f0c55c47545fe4acd70947dc

witness: FIX for tvb_get_unicode_string -> tvb_get_string_enc

Witness: move packet-dcerpc-witness-cnf.c to witness.cnf

witness: cast to avoid C++ warnings

witness fix for new tvb_get_unicode_string() interface using wmem

FIXUP: add parameter dcerpc_info to functions defined in cnf file

add parameter dcerpc_info to PIDL_dissect_ipv?address()

add parameter dcerpc_info to functions defined in cnf file

run master pidl

Witness: V2 RegisterEx()

Witness: start to implement V2

Witness: fix notify change

Witness: add pidl output

Witness: fix whitespace

Witness: PIDL_dissect_ipv6address()

Witness: fix compiler warnings

Witness: set col_info for interfaceInfo_state

Witness: cleanup cnf

Witness: add move ip to tree_item

Witness: working witness.cnf

Witness: WIP

Witness: track context handles

Witness: enum witness_notifyResponse_type

Witness: bitmap witness_interfaceInfo_flags

FIXUP

Witness: enum witness_interface_state

Witness: interfaceInfo_group_name + ipv4address

Witness: first guess

sq use of epan_memmem...

Change-Id: I03614f37c2687137ec3bb99b7b3982ec956fdee1

sq dissect_verification_trailer

TODO: quick fix

TMP: parse with (wrong) lenght as multiple of 2

sq rpc_sec_veritication_trailer

sq dissect_verification_trailer

guid_to_str...

Change-Id: I1daac5d7c33403a3181777d7da49738fcb340286

dcerpc sec_vt guid_to_ep_str

epan/dissectors/packet-dcerpc.c fix warnings

sec_vt_header: dissect cont_id + opnum

sec_vt_header: dissect call_id

sec_vt_header: dissect drep

DCERPC: factor out proto_tree_add_dcerpc_drep()

WIP: rpc_sec_vt

sec_vt_pcontext

FIXUP: WIP: verification_trailer

FIXUP: sec_vt_command bitmask

sec_vt_bitmask

FIXUP: give names to sec_vt_command's

header field for sec_vt_command_length

give names to sec_vt_command's

add bitmask for sec_vt_command

WIP: verification_trailer

Move Auth padding to the right tree

add WERR_INVALID_STATE

add WERR_TIMEOUT

Add dissector for SMB2_FSCTL_OFFLOAD_READ

Fix dissector of SMB2_FSCTL_PIPE_WAIT

sq FSCTL_PIPE_WAIT

sq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait

WIP: fsctl_pipe_wait

WIP: FSCTL_PIPE_WAIT

TODO needed??? packet-ntlmssp: fix possible segfault and set blob->length so the max value

Add a HACK patch for building a patched kerberos library

Signed-off-by: Matthieu Patou <mat@matws.net>

MIT krb5-1.6 HACK patch

Apply this patch to krb5-1.6.x and build it
with a special prefix that only wireshark will use!

Then start wireshark with a script like this:

-----
metze@SERNOX:~/devel/wireshark/wireshark.git$ cat ~/bin/mxwrap.wireshark.krb5

export LD_LIBRARY_PATH="/home/metze/prefix/mit-krb5-1-6/lib/:$LD_LIBRARY_PATH"
exec /home/metze/devel/prefix/wireshark/bin/wireshark $@
gdb --args /home/metze/devel/prefix/wireshark/bin/wireshark $@
------

The LD_PRELOAD only works if the krb5 library version your system one,
then you just need to replace "libk5crypto.so", otherwise wireshark
needs to all of the custom libraries.

metze

fix for netmon 3.x captures

metze

Revert "HACK setup decryption keys for kerberos session setups smbclient..."

This reverts commit e701801b515a28b997e9013fd1bdfd4c5dbbea26.

HACK setup decryption keys for kerberos session setups smbclient...

Change-Id: I573e44de014ec318998e1bb612c95d877136594f

Fix problems with decryption of GSSAPI-KRB5 encrypted DCE-RPC

packet-smb2: implement SMB2 NegotiateContexts

Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e
Signed-off-by: Stefan Metzmacher <metze@samba.org>

packet-smb2: fix getting the dataoffset in dissect_smb2_write_request()

It's 2 byte only so we need to use tvb_get_letohs().

Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
Signed-off-by: Stefan Metzmacher <metze@samba.org>

packet-smb2: correctly dissect dcerpc traffic over different named pipe handles

Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458
Signed-off-by: Stefan Metzmacher <metze@samba.org>

packet-dcerpc: change transportsalt to guint64

This will be able to hold also SMB2 file ids and maybe other stuff in future.

Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Always set the COMPILE_FLAGS property, so we can always fetch it.

If we aren't adding -Werror, just set it to a null string, so when we
fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it
doesn't fail.

Change-Id: I53858130c025e094ed8d0d975451961506fb1a39
Reviewed-on: https://code.wireshark.org/review/6704
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works.

Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346
Reviewed-on: https://code.wireshark.org/review/6703
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Check whether we can use nmmintrin.h.

If we think the compiler supports SSE 4.2, check whether we can use
nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if
not, disable SSE 4.2 support.

This matches what we do in autotools.

Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab
Reviewed-on: https://code.wireshark.org/review/6702
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Modernize the description of Wireshark given in the RPM info.

The initial suggestions came from Michal Labedzki on
https://code.wireshark.org/review/#/c/4178

Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
Reviewed-on: https://code.wireshark.org/review/6511
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Niels de Vos <devos@fedoraproject.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Get rid of trailing blank.

Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f
Reviewed-on: https://code.wireshark.org/review/6699
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it.

Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.

Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
think the compiler supports compiling for SSE 4.2.

Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
compiler flags - we don't want to build anything else with -msse4.2 by
default, as the only code that uses SSE 4.2 instructions but *only* does
so if the processor supports it is our mempbrk implementation.  (And
*add* it, don't *replace* the existing flags with -msse4.2; that way,
-Werror is left in there as well.)

Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
Reviewed-on: https://code.wireshark.org/review/6698
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Handle CFLAGS disabling SSE 4.2.

When checking whether nmmintrin.h works, add -msse4.2 at the *beginning*
of CFLAGS, so that user (or Gentoo build process) settings with
-mno-sse4.2 override it.

Bug: 10792
Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812
Reviewed-on: https://code.wireshark.org/review/6696
Reviewed-by: Guy Harris <guy@alum.mit.edu>

dsi: fix a trivial bug

Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458
Reviewed-on: https://code.wireshark.org/review/6694
Reviewed-by: Bill Meier <wmeier@newsguy.com>

Move all SigComp functionality to the SigComp dissector.

While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.

Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
Reviewed-on: https://code.wireshark.org/review/6682
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>

HTTP2: fix test failure on Solaris SPARC

Do not make any assumption on the endianness: not all hosts running Wireshark are little endian

Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
Reviewed-on: https://code.wireshark.org/review/6693
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Add DNS stats to release-notes

Remove in NEWS by gca174999

Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
Reviewed-on: https://code.wireshark.org/review/6650
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Remove some dead initializers

Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
Reviewed-on: https://code.wireshark.org/review/6690
Reviewed-by: Bill Meier <wmeier@newsguy.com>

bpdu: Fix minor bug introduced in g188aa9a

Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8
Reviewed-on: https://code.wireshark.org/review/6689
Reviewed-by: Bill Meier <wmeier@newsguy.com>

acn: col_...() shouldn't be called under 'if (tree)'

Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28
Also: remove some dead initializers.
Reviewed-on: https://code.wireshark.org/review/6688
Reviewed-by: Bill Meier <wmeier@newsguy.com>

6lowpan: Fix a few minor bugs; Also: Misc

(Bugs were introduced in gf5e2b42);
Misc:
    Localize a few variables;
    Remove some dead initializers.

Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
Reviewed-on: https://code.wireshark.org/review/6687
Reviewed-by: Bill Meier <wmeier@newsguy.com>

CMake: Use wrapper scripts instead of symlinks.

When building an application bundle, create wrapper scripts at the top
level instead of symlinking to each executable.

Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
Reviewed-on: https://code.wireshark.org/review/6683
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

cattp: Minor tweaks and whitespace changes

Change-Id: I128318ffb385930f00675030227e0048306a9f4c
Reviewed-on: https://code.wireshark.org/review/6684
Reviewed-by: Bill Meier <wmeier@newsguy.com>

CMake: Set an output directory for plugins.

Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.

Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>

HTTP2: Add HPACK decode to test suite

Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142
Reviewed-on: https://code.wireshark.org/review/6415
Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities

Only display dissect of Modem Capabilites when sub option = 5
Actually, it is always display when ftype == special (like sub option = 0)

Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
Reviewed-on: https://code.wireshark.org/review/6519
Reviewed-by: Anders Broman <a.broman58@gmail.com>

NCP2222: fix possible buffer-overflow

Caught by ASAN (thanks Alexis!)

Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
Reviewed-on: https://code.wireshark.org/review/6652
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Bug fix in json dissector that made the heuristic fail.

Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
Reviewed-on: https://code.wireshark.org/review/6674
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: Anders Broman <a.broman58@gmail.com>

ISIS: Making a segregated function for sub-tlv used by multiple tlv

Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
Reviewed-on: https://code.wireshark.org/review/6550
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Possibility -> certainty.

Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28
Reviewed-on: https://code.wireshark.org/review/6678
Reviewed-by: Guy Harris <guy@alum.mit.edu>