aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2018-11-20Replace JSON-GLib by custom JSON dumper libraryPeter Wu2-81/+61
The (optional) JSON-GLib library adds dependencies on GObject, GIO. For statically linked oss-fuzz builds it also adds libffi and more. To avoid these dependencies, replace JSON-GLib by some custom code. This allows `tshark -G elastic-mapping` to be enabled by default without extra deps. API design goals of the new JSON dumper library: - Small interface without a lot of abstraction. - Avoid memory allocations if possible (currently none, but maybe json_puts_string will be replaced to improve UTF-8 support). - Do not implement parsing, this is currently handled by jsmn. Methods to open/close array/objects and to set members are inspired by the JsonGlib interface. The interfaces to write values is inspired by the sharkd code (json_puts_string is also borrowed from that). The only observed differences in the tshark output: - JSON-GLib ignores duplicates, json_dumper does not and may produce duplicates and currently print two "ip.opt.sec_prot_auth_unassigned". - JSON-GLib adds a space before a colon (unimportant formatting detail). - (Not observed, but UTF-8 strings will be wrong like bug 14948.) A test was added to catch changes in the tshark output. I also fuzzed json_dumper with libFuzzer + UBSAN/ASAN and fixed an off-by-one error. Change-Id: I0c85b18777b04d1e0f613a3d59935ec59be87ff4 Link: https://www.wireshark.org/lists/wireshark-dev/201811/msg00052.html Reviewed-on: https://code.wireshark.org/review/30732 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20wsutil: rename some wsjson functionsPeter Wu1-1/+1
Rename wsjson_unescape_json_string to json_decode_string_inplace (inspired by the g_base64_decode_inplace name). Rename wsjson_is_valid_json to json_validate (inspired by g_unichar_validate). Ideally json_parse is inlined with its user (sharkd_session.c), but that requires exporting the jsmn_init and jsmn_parse functions... Hence the dependency on jsmn.h remains in wsjson.h. Change-Id: I7ecfe3565f15516e9115cbd7e025362df2da5416 Reviewed-on: https://code.wireshark.org/review/30731 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-19Fix MLE security suite displayRobert Cragie1-2/+2
Security suite 0xff (no security) is displayed incorrectly as 0x7f. Bug: 15288 Change-Id: Ic899ca724a4a958520e34d522c211e5c625d43ce Reviewed-on: https://code.wireshark.org/review/30713 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-19ain:Prettify Carrier and AMAslpID parameters.Anders Broman5-61/+256
Bug: 15285 Change-Id: I34fc67e2faa4c4e53834b257796b3f256239f27a Reviewed-on: https://code.wireshark.org/review/30711 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-19lnpdqp: Get rid of warnings.Anders Broman2-5/+11
Change-Id: Ib38960def1bdefde64b82ba0848c5e13a51189c7 Reviewed-on: https://code.wireshark.org/review/30712 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18packet-mint.c: Rename mint type to mint port and enhance list of ports.Joerg Mayer1-129/+263
Change-Id: Icdf39f23bfcbd711f1b20a6bf7144f9fcff9744e Reviewed-on: https://code.wireshark.org/review/30706 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18s7comm: Add additional syntax ids 0x83 and 0x84 for NCK data accessJuergen Kosel1-4/+11
Beside the standard NCK syntax id 0x82 the ids 0x83 and 0x84 are used for values with metric and inch units. Change-Id: I62bf2d2e583905c9fa90e4e7caa614a6fe6a7155 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de> Reviewed-on: https://code.wireshark.org/review/30674 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18f5ethtrailer: Update for new format trailersJohn Tapparo2-82/+739
Bug: 15284 Change-Id: I062b7d85b31ced6f4e8478cdbf048fc15b0edf5e Reviewed-on: https://code.wireshark.org/review/30671 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-11-18[Automatic update for 2018-11-18]Gerald Combs1-0/+9
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I896204ae8c6e8ca23e75ff9202ff4bc344d023f8 Reviewed-on: https://code.wireshark.org/review/30686 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-17etypes.h: Small whitespace fixesJoerg Mayer1-23/+23
Change-Id: Idd4178eb69bb69adb2df812dda8462e2631101e3 Reviewed-on: https://code.wireshark.org/review/30677 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-11-16RTPS: RTPS 2.3 Domain ID and Domain Tag support.ismaelrti2-3/+37
Added dissection of field PID_DOMAIN_TAG. PID_DOMAIN_ID moved to PID_RTI_DOMAIN_ID and PID_IS_RELIABLE moved to PID_DOMAIN_ID. Change-Id: Ie189b2d2e66b705df202e7ee3e752aea5ddee271 Reviewed-on: https://code.wireshark.org/review/30664 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-16LISP: Switch to proto_tree_add_subtree_format()Lorand Jakab2-37/+7
When the LISP dissector was initially written, it followed a different pattern for adding subtrees with a text label, which needs to be modified while dissecting: proto_tree_add_item() + proto_item_append_text() + proto_item_add_subtree(). This commit updates the code to use the more elegant proto_tree_add_subtree_format() call. Change-Id: Icb6424be3c9cdecbfe9bb5aa2d39f3ad3d1499e0 Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/30655 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-16ZigBee: Fixed incorrect field typeMartin Boye Petersen1-1/+1
Fixed incorrect field type for tariff label in publish tariff information. It is an zigbee octet string, so the first byte indicates the length of the string. Change-Id: Ia90e47a19a3bd1ca7642f5e7ce99377618198f15 Reviewed-on: https://code.wireshark.org/review/30663 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-16gtpv2: Handle different sizes of 8.38 MM Context.Anders Broman1-0/+8
Change-Id: Iaeb795f439a1157bca6d006d2a0bf8fe44703267 Reviewed-on: https://code.wireshark.org/review/30662 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-16Use an enum for compression types in various interfaces.Guy Harris4-6/+6
This: 1) means that we don't have to flag the compression argument with a comment to indicate what it means (FALSE doesn't obviously say "not compressed", WTAP_UNCOMPRESSED does); 2) leaves space in the interfaces in question for additional compression types. (No, this is not part 1 of an implementation of additional compression types, it's just an API cleanup. Implementing additional compression types involves significant work in libwiretap, as well as UI changes to replace "compress the file" checkboxes with something to indicate *how* to compress the file, or to always use some other form of compression). Change-Id: I1d23dc720be10158e6b34f97baa247ba8a537abf Reviewed-on: https://code.wireshark.org/review/30660 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-16TDS: Fix decoding of TDS7 password.Craig Jackson1-9/+24
Fix decoding of the TDS7 password field by treating it as a byte string, not an ASCII string. Also fix another display problem demonstrated by the sample trace. Bug: 15274 Change-Id: I906d6e9499e2e986820e9248604e98051d877bed Reviewed-on: https://code.wireshark.org/review/30653 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-16Use the dump parameters structure for non-pcapng-specific stuff.Guy Harris2-11/+9
Use it for all the per-file information, including the per-file link-layer type and the per-file snapshot length. Change-Id: Id75687c7faa6418a2bfcf7f8198206a9f95db629 Reviewed-on: https://code.wireshark.org/review/30616 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-15CBRS-OIDs: adding Citizens Broadband Radio Service Object IdentifiersMartin Peylo7-0/+425
Used within CBRS X.509 certificates, related certificate requests etc Extracted from - WInnForum CBRS COMSEC TS WINNF-15-S-0065-V2.0.0 https://www.wirelessinnovation.org/assets/work_products/Specifications/winnf-15-s-0065-v2.0.0%20cbrs%20communications%20security%20technical%20specification.pdf - WInnForum CBRS Certificate Policy Document WINNF-17-S-0022 https://www.wirelessinnovation.org/assets/work_products/Specifications/winnf-17-s-0022%20v1.0.0%20cbrs%20pki%20certificate%20policy.pdf Change-Id: I7ee5246bb15214d37cd566f8b2beadeb0a2bce01 Reviewed-on: https://code.wireshark.org/review/30642 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14LISP: Fix action bits decodingLorand Jakab1-1/+7
Change-Id: I76f5e10fbc5ca0071d1444e31ce4c8fba639c3bc Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/30630 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14nas5gs: Update AMF in 5GS mobile identity.Anders Broman1-12/+14
Change-Id: I6e2f2c259b9aed3073b322b8a3301ce8acfd79c6 Reviewed-on: https://code.wireshark.org/review/30629 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14DOCSIS: both TLV 43 and 44 need VSIF encodingsBruno Verstuyft2-3/+39
Change-Id: Ide8fe96de05423fed135797988dd620b92e9cddc Reviewed-on: https://code.wireshark.org/review/30628 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14blip: fix memory safety issues and a build failure without zlibPeter Wu1-34/+31
Fix use-after-free of decompress_streams when reloading a capture file. Cleanup the z_stream on capture file closure and simplify the hash key. Fix build in case zlib is not available, remove unnecessary headers and fix the indentation information (tabs instead of spaces). Change-Id: I08268db1b9714cdddfc7f47b496f3e9da518139a Fixes: v2.9.0rc0-2492-ga8c40412d8 ("Added support for the Couchbase BLIP protocol") Reviewed-on: https://code.wireshark.org/review/30626 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jim Borden <jim.borden@couchbase.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14QUIC: Add RETIRE_CONNECTION_ID frame type (draft -15)Alexis La Goutte1-2/+14
Change-Id: If181e89a70044db6d429e2066db6bd8869968ef3 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/30492 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14QUIC: Renumbering ACK and ACK_ECN frame (draft -15)Alexis La Goutte1-28/+107
* create a draft14 (and older) frame type * on ACK_ECN, ECN (ect0, ect1, ecn-ce) are after ACK block Change-Id: I810e32865a00abebbc29611cae5972d51268f476 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/30491 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>
2018-11-14Update MongoDB ObjectID dissector elementDerick Rethans1-8/+20
The MongoDB ObjectID spec traditionally included a "host hash" and "PID" field. These have for a while been treated as random data for the server, and the MongoDB drivers have recently addopted a specification that says the same: https://github.com/mongodb/specifications/blob/master/source/objectid.rst#random-value This patch reorganises the original Host Hash and PID fields under a new "Machine ID" field, to be able to show both the current interpretation of the field, as well as the historical one. Change-Id: Ib25b5552935781bc512fcdadb870ed20838d8808 Reviewed-on: https://code.wireshark.org/review/30604 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-14ieee80211: Avoid decrypting packets two timesMikael Kanstrup3-50/+52
Encrypted packets were decrypted two times. One time to scan for new keys. If no keys were found the decrypted data was simply discarded. Then later on the packet was decrypted again for dissection. Avoid decrypting packets two times by storing the result from first decryption if no key was found. Skip the second attempt. Note though that in the special case where a key was actually found inside an encrypted packet the decryption will still be performed twice. First time decrypt, discover the key, and return the EAPOL keydata. Second time decrypt and return the decrypted frame. Change-Id: I1acd0060d4e1f351fb15070f8d7aa78c0035ce39 Reviewed-on: https://code.wireshark.org/review/30568 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14ieee80211: Decrypt and dissect EAPOL keydataMikael Kanstrup3-33/+156
Decrypt EAPOL keydata information and have it dissected with the ieee80211 dissector. This is achieved by letting the Dot11Decrypt engine retrieve the EAPOL keydata decrypted while extracting the GTK during 4-way handshake. The ieee80211 dissector then stores the decrypted data in packet proto data so that the wlan_rsna_eapol subdissector can retrieve it for dissection. Change-Id: I2145f47396cf3261b40e623fddc9ed06b3d7e72b Reviewed-on: https://code.wireshark.org/review/30530 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13RTPS: APP_ACK_CONF submessage dissection fixed.ismaelrti1-1/+1
Count field of APP_ACK_CONF submessage was dissected using a signed integer rather than unsigned. That avoids the dissection to be concluded due to a wrong type error. Change-Id: Ie5f85ce5b3d745d74e1b50d96a77560fb854034b Reviewed-on: https://code.wireshark.org/review/30605 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13PKIX1EXPLICIT: Fixing Attribute and AttributeTypeAndValue ASN.1 cnfMartin Peylo3-28/+32
EXPERIMENTAL, this has not been widely validated yet. It is not clear whether there is any deeper sense in how the prior ASN.1 cnf was done. If this is used, it might also be beneficial to rename the double-overloaded "type". Removing pre-existing empty line at the end of packet-pkix1explicit-template.c to comply with coding style requirements. Change-Id: Iaddeb62f8abb8605b182091ea9c64b8f2172a884 Reviewed-on: https://code.wireshark.org/review/30599 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13PKCS10/pkix1explict: adding PKCS#9 OIDsMartin Peylo5-9/+49
Attribute types for use in PKCS #10 certificate requests as specified in PKCS#9 / RFC 2985 A CSR including one of the PKCS#9 OIDs, SubjectAltNames within an pkcs-9-at-extensionRequest, can be generated with the following OpenSSL command line on most Linux systems: openssl req -new -sha256 -nodes -keyout domain.key \ -subj "/C=US/ST=CA/O=Acme, Inc./CN=example.com" \ -reqexts SAN -config \ <(cat /etc/ssl/openssl.cnf \ <(printf "\n[SAN]\nsubjectAltName=DNS:example.com,DNS:www.example.com")) \ -out attr_with_san.csr Change-Id: I5ae4bd782003c65286bbebf41b96d142e4e99a60 Reviewed-on: https://code.wireshark.org/review/30600 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13RTCP: Fix RTCP Floor Control message Sub-type "Floor taken" is displayedAnders Broman1-7/+8
as "Unknown" Bug: 15276 Change-Id: I313f9d98d0c305a1508f465ec99ae98a91d3d9e9 Reviewed-on: https://code.wireshark.org/review/30603 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13PKCS10: Enabling own dissection function for AttributesMartin Peylo3-4/+82
The one in pkix1explicit might be broken, while it might have unexpected side-effects to mess with that. Anyway, RFC 2986 defines the Attribute sequence for PKCS10 directly. Change-Id: I854b5b5fb83322a1302d011c9cd6f2d5c9fc2b78 Reviewed-on: https://code.wireshark.org/review/30585 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13Move the Linux ARPHRD_ types to epan/arptypes.h.Guy Harris4-19/+11
Change-Id: I6fa9593af64e8af1ade4f049ea949989adfd00c7 Reviewed-on: https://code.wireshark.org/review/30595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-13Fix dissection of 802.11+radiotap frames in Linux "cooked" captures.Guy Harris3-16/+67
Those frames *don't* have their link-layer headers stripped, even on PF_PACKET/SOCK_DGRAM captures (hopefully, nobody will consider that a bug and "fix" it). The "hatype" field is the ARPHRD_ value for the adapter, as returned by SIOCGIFHWADDR; in monitor mode, those frames will have an hatype of ARPHRD_IEEE80211_RADIOTAP. Add an "sll.hatype" dissector table, which we check before checking the "sll.ltype" dissector table, and have the radiotap dissector register in that table. We still use the special hack for an hatype of ARPHRD_NETLINK, because, for *those* frames, the "protocol" field of the nominal SLL header is the netlink family, not an Ethertype or anything else that the SLL dissector would handle. Change-Id: If503a7daa9133adf1b8c330ec28c4c824d4f551d Reviewed-on: https://code.wireshark.org/review/30592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-13Don't have _ng versions of the dumper open routines.Guy Harris2-2/+9
Have the routines always take a parameters pointer; pass either null or a pointer to an initialized-to-nothing structure in cases where we were calling the non-_ng versions. Change-Id: I23b779d87f3fbd29306ebe1df568852be113d3b2 Reviewed-on: https://code.wireshark.org/review/30590 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-12Remove obsolete files.Anders Broman2-14/+0
Change-Id: Ibc2f20a895f7aaf4fc5988eb8814124a68dd886e Reviewed-on: https://code.wireshark.org/review/30583 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-11-12IPv6: Fix payload root tree for IPv6 Routing HdrJoão Valverde1-4/+4
We need to pass the original proto_tree pointer to sub-dissectors, not the p_ipv6_pinfo_select_root() return value. Rename the "_tree" argument to follow the existing style and make the code more readable. Bug: 15270 Change-Id: I0322f015abc0d6426d6f05c16c48e928c253c2eb Reviewed-on: https://code.wireshark.org/review/30579 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-12gtpv2: Update RAT types.Anders Broman1-0/+2
Change-Id: Ifb134ce340d847af65bad4dd20d5c453af85d4e1 Reviewed-on: https://code.wireshark.org/review/30582 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-12blip: Use correct guint64 printf modifierStig Bjørlykke1-1/+1
Change-Id: I6e326cc5396467a0f65edbde1148414a10e22df2 Reviewed-on: https://code.wireshark.org/review/30580 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-11-11Added support for the Couchbase BLIP protocolJim Borden2-0/+539
Documentation for the protocol is available at https://github.com/couchbaselabs/BLIP-Cpp/blob/master/docs/BLIP%20Protocol.md Bug: 15212 Change-Id: I2fe947c3af10c53d68c740241466e2de6c4be551 Reviewed-on: https://code.wireshark.org/review/30229 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-11-11PDCP-NR: Show some config highlights in config root and Info column.Martin Mathieson2-0/+31
Also add convenience functions for getting/setting the PDCP-NR struct. Change-Id: Id30d380ecb2910e5f32e08b791657696bb513910 Reviewed-on: https://code.wireshark.org/review/30569 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-10ieee80211: Fix Vendor Specific Fixed Field dissection.Richard Sharpe1-3/+2
Prevent malformed packet exceptions. Bug: 15273 Change-Id: I88c8fe4bf19d1c8ef478068dde8c220afdd33589 Reviewed-on: https://code.wireshark.org/review/30565 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-11-10MMSE: catch length overflows to avoid infinite loop.Jeff Morriss1-1/+13
After fetching a length from the packet ensure those bytes exist to avoid integer overflows by callers (while avoiding having to ensure every caller checks for overflows). Also add a check to ensure the loop in question is progressing through the TVB; report a dissector bug if it doesn't. Bug: 15250 Change-Id: I9434bfe9d530942fd45342690383df2decacdba1 Reviewed-on: https://code.wireshark.org/review/30560 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09Diameter-3gpp: Dissect the SMS inside AVP 3301 SM-RP-UI.Anders Broman3-0/+51
Change-Id: I0f293ea529dce5147eef5bfb9d8d4b39640fd0aa Reviewed-on: https://code.wireshark.org/review/30554 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09ICMP: Add Extended Echo (Probe) RFC8335Uli Heilmeier1-1/+255
Implementing ICMP extended echo (RFC8335) for IPv4. Ping-Bug: 14457 Change-Id: Id7ae6fce88ef43f8b6a62b06285257416acd0a77 Reviewed-on: https://code.wireshark.org/review/30552 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09ieee80211: Dissect RSN GTK and IGTK IEMikael Kanstrup1-6/+88
Change-Id: Ifda4defeb2db72d9f65dce89d6f97bfe09f7f5ad Reviewed-on: https://code.wireshark.org/review/30547 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09isakmp: Free the UAT tables' records using a free callbackVasil Velichkov1-26/+71
Change-Id: Ife44b225337e5c583c722ac62f711ed3ec9cf808 Reviewed-on: https://code.wireshark.org/review/30535 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>
2018-11-09dot11decrypt: Create RC4 decryption and key copy helper functionsMikael Kanstrup3-46/+62
In preparation for decrypting and dissecting EAPOL keydata in ieee80211 dissector move the RC4 decryption and key copy into separate helper functions. Change-Id: I13f3e981038f48526032e263b6eb3c9e3496abbe Reviewed-on: https://code.wireshark.org/review/30546 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-08GTP: fix NR user plane DL data delivery statusPrerit Jain1-5/+16
Change-Id: Ie947ebe5c0a43e4d621203fca13b8af783458cf5 Reviewed-on: https://code.wireshark.org/review/30541 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-08proto.c: increase the number of pre allocated fieldsPascal Quantin1-1/+1
Change-Id: I5b2cb3ae6a9e6ab507f18e6eb5f89a37b2983129 Reviewed-on: https://code.wireshark.org/review/30551 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>