aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-06[Automatic update for 2017-08-06]Gerald Combs12-822/+847
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie6f7676ccde9337cb479e448884b0240e3fd238c Reviewed-on: https://code.wireshark.org/review/22961 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-06simple_dialog.cpp: Fix missed Qt version wrapper.Michael Mann1-0/+2
check_box_ member was missing a #if (QT_VERSION > QT_VERSION_CHECK(5, 2, 0)) wrapper Change-Id: Ibdddbe523b8e15c0af31fddfd3f251c24114d11a Reviewed-on: https://code.wireshark.org/review/22959 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-05Further cleanups.Guy Harris1-11/+32
If a variable is initialized in a loop body or an if clause or a switch clause, declare it inside the loop body/clause, and de-initialize it before leaving the loop body/clause. De-initialize the gnutls_pkcs12_t before leaving rsa_load_pkcs12(), so as not to leak it. Always leave the per-bag loop by "goto done", even if we're not within an inner loop, to make it clearer what we're doing. We initialize the bag structure at the beginning of that loop body; de-initialize it at the end. If we leave the loop without a private key, and we don't have an error message, the error is "we didn't find a PKCS8 key"; report that. Change-Id: I87cf296876c8f1879f69d01ce67ca2829b4f8d16 Reviewed-on: https://code.wireshark.org/review/22958 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-05rsa.c: strerror -> g_strerrorMichael Mann1-2/+2
Pacify checkAPIs.pl Change-Id: I637a6cd678b99d05cd1b26fd3cba6ad4dd19e8d2 Reviewed-on: https://code.wireshark.org/review/22957 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-05QT: Add shortcuts for "Follow XXX Stream"Uli Heilmeier1-0/+12
Add shortcut Ctrl+Alt+Shift+ T for "Follow TCP Stream" U for "Follow UDP Stream" H for "Follow HTTP Stream" S for "Follow SSL Stream" Bug: 13047 Change-Id: I0fdd5b4d20b976b56694821a9c11424eab40b2b3 Reviewed-on: https://code.wireshark.org/review/22930 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-05ZigBee: fix OTA File Version bitfieldJohn Keeping1-4/+4
Commit ffea2f8a24 ("ZigBee: fix endian for File Version field in OTA") fixed the endianness of the file version field but did not update the masks for the sub-elements of this field now that they are compared against the value decoded as little-endian. Change-Id: Icdb9d56cc29da19b9fc26da84979f15936c930d4 Reviewed-on: https://code.wireshark.org/review/22955 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-05Lua: Check for PseudoHeader.noneStig Bjørlykke1-1/+3
Don't dereference pointer when using PseudoHeader.none. Bug: 13944 Change-Id: I4e509269ac4983531912f3f9b2cc6b7cf00fbeae Reviewed-on: https://code.wireshark.org/review/22945 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-05Lua: Fix error message in Dumper:dump()Stig Bjørlykke1-1/+1
Change-Id: I9cdf8ecaf5129a30091b9b4d109f70cfdd7fca1b Reviewed-on: https://code.wireshark.org/review/22946 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-05packet-mq: Improve ECapFlag display + CapFlag3 Add new FlagRobert Grange1-7/+17
Improve dispaly of Error Cap Flags Add new Flag for Cap Flag Misc coding aligmement Change-Id: I9ad593dbe8bcc116057af9a6324f25451bac2a88 Reviewed-on: https://code.wireshark.org/review/22938 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>
2017-08-05Lines being processed are not null terminated, they're counted.Guy Harris1-7/+7
Pass the remaining line length to process_pwd_success(), and don't treat the string passed to it as a null-terminated string, check the length value. Also, make sure the line is long enough before even calling process_pwd_success(). Bug: 13946 Change-Id: I67d015854046bbaaa6f55d4221f314e1446e7398 Reviewed-on: https://code.wireshark.org/review/22943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-04WSDG: Update the Windows docs and add a CMake section.Gerald Combs5-397/+165
Update the Windows section for Visual Studio 2015. Copy the content from README.cmake to its own WSDG section and remove README.cmake. Remove the PowerShell sections. Our required version (2.0) ships with every supported version of Windows. Remove the sed section. Change-Id: Id37c6e71bacc247a3ed1992adb1408ec13f6a187 Reviewed-on: https://code.wireshark.org/review/22940 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-04Fix up indentation.Guy Harris1-1/+1
Change-Id: I99445d9934dbb4c97c4c41192c8fe908441f2843 Reviewed-on: https://code.wireshark.org/review/22942 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-04Clean up private key file error reporting.Guy Harris2-22/+60
Ensure that rsa_load_pem_key() and rsa_load_pkcs12() always return an error message string if they fail, so that 1) they don't return NULL without supplying an error string; 2) they don't supply an error string if they succeed. If either of them fails, report the error; if there's no error string, report an unknown error (that shouldn't happen, but the wsutil/rsa.c code needs more cleanup before I'll believe it can't happen). While we're at it, clean up some of those error strings, return NULL rather than 0 as the failure case from rsa_load_pkcs12() as we do in rsa_load_pem_key() (they mean the same thing, but NULL makes it a bit clearer), and de-initialize the private key structure in rsa_load_pem_key() if we fail (so that we don't leak memory). Change-Id: Id9dd331800d87b017a500a6f579df446057f555b Reviewed-on: https://code.wireshark.org/review/22941 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-04Don't assume that we have a last_command value in an FTP conversation.Guy Harris1-1/+1
Nothing ensures that will be the case, and if we assume it is the case, we can crash. Bug: 13945 Change-Id: I7f6cb47da81efe219e87b06f8def65a332273480 Reviewed-on: https://code.wireshark.org/review/22939 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-04SNMP: add support for USM SHA-2 algorithms (RFC 7860)Olivier Verriest6-415/+219
Generlize the USM handling and add support for HMAC-SHA-2 authentication protocols. Change-Id: I7cca2f24db61620423fded078c680322aff86400 Reviewed-on: https://code.wireshark.org/review/22846 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-04CMake: Don't look in WOW6432Node.Gerald Combs1-1/+0
CMake should check both the 32-bit and 64-bit views automatically. Change-Id: I856814efcd660260c734c7956ad00ee43a8f666f Reviewed-on: https://code.wireshark.org/review/22936 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-04Qt: Fixup the welcome screen stylesheet.Gerald Combs1-20/+22
Pass in a QString argument only when we have a placeholder. Fixes a QString::arg: Argument missing: MainWelcome { ... warning on Windows. Change-Id: I42dd155252bd9fd4f21f0112b62044c7397c9810 Reviewed-on: https://code.wireshark.org/review/22934 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-04proto.c: fix use of proto_tree_add_text(_valist)_internal() with length = -1Pascal Quantin1-10/+6
When using a length of -1, use the tvb remaining length instead of 0. Change-Id: I569e9c9f57531914a3b613c3a6a9bff076fba362 Reviewed-on: https://code.wireshark.org/review/22931 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>
2017-08-04Optimize the "services" dictionaryJoão Valverde7-11758/+6258
Remove assignee and other miscellaneous information that changes more frequently than service name and can be consulted directly in the IANA registry. Allow merging identical transports into a single line for convenience and size/speed optimization (a backward-compatible change). Remove obsolete make-services.pl. Change-Id: I3ecbd1a6a68d87c084d77498a0eeb44b7afdab67 Reviewed-on: https://code.wireshark.org/review/22872 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-04FTP: track current working directory and show as generated fieldMartin Mathieson1-26/+348
Change-Id: Ib43f0a7c96f4a2dfd931224b536a8ff5d17b0a36 Reviewed-on: https://code.wireshark.org/review/22651 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-03extcap: skip custom log if filename is space.Dario Lombardo1-2/+4
Change-Id: I98b890316af05d9c5359dc38a30d07ac55f262fe Reviewed-on: https://code.wireshark.org/review/22932 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-08-02extcap: add debug log file feature to extcap-base.Dario Lombardo7-30/+89
Change-Id: I3bfc9b2fd7b73dcfef52c5101360384d205c0d12 Reviewed-on: https://code.wireshark.org/review/22835 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-08-02MAC LTE: upgrade dissector to v14.3.0Pascal Quantin4-48/+392
Change-Id: Icd3b12b7d89df2050b9365b9b173949a7cdc455a Reviewed-on: https://code.wireshark.org/review/22928 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>
2017-08-02RLC LTE: update header to reflect the correct versionPascal Quantin1-1/+1
Change-Id: Ic9146d4679fc4af0800bbc1bdf40ec54d1809f1a Reviewed-on: https://code.wireshark.org/review/22927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-02PDCP LTE: upgrade dissector to v14.3.0Pascal Quantin1-6/+75
Change-Id: I96d2a9e703f1c9403f09d77e6b8ee06658b9c40f Reviewed-on: https://code.wireshark.org/review/22926 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-02mpeg descriptor: dissect ac3 system a: Respect descriptor lengthMarius Paliga1-0/+14
Bug: 13939 Change-Id: I3fbbbb4e806e0732c2d11a7fd5048528c5f6f328 Reviewed-on: https://code.wireshark.org/review/22923 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-02Added AVP definitions for the following AVPs:Mike Lugo1-0/+35
132017 - Override-Control 132019 - Override-Charging-Action-Parameters 132021 - Override-Charging-Action-Exclude-Rule 132022 - Override-Charging-Parameters 132024 - Override-Rating-Group 132026 - Override-Online 132027 - Override-Offline For reference, page 51: http://www.cisco.com/c/en/us/td/docs/wireless/quantum-policy-suite/R13-0-0/CPS13-0-0MobileConfigurationGuide/bk_Mobile_Config_Guide_chapter_01000.pdf Change-Id: I397dfad5ea0bd7d06d8b06034c44cc676c293416 Reviewed-on: https://code.wireshark.org/review/22925 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>
2017-08-02Distribute macos-setup-brew.sh in the source tarball.Guy Harris1-0/+1
Change-Id: I9521810d7e9d8b3b13f7949256fa409eafd1cc2c Reviewed-on: https://code.wireshark.org/review/22920 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02Remove trailing white space.Guy Harris1-1/+1
Change-Id: I6b650521e86a64526db75f38bfb93ea1b890f6a1 Reviewed-on: https://code.wireshark.org/review/22919 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02Move macosx-setup.sh to tools and remove the "x".Guy Harris4-29/+32
The OS is now called just macOS, and the rest of the setup scripts are in tools, so move this one there as well. Update the documentation to reflect the change. Change-Id: I4d9ebf0797ffe8862e82c4bcfdeec1d2eabae6ae Reviewed-on: https://code.wireshark.org/review/22918 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02Note that newer versions of various distributions won't have these problems.Guy Harris1-5/+9
Change-Id: Ib5f0d9ffe4a2a574c5cc2299271d3c5f9828dede Reviewed-on: https://code.wireshark.org/review/22914 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02macosx-setup.sh doesn't build Qt, it just installs a binary.Guy Harris1-7/+7
Say it builds "as needed". Change-Id: I85ce2062da7f168785d0d22160b8f19b85d554e3 Reviewed-on: https://code.wireshark.org/review/22909 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02Add bcg729.Guy Harris1-0/+52
Change-Id: I5ee7a2a9027f67e003744f3e076429ef2eda0a4b Reviewed-on: https://code.wireshark.org/review/22908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-01Add SpanDSP to the set of libraries to download and install.Guy Harris1-3/+111
Change-Id: I23c22aff1f4fadeaac120e01e5b222d2da5cb1f2 Reviewed-on: https://code.wireshark.org/review/22906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-01Look for Cygwin in one more place.Gerald Combs1-7/+9
Add "HKLM\SOFTWARE\WOW6432Node\Cygwin\setup" to the Cygwin search paths. Change-Id: I302ecea67dd580449b450136c027ac37adf586d3 Reviewed-on: https://code.wireshark.org/review/22893 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-01Update USBPcap to 1.2.0.2Pascal Quantin4-7/+7
Change-Id: I0f318cdd3644ef4eb2195bed3d0bd561dde7f6dc Reviewed-on: https://code.wireshark.org/review/22903 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>
2017-08-01Use g_build_filename() instead, fix indentationJoão Valverde1-6/+3
Change-Id: I459208eed4a76b104bc28aa44ab05374e57043de Reviewed-on: https://code.wireshark.org/review/22873 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-01SMB2: Move the blob offset & length fields Hassan Sultan1-21/+21
from under the security blob since they're physically placed before the blob. Also renamed them to clarify their link to the blob Change-Id: I896ce8eea3f5f41c1887a685247e7fa168cc9061 Reviewed-on: https://code.wireshark.org/review/22823 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-08-01CMS, ESS: regenerate ASN.1 dissectors after g49e920bc21Pascal Quantin2-2/+2
Change-Id: I518e94cba90a4d2ad9f5f3e787279de358adabc5 Reviewed-on: https://code.wireshark.org/review/22901 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-01SNMP: regenerate ASN.1 dissector after g7466880e8aPascal Quantin1-1/+1
Change-Id: Ie6f93ed3c5c98d7a5df8d6fdc678551d53feee71 Reviewed-on: https://code.wireshark.org/review/22900 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-01E212: Check MNC length before trying 3-digits lengthMarius Paliga1-3/+5
Bug: 13935 Change-Id: Ib3f86c7a70d065cf7d5659a2fbc9c34047efcb56 Reviewed-on: https://code.wireshark.org/review/22894 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>
2017-07-31CMake: do not check stack size when compiling with ASan or UBSanPascal Quantin1-3/+7
Instrumentation code increases the stack usage. Let's deactivate the check when compiling with ASan or UBSan as the objective here is not to check the stack consumption and its usage is out of our control. Change-Id: I9d6e269a0d404dc1833183a070fdbbb7fb0446e0 Reviewed-on: https://code.wireshark.org/review/22888 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>
2017-07-31Netflow: Reassemble flows spanning multiple PDUsUli Heilmeier1-1/+30
Flows records can span multiple PDUs (e.g when using TCP). This commit adds the preference to reassemble flows. Bug: 13915 Change-Id: I10eb0d9ee5ff5cc06ff52d0d0c8c468140e0273b Reviewed-on: https://code.wireshark.org/review/22792 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-31gprs-llc: Don't attempt to decode Dummy UI CommandHarald Welte1-0/+13
As explained by 3GPP TS 44.064 Section 6.4.2.2 there are Dummy UI Commands which are never generated by a LLC entity, but nevertheless received by a LLC entity. They are generated by the underlying network-side RLC/MAC entity a as a means to artificially delay the release of a downlink TBF. We introduce a new "llcgprs.dummy_ui" boolean field on which the user can match to filter our such messages, if needed. Change-Id: Ie8fcb42cbd66a7e5b77849f0bc5a3630d0d54a9c Reviewed-on: https://code.wireshark.org/review/22862 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-31IrCOMM: check string length before appending it to itemPascal Quantin1-2/+8
Bug: 13929 Change-Id: I33f3fec77014949fcc15df72c42ffcb25158562f Reviewed-on: https://code.wireshark.org/review/22887 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>
2017-07-31Don't force people to do a Web search to find the header layout.Guy Harris1-0/+4
Change-Id: Ie71db56327e1cb17b46da0d0675e3485bebd2439 Reviewed-on: https://code.wireshark.org/review/22885 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-31Use proto_tree_add_item_ret_uint().Guy Harris1-9/+6
Change-Id: I006bb0f2cf7e215d24c5eaa6f208cdd6d563d36a Reviewed-on: https://code.wireshark.org/review/22883 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-31Add expert infos for too-long or too-short TLVs.Guy Harris1-20/+97
Also, process the packet to the end, even if there are fewer than 3 bytes left; we'll throw an exception if we can't fetch the type and length, which will report the packet as malformed (which it is). Change-Id: Iddd5be4be635553ac77bdb7fe232c2edb0e4404c Reviewed-on: https://code.wireshark.org/review/22882 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-30GSMTAP: Treat PDTCH identical to PACCH (hand into packet-gsm-rlcmac.c)Harald Welte1-0/+1
The RLC/MAC dissector decodes both signalling (PACCH) and data (PDTCH) RLC/MAC blocks, so let's make sure we dispatch both logical channels into that dissector. Change-Id: Ia26a1ba74468a49da071185cc5ee876ade907207 Reviewed-on: https://code.wireshark.org/review/22861 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-30GSMTAP: Proper name for PDTCH (not PDCH)Harald Welte2-2/+2
PDCH is the physical channel name, while PDTCH is one of the logical channels (goether with PTCCH and PACCH) on the PDTCH. Let's call it by its proper name, rather than keeping the misnomer. Change-Id: I724fcfba595c9c861b64a30d5510468ec007424c Reviewed-on: https://code.wireshark.org/review/22860 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 18:49:02 +0000