aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2019-12-20Use g_file_open_tmp within create_tempfileMichael Mann1-1/+0
Much better to use a known library than create it ourselves. Also remove get_tempfile_path as it's not used. Bug: 15992 Change-Id: I17b9bd879e8bdb540f79db83c6c138f8ee724764 Reviewed-on: https://code.wireshark.org/review/34420 Reviewed-by: Tomasz Moń <desowin@gmail.com> Petri-Dish: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-12-19Protobuf: add dissecting protobuf fields as wireshark fields preferences, etc.Huang Qiangxiong1-0/+1
Two enhancements and one fixed bug: 1. Add dissecting protobuf fields as wireshark (header) fields preferences. User can input the full names of protobuf fields or messages in Filter toolbar for searching. 2. Add 'protobuf_field' dissector table. Dissector based on protobuf can register itself to 'protobuf_field' keyed with the full names of fields of BYETS or STRING types. 3. A bug about search MESSAGE or ENUM type in context is fixed. 4. Another small enhancement is adding prefs_set_preference_effect_fields() which can mark a preference that affects fields change (triggering FieldsChanged event). See the linked bug for sample capture file and .proto files. Ping-Bug: 16209 Change-Id: Ibc3c45a6d596a8bb983b0d847dd6a22801af7e04 Reviewed-on: https://code.wireshark.org/review/35111 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-02Add format_size_wmemMichael Mann1-0/+1
It's a "wmem version" of format_size (from wsutil/str_util.h). Also improved the flexibility in formatting of format_size() to handle future needs of format_size_wmem Ping-Bug: 15360 Change-Id: Id9977bbd7ec29375bbac955f685d46e75b0cef2c Reviewed-on: https://code.wireshark.org/review/31233 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-01[Automatic update for 2019-12-01]Gerald Combs1-15/+15
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I3baf4cf43786b1680c02514f10c526cf8dca8536 Reviewed-on: https://code.wireshark.org/review/35269 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-203.1.0 → 3.3.0.Gerald Combs1-1/+1
Change-Id: Ia6217b00741f824b1f6805eb406408802dd5b5a8 Reviewed-on: https://code.wireshark.org/review/35167 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-183.1.1 → 3.1.2.Gerald Combs1-1/+1
Change-Id: Id89e46103f61392653cfdc60ef16d11123fe0928 Reviewed-on: https://code.wireshark.org/review/35128 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-17[Automatic update for 2019-11-17]Gerald Combs1-0/+1
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I5a453e0aeb29491152bce579ba11d65d0b05acc8 Reviewed-on: https://code.wireshark.org/review/35108 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-11dumpcap: Add support for TCP@IPv6 socket capturesJoão Valverde1-0/+1
Bug: 15820 Change-Id: Id32f376190c115b0808ba72e5b63e019e2a70274 Reviewed-on: https://code.wireshark.org/review/35030 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-11-10[Automatic update for 2019-11-10]Gerald Combs1-14/+15
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia72b63b2fca34056e2c18d828526ff896295a9bd Reviewed-on: https://code.wireshark.org/review/35040 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-07epan: Make proto_tree_add_oid* usable from DLLs.Gerald Combs1-0/+3
Prefix proto_tree_add_oid, proto_tree_add_oid_format_value, and proto_tree_add_oid_format with WS_DLL_PUBLIC. Change-Id: Ia3fa8fb762869bb1afa1c1f57a3a5f02aa126a3f Reviewed-on: https://code.wireshark.org/review/35018 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-28wslua: Fix memleak of unregistered ProtoField stringsStig Bjørlykke1-0/+1
If a ProtoField object was created, but not linked to a Proto, then the strings field and all elements (depending on type) would leak. This is a follow-up to g79fef2ae and fixes the real issue in g44870fb1. Change-Id: I01880a92bb20fae45f68c754b07daeb07630deec Reviewed-on: https://code.wireshark.org/review/34872 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Vasil Velichkov <vvvelichkov@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2019-10-14Protobuf: Add show_details preferences. Fix two bugs.Huang Qiangxiong1-0/+1
1. Add show_details preferences. Disable it will hidden names of message/field/enum, field number, and other details. 2. Have only one popup message with all the errors listed, that are found during parsing .proto files. (Buffer errors and print once) Loading .proto files and checking message types of UDP port will be done only when protobuf dissector has been called. 3. Support parsing .proto files in legacy MAC file format (that newline is '\r') or mixed newline (\r + \n) file format. Change-Id: I97bcde000957e4cd1cce98a7f61120d03027423e Reviewed-on: https://code.wireshark.org/review/34736 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-10Revert "CMake: Don't install HTML manuals twice"João Valverde1-2/+1
This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-09CMake: Don't install HTML manuals twiceJoão Valverde1-1/+2
HTML docs are installed to both $docdir and $pkgdatadir. Fix that to install to $docdir only. Change-Id: I115158585b6df9170d9a01249adbc8548df91f14 Reviewed-on: https://code.wireshark.org/review/34640 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-04QUIC: Add Follow QUIC Stream support to Qt and tsharkPeter Wu1-0/+1
The QUIC transport protocol provides a stream, similar to HTTP/2. Make it possible to look at the stream contents. This can be helpful while HTTP/3 support is not yet complete. Known issues that will be addressed in the future: - If a single packet contains multiple streams, then Follow QUIC Stream will wrongly include data from streams other than the selected one. This is tracked by bug 16093 and affects HTTP/2 as well. - The Substream index menu does not properly filter for available stream numbers. If a non-existing stream is selected, then changing to another (potentially valid) index results in the "Capture file invalid." error. As workaround, clear the display filter first. - Follow Stream always selects Stream ID 0 instead of the first or currently selected stream field in a packet. Users should manually update the stream index as needed. Change-Id: I5866be380d58c96f0a71a29abdbd1be20ae3534a Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/34694 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-22Win32: Do not reload TLS keylog file on each packetTomasz Moń1-0/+1
On Windows, fstat() and stat() sets st_dev to different value depending on whether it was called with file handle or file path. If file handle was used, the st_dev is simply the file handle casted to unsigned. If file path was used, then st_dev corresponds to drive letter (A=0, B=1, C=2, ...). Compare the files using the file index information retrieved by GetFileInformationByHandle(). When compiled in configuration that supports FILE_ID_INFO, the code first tries to obtain 128-bit FILE_ID_INFO and if that fails, fallback to GetFileInformationByHandle(). Bug: 16059 Change-Id: I5f8d8d8127337891ef9907c291e550b1d17aabbb Reviewed-on: https://code.wireshark.org/review/34573 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-22Qt, http2: Add Follow HTTP/2 Stream functionalityAlexander Gryanko1-0/+2
The HTTP/2 protocol multiplexes a single TCP connection into multiple independent streams. The Follow TCP output can interleave multiple HTTP/2 streams, making it harder to analyze a single HTTP/2 stream. Add the ability to select HTTP/2 Streams within a TCP stream. Internally, the HTTP/2 dissector now stores the known Stream IDs in a set for every TCP session which allows an amortized O(n) lookup time for the previous/next/max Stream ID. [Peter: make the dissector responsible for clamping the HTTP/2 Stream ID instead of the Qt code, that should permit future optimizations.] Change-Id: I5d78f29904ae8f227ae36e1a883155c0ed719200 Reviewed-on: https://code.wireshark.org/review/32221 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexander Gryanko <xpahos@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-09-15[Automatic update for 2019-09-15]Gerald Combs1-0/+1
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I175cef2c3e0e43854d99f9741f47f07441fcce2c Reviewed-on: https://code.wireshark.org/review/34529 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-08[Automatic update for 2019-09-08]Gerald Combs1-2/+2
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ifff2c6116b57d189f564986caa40e0a25de5233c Reviewed-on: https://code.wireshark.org/review/34472 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-05kafka: Cleanup to use "native" APIs.Michael Mann1-0/+1
Add "native" support for the "zig-zag" version of a varint in proto.[ch] and tvbuff.[ch]. Convert the use of varint in the KAFKA dissector to use the (new) "native" API. Ping-Bug: 15988 Change-Id: Ia83569203877df8c780f4f182916ed6327d0ec6c Reviewed-on: https://code.wireshark.org/review/34386 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-29Add proto_tree_add_item_ret_time_stringMichael Mann1-0/+1
A few dissectors need the functionality of adding a time field to a proto_tree while also needing the "time to string" value (typically to show on a tree above). The functionality to do "get value from tvb and convert to string" was being done in packet-ntp.c. Instead proto_tree_add_item_ret_time_string can be used with various encoding to get the necessary functionality with less code duplication. ENC_TIME_MIP6 was added as a result of the refactoring. ABSOLUTE_TIME_NTP_UTC was added as another potential "base" type for time fields. Change-Id: Ie460c33370b0af59ef60bdab893ce9d6eb23b94f Reviewed-on: https://code.wireshark.org/review/34390 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-20Kafka: include zstd compression in Kafka message batchesPiotr Smolinski1-1/+1
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-19TLS: add mechanism to set the TLS appdata protocolPeter Wu1-0/+1
For use by EAP-TTLS which embeds TLS. Change-Id: I4770d03f912dd75f92878dd74ad830ebb7eb1431 Reviewed-on: https://code.wireshark.org/review/34311 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05Qt: Check filename before importRoland Knall1-0/+1
Before the unzipped files are being copied from the temp directory, they are checked against the stored list of profile names, to ensure, that only allowed files are being imported. Also ensures, that no empty directory exists for the skipped one Bug: 15969 Change-Id: I6ae8c9fb5f63d089d42fc0ef18dbe84baec515a2 Reviewed-on: https://code.wireshark.org/review/34184 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-30Qt: Change from User/System to Personal/Global profile typesStig Bjørlykke1-2/+2
Change the Profile types from User/System to Personal/Global in UI to match the terminology used in About Wireshark -> Folders. This reverts commit 40af4aa93e469d37bd8e712228ecccb07407c3c6. This reverts commit f0cde7ca34a4975370e1b9ded2fee7df266343f6. This reverts commit c37cabe900b9b11e12c8626ca46adc080e465fdb. Change-Id: I9012db6385707754e26a2dadb57f6003f8112f9b Reviewed-on: https://code.wireshark.org/review/34134 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-07-29The next release, introducing those functions, will probably be 3.1.1.Guy Harris1-2/+2
Change-Id: I93557ac0991d4e06269ebec2583607793ce8da70 Reviewed-on: https://code.wireshark.org/review/34130 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-29USBLL: Verify Token/Split packets CRC-5Tomasz Moń1-0/+2
Ping-Bug: 15908 Change-Id: I25aaf772d3d0af2f459a1ad78d8253344ed13f05 Reviewed-on: https://code.wireshark.org/review/34025 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-29Qt: Rename profile global to systemStig Bjørlykke1-2/+2
It's called system profiles in UI so update function names and variables to use the same name. This will increase code readability. Change-Id: I048e9ea85bd6ebab4a2c3ed1c685487ac8f7e40e Reviewed-on: https://code.wireshark.org/review/34116 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-28debian/rules: reduce log spam from asn1 targetPeter Wu1-0/+2
There are 3694 warnings for one of the following two messages: UserWarning: The same field names for different types. Explicit field renaming is recommended. UserWarning: The same type names for different types. Explicit type renaming is recommended. Both warnings are accompanied by some context. Since the packager is unlikely going to address these issues, and CI systems struggle with the size of the generated logs, disable this subset of warnings. The output of `ninja asn1` shrinks from 28191 lines (2.4MiB) to 483 lines (32KiB). Change-Id: I44e9e1ab40f2255136fb1440e3bde2ccc9e55295 Reviewed-on: https://code.wireshark.org/review/34098 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2019-07-27HTTPS In More Places, update some URLs.Guy Harris1-2/+2
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26Tag routines added in 3.0.x releases appropriately.Guy Harris1-2/+2
Change-Id: Ic5ce106d4e61886c71bedb96aa73c951f4cdf355 Reviewed-on: https://code.wireshark.org/review/34090 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26HTTPS (almost) everywhere.Guy Harris2-2/+2
Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26Debian: remove symbolsPascal Quantin1-7/+0
Those functions are defined as inline in proto.h and are not exported functions. The change g76e227bcef had an impact on this check and now they are flagged as missing. Let's remove them. Bug: 15944 Change-Id: I58a0bd41283ce20aa7441ca08173e3d8d469a0ec Reviewed-on: https://code.wireshark.org/review/34088 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot
2019-07-253.1.0 > 3.1.1.Gerald Combs1-1/+1
Change-Id: Idc7ab6cfe38cffa4053d0d8ce710cb95b33aa6ac Reviewed-on: https://code.wireshark.org/review/34084 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-25USBLL: Verify DATA packets CRC-16Tomasz Moń2-0/+2
Ping-Bug: 15908 Change-Id: Idda280545665184aca40c694ea6d639c9317307a Reviewed-on: https://code.wireshark.org/review/34016 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-24Add a routine to fetch raw bytes into a fixed-length buffer as a string.Guy Harris1-0/+1
That's what the remaining calls to tvb_get_nstringz() and tvb_get_nstringz0() are being used to do, even though those routines were not intended for that purpose - the calls are extracting from a text protcool, meaning that the strings are *not* null-terminate in the packet. Strings - even null-terminated ones - should, in almost all cases, be extracted by tvb_get_string_enc() or routines that call it, so that an encoding is specified. In the few cases where we're fetching strings only to be compared to ASCII constants, or to parse as numbers, we can get away with this. Change-Id: I29f0532902c4ade2207de7f06db69c32eafd4132 Reviewed-on: https://code.wireshark.org/review/34072 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-24debian/control: sync downstream wireshark-gtk changesPeter Wu1-8/+9
Add package relations to the deprecated wireshark-gtk package. The transitional package added by "Stop shipping Wireshark's GTK+ GUI" has not been incorporated however. The Standards-Version version bump done in 2.0.5+ga3be9c6-1 (2 Aug 2016) required no changes. Note that both Debian Stretch and Ubuntu 16.04 have debian-policy 3.9.8. Change-Id: Idb6f106ea03d47bcf87ba60f5470754e9ae4369e Reviewed-on: https://code.wireshark.org/review/34047 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-24debian: libwireshark-dev must depend on libwiretap-devGregor Jasny1-1/+2
because wireshark/epan/packet_info.h (libwireshark-dev) depends on wireshark/wiretap/wtap.h (libwiretap-dev) Change-Id: I76eb17c2c0502f4ea53c6ce934aeaea5ff5cfdd9 Reviewed-on: https://code.wireshark.org/review/34046 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-24debian: Add autopkgtest for testing starting GUI and CLIBalint Reczey4-0/+39
Incorporates debian/tests/ changes up to upstream/3.0.0-76-ge634555b61: * Add autopkgtest for testing starting GUI * Add missing autopkgtest dependencies * Use automatic xvfb server number in tests * Use GLX extension in autopkgtest, Qt needs it * Install at-spi2-core in gui autopkgtest to avoid error messages * debian/test/gui: Ignore stderr from wireshark-gtk since upstream deprecated it * debian/tests/gui: Redirect stderr to stdout because Lua prints to stderr * Stop shipping Wireshark's GTK+ GUI Change-Id: I840fa17fb5ac2bc7b4fed36c4286ea97742f7369 Reviewed-on: https://code.wireshark.org/review/28519 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-24debian: Fix permission change in case of local diversionsTopi Miettinen1-1/+1
/usr/bin/dumpcap may be locally diverted to somewhere else, so let's query dpkg-divert for the current location. Change-Id: I4347d390b2c1e94383308d274b113a23bec62f5b Reviewed-on: https://code.wireshark.org/review/34040 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-22helper function to get a payload dissector table's current handleMartin Kaiser1-0/+1
Add a simple helper function to get the dissector handle that's currently selected in a given payload dissector table. We have similar functions already for string and uint dissector tables. Change-Id: Ia1092fe2b8d038bae2b26db99fd08cd9d6979fcd Reviewed-on: https://code.wireshark.org/review/33933 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2019-07-21IEEE80211: handle symbol proprietary tag seperatelyJaap Keuter1-0/+2
The contents of the Symbol Proprietary TLV was assumbed to be the same as the Vendor Specific TLV. This proved not to be the case, at least for Zebra Extreme networks nodes. This change implements the dissection of the format as defined in the bug. Bug: 15909 Change-Id: I4c14dde386d33302d187680f9f09f8b5bb1ef213 Reviewed-on: https://code.wireshark.org/review/34023 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-07-15smb2: add support for decompressionAurelien Aptel1-0/+7
The latest iteration of Microsoft updates to SMB3 added compression to the protocol. This commit implements decompressing and dissecting compressed payloads. The compression algorithms that can be used are "Plain LZ77", "LZ77+Huffman" and "LZNT1" which you can read more about in the [MS-XCA] documentation. This set of algorithm is sometimes referred to as XPRESS. This commit reuses the existing uncompression API scheme already in place with zlib and brotli and adds 3 tvb_uncompress_*() function implemented in: * epan/tvbuff_lz77.c * epan/tvbuff_lz77huff.c * epan/tvbuff_lznt1.c A new function wmem_array_try_index() was added to the wmem_array API to make bound checked reads that fail gracefully. New tests for it have been added as well. Since both reads (tvb) and writes (wmem_array) are bound checked the risk for buffer overruns is drastically reduced. LZ77+Huffman has decoding tables and special care was taken to bound check these. Simplified versions of the implementations were succesfully tested against AFL (American Fuzzy Lop) for ~150 millions executions each. The SMB2/3 dissector was changed to deal with the new transform header for compressed packets (new protocol_id value) and READ request flags (COMPRESSED). Badly compressed or encrypted packets are now reported as such, and the decryption test suite was changed to reflect that. This commit also adds a test capture with 1 packet compressed with each algorithm as returned by Windows Server 2019, along with 3 matching tests in test/suite_dissection.py Change-Id: I2b84f56541f2f4ee7d886152794b993987dd10e7 Reviewed-on: https://code.wireshark.org/review/33855 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-15Add support for the ISO 646 "Basic code table" encoding.Guy Harris1-0/+1
The "Basic code table" in ISO 646 is mostly ASCII, but some code points either 1) have more than one glyph that can be assigned to them or 2) have no glyph assigned to them. National versions choose one of the two glyphs for the code points in group 1) and assign specific glyphs to the code points in group 2); the International Reference Version assigns the same glyphs to those code points as does ASCII. For the "Basic code table" encoding, we map the code points in groups 1) and 2) to a REPLACEMENT CHARACTER; additional encodings can be added for the national versions. Add ENC_ISO_646_IRV (International Reference Version) as an alias for ENC_ASCII. Expand some comments, and add some comments, while we're at it. Change-Id: I4f1b5e426ec193775e919731c5cae1224dc65115 Reviewed-on: https://code.wireshark.org/review/33941 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-07[Automatic update for 2019-07-07]Gerald Combs1-4/+5
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ib32cb52cb8b439802b343ad62420055177ffc211 Reviewed-on: https://code.wireshark.org/review/33859 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-30debian/control: remove unused libtool dependencyPeter Wu1-2/+2
CMake does not need libtool. Change-Id: Ib96c2ad96fbf62aad86536f40f979fe7786cc576 Reviewed-on: https://code.wireshark.org/review/33772 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-23debian: Use proper CC flags when test-compiling with development headersBalint Reczey1-1/+1
Change-Id: Icdc239f490ea648cfbddb6c23edcc0a4b63bbb22 Reviewed-on: https://code.wireshark.org/review/33713 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-06-23debian/rules: remove unused variablesPeter Wu1-5/+0
Neither VERSION nor docdir are used in CMake, remove it. The wheezy workaround was needed to fix build failures with PIE, but since Wheezy is EOL, it can be removed. 'distrelease' can also be removed, but let's keep it in case distro-specific workarounds are needed in the future. Change-Id: I6e8a296112b218ebce79f697bbb1def7c0efdad7 Reviewed-on: https://code.wireshark.org/review/33712 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-06-23asn2wrs: use system lex and yacc from ply if availablePeter Wu2-19/+0
Tested with python-ply 3.11 and Python 3.7.3 on Arch Linux using the 'ninja asn1' command. Bundling lex.py and yacc.py is one distribution method suggested by PLY upstream (https://www.dabeaz.com/ply/README.txt), but since it is also available in many Linux distributions, we could potentially remove it in the future. Windows developers can install it through pip if needed. Change-Id: I9c847072916ee33da49994820b435ec1d7110303 Reviewed-on: https://code.wireshark.org/review/33708 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-06-21debian/control: Update Vcs-{Browser|Git} to point to SalsaBalint Reczey1-2/+2
Fixes Lintian warnings: I: wireshark source: vcs-field-uses-insecure-uri vcs-browser http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/ I: wireshark source: vcs-field-not-canonical http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/ https://anonscm.debian.org/viewvc/collab-maint/ext-maint/wireshark/trunk/ W: wireshark source: vcs-deprecated-in-debian-infrastructure vcs-browser http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/ I: wireshark source: vcs-field-uses-insecure-uri vcs-svn svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk I: wireshark source: vcs-field-not-canonical svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk svn://anonscm.debian.org/collab-maint/ext-maint/wireshark/trunk W: wireshark source: vcs-deprecated-in-debian-infrastructure vcs-svn svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk Change-Id: I81456ec8569ccf2e554efb944b1c84e306c66c41 Reviewed-on: https://code.wireshark.org/review/33678 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>