summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-02-09Add wmem_map_get_keys.Michael Mann3-0/+35
Mimic functionality of g_hash_table_get_keys Change-Id: I7702854ed771a5b3bf7ea5295a67c42f0f477cdf Reviewed-on: https://code.wireshark.org/review/20039 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-02-09Add wmem_map_stealMichael Mann3-0/+41
Mimic functionality of g_hash_table_steal Change-Id: Iaf4aeef951b60934569143b2d119f782aeefe380 Reviewed-on: https://code.wireshark.org/review/20038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_tree_remove32Michael Mann3-0/+20
Change-Id: Ic79fd0a2a13341dd7ba563cf3a056c51e9d16960 Reviewed-on: https://code.wireshark.org/review/20037 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09dof: free more memory on shutdown.Dario Lombardo1-0/+15
Change-Id: Ic4604cc2f999f4e669af00e37dad9b60cb06e599 Reviewed-on: https://code.wireshark.org/review/19977 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09dissectors: update list of controls in CTDB dissector.Günther Deschner1-20/+184
Note that although some of the controls have been removed from the protocol in upstream CTDB versions they are still present here in order to dissect older protocol variants. Guenther Signed-off-by: Guenther Deschner <gd@samba.org> Change-Id: I67d8f69a7e920f4b1eeed21caab4d2b0b104d669 Reviewed-on: https://code.wireshark.org/review/20023 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-09Add wtap_init to dftest.Michael Mann1-0/+4
Bug: 13387 Change-Id: I7dfae550f814cdc15924357996e2086eea58ecf4 Reviewed-on: https://code.wireshark.org/review/20026 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-02-09Make the capture file's interface description filterableJim Young10-6/+56
This patch introduces the frame.interface_description field. While testing this new functionality it became obvious that we have a non-optimal interaction between the existing cfile.c's cap_file_get_interface_name(), the recently added frame.interface_name field and this new frame.interface_description field. The string returned from cap_file_get_interface_name() may in fact come from one of three different sources: the idb's interface name (if it exists) or the idb's interface description (if that exists) or a default text of "unknown". The string ultimately becomes the rame.interface_name whether or not the idb had an interface name option to begin with. This behavior does not allow one to test for the simple presence of frame.interface_name. The new peer function cap_file_get_interface_description() added by this patch returns NULL instead of "unknown" if the idb does not have an interface description. Should cap_file_get_interface_name() be similarly modified to return NULL if the idb does not have an interface name? Bug: 9781 Change-Id: Ie479f373c5080c004dd22bd88919838feca71e95 Reviewed-on: https://code.wireshark.org/review/19861 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-09Don't duplicate memory for key values when passing into wmem_tree_insert_string.Michael Mann4-4/+4
Change-Id: Ib9d8f23faa7a9f83a975396a1be8f85078223feb Reviewed-on: https://code.wireshark.org/review/20024 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-02-08editcap: handle too short frames in frame comparisonJaap Keuter2-9/+21
With option -I one can ignore the first number of bytes from the frame while doing duplicate frame removal. This doesn't handle shorter frames correctly. Add safeguards for this, and update the help text. Bug: 13378 Change-Id: Ia6b65d0797f4069f0b89fa134114d88d80988211 Reviewed-on: https://code.wireshark.org/review/20004 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-08proto: destroy list on cleanup.Dario Lombardo1-3/+22
Change-Id: Icc46f1078cda4597f5a70760c96b866659092006 Reviewed-on: https://code.wireshark.org/review/20022 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08tap: destroy list on cleanup.Dario Lombardo1-0/+8
Change-Id: I24ab3d07721d338edf910b9fa8864306cbfe9dfa Reviewed-on: https://code.wireshark.org/review/20021 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08dof: add shutdown routine.Dario Lombardo1-0/+16
Change-Id: I91bc792302f61fd8f20fa41ec067534316e26074 Reviewed-on: https://code.wireshark.org/review/19742 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-08addr_resolv: remove leak.Dario Lombardo2-0/+4
Change-Id: If4676b2982efae593084dbe951d8e0bb97189917 Reviewed-on: https://code.wireshark.org/review/19966 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-08sharkd: make the way it returns more similar to other apps.Dario Lombardo1-4/+13
The clean_exit block allows deallocation of memory on exit. Change-Id: I52078f0e4e851b6aa5f34cbbd15eba0a4f37cae0 Reviewed-on: https://code.wireshark.org/review/19940 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08Switch stat tap to use wmem_tree_t instead of (sorted) GSList.Michael Mann9-74/+62
Change-Id: I172167eb20793113562b69d1e0e93a4882200404 Reviewed-on: https://code.wireshark.org/review/20019 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-02-08Switch follow (tables) to use wmem_tree_t instead of (sorted) GSList.Michael Mann4-54/+15
Change-Id: Iabf354d2533ae429c002b115c5de33b592019997 Reviewed-on: https://code.wireshark.org/review/20018 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08Switch rtd and srt tables to use wmem_tree_t instead of (sorted) GSList.Michael Mann16-104/+58
Change-Id: I54fec10801eb8f359414f34bf705767964c9725e Reviewed-on: https://code.wireshark.org/review/20017 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08Switch export objects to use wmem_tree_t instead of (sorted) GSList.Michael Mann7-66/+26
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08xml: replace g_strdup with wmem_strdup.Dario Lombardo1-2/+2
Change-Id: Ib16bd79e117cbb54d1a8d98e79924b6bb20703a8 Reviewed-on: https://code.wireshark.org/review/19943 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08wmem_list: add wmem_list_insert_sorted.Dario Lombardo3-0/+115
This mimics the function g_list_insert_sorted. Change-Id: I6f7ac01155588006662c8c0c138d88cea753868c Reviewed-on: https://code.wireshark.org/review/19978 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-08RSVDv2 support - 1st stageVolodymyr Khomenko2-43/+231
Added META_OPERATION_START (Resize, ConvertToVHDSet) Added META_OPERATION_QUERY_PROGRESS Added QUERY_SAFE_SIZE Minor fixes: Using GUID data type for LinkageID, VirtualDiskId and InitiatorId, not binary blob Fixed length for SVHDX_TUNNEL_OPERATION_HEADER Cosmetic: unused var, code makeup Ping-Bug: 11232 Change-Id: I4ea598367a1c12586501555f4a23d6249057484a Reviewed-on: https://code.wireshark.org/review/19979 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> 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-02-08Qt: Add check for valid profile nameStig Bjørlykke2-2/+14
Add check for a valid profile name in the Profile dialog and disable the Ok button and mark the invalid profile if error. The GTK dialog does not close on errors but the Qt dialog does, so ensure the user is informed beforehand. Change-Id: If31ffe75183066cf49e2b5a082112bfe62d6c06e Reviewed-on: https://code.wireshark.org/review/19995 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-08Fix a comment to match we-run-on-Windows-too reality.Guy Harris1-1/+1
Change-Id: I68a299afd1d8228e7c842f66ffd3b4ee1ffb3798 Reviewed-on: https://code.wireshark.org/review/20014 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-07ldap (asn1): fix indent (use 2 spaces)Alexis La Goutte3-900/+909
Change-Id: I62d3e966928eba75dc26c2c3b6993175fe0f133e Reviewed-on: https://code.wireshark.org/review/19994 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-02-07ssl-utils: add vector length validation for Client HelloPeter Wu3-80/+66
Use ssl_add_vector to process DTLS Cookie, cipher_suites, compression_methods, client_hello_extension_list. Removed some checks (like cipher_suite_length > 0) since (per specification) these must be non-empty (if this is not the case, then at worst an empty tree is visible). Change-Id: I7ab2ef12e210d5878769478c7dfba33a799fb567 Reviewed-on: https://code.wireshark.org/review/19993 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-07Make sure pid_t is defined.Guy Harris1-0/+3
Just as we include <windows.h> on Windows to get HANDLE defined, include <sys/types.h> on UN*X to get pid_t defined. We don't seem to need this (yet) on the master and 2.2 branches, but it looks as if it might be necessary on the 2.0 branch. Do it everywhere. Change-Id: I9535fa9944265746d332f8dc337e42a020b503d3 Reviewed-on: https://code.wireshark.org/review/19998 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-07ui: Write recent file when applying profile changesStig Bjørlykke1-1/+6
Write the recent file for the current profile before copying or renaming the profile to ensure the latest changes are not lost. Change-Id: Ib07881925b398314da0a9b2ec875da7650b84712 Reviewed-on: https://code.wireshark.org/review/19984 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-07TLS13: update NewSessionTicket dissectionPeter Wu4-21/+62
The new ticket_age_add field resulted in a dissector exception. With this fixed, the tls13-18-picotls-earlydata.pcap capture can now be fully decrypted. Also add validation for the ticket length (using ssl_add_vector). Change-Id: I167038f682b47b2d1da020a8f241daaf7af22017 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/19992 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-07TLS13: support Early Data and accept CLIENT_EARLY_TRAFFIC_SECRETPeter Wu3-61/+83
Update "early_data" extension to draft 18 (context field is gone). Add support for "client_early_traffic_secret" to the keylog. Support decryption of 0-RTT data (required handling cipher in Client Hello and handling of "end_of_early_data" alert). Tested with tls13-18-picotls-earlydata.pcap, early data decrypts correctly. (The server data is messed up, but that is possibly the result of broken NewSessionTicket handling which throws a dissector exception and thus breaks the record sequence number.) Ping-Bug: 12779 Change-Id: I9e6aeeb08111d5d977f2c0ab855f14d6d86ca87d Reviewed-on: https://code.wireshark.org/review/19989 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-07[H248 Annex C] hf variable imported from packet-sdp,c is uint16 not intAndersBroman1-1/+1
Change-Id: I8122a88b9b203b9535e8f69f8b71d2e11dc7dac6 Reviewed-on: https://code.wireshark.org/review/19988 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07Update symbolsAndersBroman2-5/+26
Change-Id: I4a868eb276af26ffc38e5c66f47bc9cc32f1d4de Reviewed-on: https://code.wireshark.org/review/19985 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-07Ubuntu 14.04 complains about unititialized variable proto_name_lengthAndersBroman1-1/+1
Change-Id: I325e98c9eeafaa53b5f757f4b8e5e903a31e1cc2 Reviewed-on: https://code.wireshark.org/review/19987 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-07stats_tree: add cleanup function.Dario Lombardo3-1/+21
Change-Id: Iefd264bdd79af172c245c3a30119999cca9d56c0 Reviewed-on: https://code.wireshark.org/review/19976 Reviewed-by: Michael Mann <mmann78@netscape.net> 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-02-07prefs: free memory on cleanup.Dario Lombardo1-0/+2
Change-Id: I723032974e34940715ccde5c3744f8c572c6dfda Reviewed-on: https://code.wireshark.org/review/19895 Reviewed-by: Michael Mann <mmann78@netscape.net> 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-02-07ssl-utils: fix false warning about empty SNIPeter Wu1-0/+5
Server Hello can contain an empty extension, so restore the check. Change-Id: I7d1ccfa113cd8a568def6915a80fd2791fd361df Fixes: v2.3.0rc0-2284-g420b9e061e ("ssl-utils: add length validation for SNI extension") Reviewed-on: https://code.wireshark.org/review/19983 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07.mailmap: Update (of January and February )Alexis La Goutte2-2/+3
Change-Id: If1034d7aad02640adc45b4f276e180433e901e50 Reviewed-on: https://code.wireshark.org/review/19965 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-07Add dissection of Bluetooth 5.0 AE related HCI commandsAllan Møller Madsen2-33/+386
Added the following batch of HCI commands: LE Read Maximum Advertising Data Length LE Read Number of Supported Advertising Sets LE Remove Advertising Set LE Set Periodic Advertising Data LE Set Periodic Advertising Enable LE Set Extended Scan Parameters LE Set Extended Scan Enable LE Extended Create Connection Corrected min/max interval field sizes of LE Set Extended Advertising Parameters command and updated LE Set Extended Advertising Enable command to use subtree for each set. Change-Id: Id9c08189a76a0a4adc89b669b50d832f68a929aa Signed-off-by: Allan Møller Madsen <almomadk@gmail.com> Reviewed-on: https://code.wireshark.org/review/19958 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07Bluetooth: EIR/AD: Add support for LE Features and Channel MapMichal Labedzki2-5/+249
Based on CSS7 specification. Change-Id: Ibf00e3add7fcb1a2b3a22574bb63b0fddaf4adcb Reviewed-on: https://code.wireshark.org/review/19972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07Bluetooth: AD: Add support for AltBeaconMichal Labedzki1-0/+83
Another format of beacon in advertising packet. Based on: https://github.com/AltBeacon/spec User needs to use DecodeAs to use this dissector - any manufacturer's company id may be valid. Change-Id: I5656d9dbb70b648b2fadba7f3b525d38a2fe8e57 Reviewed-on: https://code.wireshark.org/review/19971 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07Adjust startup count for extcap.Gerald Combs2-2/+2
The number of extcap splash items is the number of extcap binaries plus RA_EXTCAP. Change-Id: I9702da5a94e244ddd95a845a67da9302ee41c826 Reviewed-on: https://code.wireshark.org/review/19981 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-02-07GTK: Wrap static preference labels.Gerald Combs4-4/+11
In the GTK+ prefrences dialog, enable wrapping and set a maximum width. This should keep labels from making the dialog unusably wide. Make a couple of enum preferences drop-downs instead of radio buttons. Note that we might want to make the drop-down vs radio button behavior automatic. Change-Id: Ib72a2c8d5cfb99324be86f2218b6d57a395fa22c Reviewed-on: https://code.wireshark.org/review/19980 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-02-06ssl-utils: add length validation for SNI extensionPeter Wu1-25/+39
Add copy of the definition in a comment, remove check for empty extension such that export info can be added if the extension is empty. Remove check for empty HostName, this cannot happen (and is caught by ssl_add_vector). Change-Id: Ie63b97e89dc7254f159abb338b52f5f894a8564d Reviewed-on: https://code.wireshark.org/review/19939 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: add length validation for Cookie extensionPeter Wu1-11/+15
Also adds the definition from TLS 1.3 draft 18 spec. Change-Id: Ic7910874507e76dcbe7ae15aff99c91496a2b590 Reviewed-on: https://code.wireshark.org/review/19938 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: add length validation for renegotiation_info extensionPeter Wu1-13/+17
Add description from spec, remove zero-length extension check since it is not allowed by specification. Change-Id: I4bf85b36d933db3658f7788768fd794b6199187e Reviewed-on: https://code.wireshark.org/review/19937 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: add length validation to NPN extensionPeter Wu1-18/+25
Add the definition from draft 4 as well (which describes the structure in text). Remove the check for zero length name since this is normally not the case (according to draft specification). Change-Id: I72c3f04a5146d4c4fa291383258246d9ba2b14be Reviewed-on: https://code.wireshark.org/review/19936 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: add validation for ALPNPeter Wu1-32/+42
Use ssl_add_vector to ensure that the lengths are checked for validity and that expert info is added when invalid data is encountered. Change-Id: I5d03dce988f695cdc305f1bfff9d19ae90c5f6e2 Reviewed-on: https://code.wireshark.org/review/19935 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06(D)TLS: simplify SignatureAndHashAlgorithm dissectionPeter Wu4-72/+36
Merge the length parsing into the SignatureAndHashAlgorithm vector parsing. Remove extra expert info which are replaced by the generic ones. Tested with a mutated pcap where the signature length field is off by one (too large = expert error, too small = expert warning, as expected). Change-Id: I43350352ae00eb42bbe5c2ee81289fb592b88f86 Reviewed-on: https://code.wireshark.org/review/19933 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: refactor "length" parameter into "offset_end" for extensionsPeter Wu1-52/+48
Change all Hello extension dissector functions to accept the end of the extension rather than the extension length. The changes are quite mechanical: change "ext_len" to "ext_len = offset_end - offset". Remove some "offset += ext_len" to ensure that additional unparsed data is warned for. The intent is that (extension) dissectors can easier check for overflow (offset + 2 < offset_end). Later changes should remove "guint ext_len" with appropriate changes (like replacing by ssl_add_vector). Change-Id: Ic4846e6fd6164685c4704984136f701bec3afa58 Reviewed-on: https://code.wireshark.org/review/19932 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06ssl-utils: add helper for validating Variable Length VectorsPeter Wu2-22/+183
Currently variable length vectors are mostly unchecked with issues ignored (see various "XXX - expert info"). In order to detect possible attacks (and catch dissector issues), add helpers that extract the vector length and that validate that a vector is correctly terminated. Further dissection of a vector stops when not enough data is available. The KeyShare extension and Extension itself are modified as a start, more should follow. Future work should also ensure that the return value represents the length after dissection (which should not exceed the length). Also, the length field needs to be converted to an "offset_end" value to ease overflow checking (length = offset_end - offset). Change-Id: I6d757da2eb028f08a7b18661660313a6afd417e0 Reviewed-on: https://code.wireshark.org/review/19926 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-06Bluetooth: Update Assign NumbersMichal Labedzki1-65/+205
Updated on 5th February 2017: - UUIDs - Company Ids Change-Id: I9868891ee2bdcdaa687bd45c76429f2b476889cc Reviewed-on: https://code.wireshark.org/review/19973 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-09 06:12:49 +0000