lp://staging/wireshark

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

71977. By Erika Szelleova <email address hidden> on 2018-06-21

Fix in CRC checker for FPP

 fix in the computation of CRC + little change in the dissector - now it
 shows the fields SMD and FRAG_COUNT in the tree correctly

Bug: 14610
Change-Id: I74982ff836f02803843f6b44a0955a4b20f48e43
Reviewed-on: https://code.wireshark.org/review/28286
Petri-Dish: Anders Broman <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71976. By Dhiru Kholia on 2018-06-21

DHCPv6: Improve dissection of packets using HMAC-MD5 authentication

See https://tools.ietf.org/html/rfc3315#section-21.4.1 (Use of the
Authentication Option in the Delayed Authentication Protocol) for
more details.

Sample DHCPv6 authentication .pcap files can be found at,
https://github.com/kholia/my-pcaps

Change-Id: Ife252c4e3c114c865324df26313c6b7d57988e5a
Signed-off-by: Dhiru Kholia <email address hidden>
Reviewed-on: https://code.wireshark.org/review/28334
Reviewed-by: Anders Broman <email address hidden>

71975. By Erika Szelleova <email address hidden> on 2018-06-21

OpcUa: fix in function getExtensionObjectType

The function getExtensionObjectType was not reading the corrects bytes,
this sometimes ended in reading outside the buffer and that way
exception was raised even for correct packets.

Bug: 14465
Change-Id: I5d7d9ca5f43f0afbc93f40487a78709c52f0658a
Reviewed-on: https://code.wireshark.org/review/28328
Petri-Dish: Alexis La Goutte <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71974. By David Kreitschmann <email address hidden> on 2018-06-21

Fix build paths for cmake's Xcode project generator on macOS.

Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched.

One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging.

Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run.

Bug: 11816

Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9
Reviewed-on: https://code.wireshark.org/review/28291
Petri-Dish: Guy Harris <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71973. By Gerald Combs on 2018-06-21

CMake+macOS: Make sure we're using the right Qt tools.

Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the
corresponding path to macdeployqt and use those in osx-app.sh.

Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee
Reviewed-on: https://code.wireshark.org/review/28359
Reviewed-by: Gerald Combs <email address hidden>
Petri-Dish: Gerald Combs <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71972. By Pascal Quantin <email address hidden> on 2018-06-21

NR RRC: upgrade dissector to v15.2.0

Change-Id: Ie7509984d17bf761e96a1d0d079720e91a6a75cf
Reviewed-on: https://code.wireshark.org/review/28355
Petri-Dish: Pascal Quantin <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71971. By Jaap Keuter <email address hidden> on 2018-06-21

WSUG: Document the use of CMake when building on Unix

Change-Id: Ie1781144856ed544736f092abcafa7c08f74c4b0
Signed-off-by: Jaap Keuter <email address hidden>
Reviewed-on: https://code.wireshark.org/review/28347
Reviewed-by: Gerald Combs <email address hidden>
Reviewed-by: Anders Broman <email address hidden>

71970. By Gerald Combs on 2018-06-21

Test: Add sharkd tests.

Change-Id: I0e5049700ab9285196ce6b4567bd2d034529e763
Reviewed-on: https://code.wireshark.org/review/28327
Reviewed-by: Gerald Combs <email address hidden>
Petri-Dish: Gerald Combs <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <email address hidden>

71969. By Erika Szelleova <email address hidden> on 2018-06-20

HTTP: fix in desegmentation of HEAD requests and responses

Previously HTTP message bodies following a HEAD request in the same conversation
were not desegmented, resulting in spurious "Continuation" messages and failure
to reassemble HTTP bodies. Fix this by properly taking the current HTTP message
type (request or response) into account.

Bug: 14793
Change-Id: I1ffb052468cf414b73243447138466aca47db3e6
Reviewed-on: https://code.wireshark.org/review/28312
Petri-Dish: Peter Wu <email address hidden>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <email address hidden>

71968. By Peter Wu on 2018-06-20

travis: remove unnecessary qt5 in PATH for macOS

Since v2.5.0rc0-1101-ged15895221 ("cmake: look for Qt5 from Homebrew on
macOS"), qt5 no longer needs to be in the PATH.

Change-Id: I1edadcb0eec8a38c4f7364353e57f92c80ca400f
Reviewed-on: https://code.wireshark.org/review/28352
Reviewed-by: Gerald Combs <email address hidden>