aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2017-08-27[Automatic update for 2017-08-27]Gerald Combs1-1/+1
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia4e22a8679dc08ee4f260fe6168678f7dd11f2eb Reviewed-on: https://code.wireshark.org/review/23224 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-20[Automatic update for 2017-08-20]Gerald Combs19-75/+1729
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I676dc2814760f711a3d3b8b4979ef8a0077e26a1 Reviewed-on: https://code.wireshark.org/review/23141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-13[Automatic update for 2017-08-13]Gerald Combs19-2065/+227
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie0e554e42e96a8b8f8c8ce7f4a9ea615276b49fb Reviewed-on: https://code.wireshark.org/review/23056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-12Sync some CMake and Autotools install behaviors.Gerald Combs1-1/+1
Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 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: Michael Mann <mmann78@netscape.net>
2017-08-10debian: Update symbolsAlexis La Goutte2-0/+5
Change-Id: I21d6dbadb78367f58dce09f97bb6e41ab81ec67a Reviewed-on: https://code.wireshark.org/review/23011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-07debian: Update PO files about debconf templatesBalint Reczey20-230/+2156
Change-Id: I2880957bcff90f8fba3d5c880f7e059589191e84 Reviewed-on: https://code.wireshark.org/review/22978 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-07debian: Use debconf messages instead of "echo" in postinst/postrmBalint Reczey3-8/+50
Change-Id: Ice41c3a723c2606c047ad59a1fde17dfe65f3ce7 Signed-off-by: Balint Reczey <balint.reczey@canonical.com> LP: #1687344 Reviewed-on: https://code.wireshark.org/review/22968 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-07debian: Make d/copyright machine-readableBalint Reczey1-401/+259
The machine-readable format is recommended by the Debian Policy Manual: https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightformat It also allows uscan to omit files from repacked upstream tarballs. In wireshark package's case it allows removing the debian/ directory from the tarball. Change-Id: I0d56efaff26bb61048de795e109c9f5d26cbffc4 Signed-off-by: Balint Reczey <balint.reczey@canonical.com> Reviewed-on: https://code.wireshark.org/review/22969 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-08-07debian: Update symbolsAlexis La Goutte2-1/+8
Change-Id: Id65e57766d8f31615f210cfe8ac3e03a16f180c8 Reviewed-on: https://code.wireshark.org/review/22987 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-07debian: Refresh patchesBalint Reczey3-6/+6
Change-Id: Ib31e658cfa87f31fad9750f1ba2cf326d0944689 Signed-off-by: Balint Reczey <balint.reczey@canonical.com> Reviewed-on: https://code.wireshark.org/review/22970 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-06debian: Fix typo in d/controlBalint Reczey1-1/+1
Change-Id: Iaec804825f3d85b4b6ed4fa82300cd41849ed23d Reviewed-on: https://code.wireshark.org/review/22966 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2017-07-21ENIP: Add support for CIP Security Information in ListIdentityMichael Mann1-0/+3
Add tfs_open_closed to general tfs collection (tfs.[ch]) Change-Id: I79b22b591128c33084489880842e19e9a0d80560 Reviewed-on: https://code.wireshark.org/review/22730 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-07-09Don't use uint_to_str_back when you need guint32_to_str_buf.Michael Mann1-0/+2
It will end up eventually crashing column buffers because memory behind the address is trounced. Change-Id: Id6b5a42effc503e4b8bf5e1deb2135241e2893f3 Reviewed-on: https://code.wireshark.org/review/22563 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-09tfs: Add up downAlexis La Goutte1-0/+1
Change-Id: Ifb7354bbbc639b4191f611c7840094f16e1f6819 Reviewed-on: https://code.wireshark.org/review/22566 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-07-086LoWPAN: added dissection for 6LoRH. (RFC8138, RFC8025)Jonathan Munoz1-0/+1
Change-Id: I13396077ec7f3ec4fe9cfea9b3bd03305a5ee332 Reviewed-on: https://code.wireshark.org/review/22484 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-03Replace and remove enterprises_lookup_format()João Valverde1-1/+0
Change-Id: I27517bdfc4d00ee758d3795bd74e54968e70efad Reviewed-on: https://code.wireshark.org/review/22497 Reviewed-by: João Valverde <j@v6e.pt> 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-06-26Parse enterprise-numbers at run timeJoão Valverde2-24/+4
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26Convert filter expressions preference data to a UAT.Michael Mann1-2/+0
The filter expressions data was shoved into the preference file in a very loose, non-arrayed form. It's much easier to manage in code (and for users in a separate file) as a UAT. The GTK GUI was hacked to use the existing UAT dialog rather than rewrite the pref_filter_expressions.c to support a UAT. Should be okay since it's deprecated. Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9 Ping-Bug: 13814 Reviewed-on: https://code.wireshark.org/review/22354 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: Michael Mann <mmann78@netscape.net>
2017-06-24simplified Decode As entry if the next protocol requires manual selectionMartin Kaiser1-0/+1
There's a number of protocols whose payload contains yet another protocol but no criterion to figure out what this next protocol is. Define a new global function register_decode_as_next_proto() to register a Decode As entry for this scenario so the user can manually select the next protocol. A lot of the housekeeping that is normally required for Decode As is not applicable to such a scenario. Provide simple data structures and functions to cover this, make them internal to epan/decode_as.c and allow them to be shared by multiple of the new simplified Decode As entries. (For now, the mechanism is based on an FT_UINT32 dissectore table where all entries are linked to number 0. We should eventually come up with a better mechanism.) Change-Id: I3f81e331d7d04cfdfe9a58732d881652d77fabe2 Reviewed-on: https://code.wireshark.org/review/22376 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu1-0/+1
The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-13[MEGACO] Add tman/sdr as an integer with a unit string.Anders1-0/+1
Change-Id: I987b4a9a86b0000b726f7e514be741e713b6ec5a Reviewed-on: https://code.wireshark.org/review/22112 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: Martin Kaiser <wireshark@kaiser.cx>
2017-06-11print_stream: add a new print_line_color() methodDave Goodell1-0/+1
This new interface allows printing a line with specified foreground and background colors. The implementation avoids printing escape sequences if the output stream is not a TTY and note that escape sequences are ignored on Windows. This initial implementation relies on relatively modern 24-bit color support which is present in many terminal emulators but may not always display properly on older or simpler emulators. Windows coloring is handled with SetConsoleTextAttribute, which offers a "1-bit" color experience (but it's better than nothing) This commit is a precursor to adding additional coloring to tshark. Bug: 5158 Change-Id: Ib2b9d800095a065a4bb60abe0550862cda5539ec Reviewed-on: https://code.wireshark.org/review/21324 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-08packet-lapd.c: Replace heuristic UDP dissector with "deterministic" one with ↵Piotr Tulpan1-1/+0
prefs. Remove the heuristic dissector that checks for arbitrary UDP ports in favor of adding a preference for the range of UDP ports that can be used for LAPD. Change-Id: Ib85fbee4a433727af24279fffb0cbf2c25f7d292 Reviewed-on: https://code.wireshark.org/review/21985 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-06-05Move RSA key loading and decryption functions to wsutilAhmad Fatoum1-0/+5
Loading PEM and PKCS#11 keys was being done in static functions in packet-ssl-utils.c. These were moved to wsutil, with prototypes in a new <wsutil/rsa.h> header. This adds gnutls as optional dependency to wsutil. The RSA decryption helper was also moved and is now provided in <wsutil/wsgcrypt.h>. This allows more dissectors to access this functionality. Change-Id: I6cfbbf5203f2881c82bad721747834ccd76e2033 Reviewed-on: https://code.wireshark.org/review/21941 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: Michael Mann <mmann78@netscape.net>
2017-06-05wsutil: Add XTEA block cipherAhmad Fatoum1-0/+2
XTEA is a 64-bit block Feistel cipher with a 128-bit key and a suggested 64 rounds. It's used by the MMORPG Tibia for encrypting game server traffic. Usual XTEA treats the blocks as big-endian. Tibia treats them as little endian, therefore both versions are provided. Change-Id: I9ad0c8e066f848b20772ce4e1d3df19deff307b8 Reviewed-on: https://code.wireshark.org/review/21942 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-03Update libwireshark0.symbols filePascal Quantin1-1/+11
Change-Id: I86d37b08a6b325e3b9dd0289b8b8f45641e011fa Reviewed-on: https://code.wireshark.org/review/21916 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-022.3.0 → 2.5.0.Gerald Combs1-1/+1
Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4 Reviewed-on: https://code.wireshark.org/review/21905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-31debian: remove imagemagick and demote xdg-utils depsPeter Wu1-3/+4
imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it. xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+, but not for Qt nor during the build, remove it or mark it as optional. Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3 Reviewed-on: https://code.wireshark.org/review/21765 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-31debian: add lintian-overrides for libwireshark0Alexis La Goutte1-0/+25
Remove last lintian issue Change-Id: I672b347a8b0fc495b6e010ef987c0ff238eb8d1e Reviewed-on: https://code.wireshark.org/review/18622 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-05-20Revert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as ↵Pascal Quantin1-0/+4
QSIG" This reverts commit d3b72329359103f298e4f633b8c83fe2ce3c7517. Revert "Fix debian symbols check after Q.932 symbols removal" This reverts commit 3bc43e377076d1097321e2f7ffc89f52ee33afa0. Change-Id: Ib0623ab289613f48c73d38d038131a69cbf2190b Reviewed-on: https://code.wireshark.org/review/21720 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-05-19Fix debian symbols check after Q.932 symbols removalPeter Wu1-4/+0
Change-Id: Ib68c11220b67f31f69c8fc1524f8492caa577f57 Fixes: v2.3.0rc0-3576-gd3b7232935 ("Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG") Reviewed-on: https://code.wireshark.org/review/21708 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-05-16sharkd: export uat records.Jakub Zawadzki1-0/+1
Move gtk's fld_tostr() to epan API as uat_fld_tostr. Change-Id: I01e3b66ca9ea3cd1e2e06e2122190ee42b9ad44b Reviewed-on: https://code.wireshark.org/review/21664 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-15Update symbols tableAndersBroman1-1/+10
Change-Id: I34ced87d58ba947d4481775a3402da3647f68549 Reviewed-on: https://code.wireshark.org/review/21665 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-15sharkd: output JSON for new_stat_ API.Jakub Zawadzki1-0/+1
Change-Id: I5b4b020029f3c1587f96ca1fcf5fbfa2ee78ac31 Reviewed-on: https://code.wireshark.org/review/21628 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-05-14Add unit_name_string_get_double to handle float/double fieldsMichael Mann1-0/+1
Bug: 13705 Change-Id: I6bd006f216440d071e5c1eeb6b1f996b4a364c62 Reviewed-on: https://code.wireshark.org/review/21629 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: Guy Harris <guy@alum.mit.edu>
2017-04-28Add proto_tree_add_item_ret_boolean().Guy Harris1-0/+1
It does what it says on the label. You get back TRUE or FALSE in a gboolean. While we're at it, remove a copied-and-pasted comment that doesn't apply, and update another comment. Change-Id: I117391d2ffe44124a614a7f64dad1b389c1ebc6a Reviewed-on: https://code.wireshark.org/review/21394 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-26Add proto_tree_add_item_ret_uint64Michael Mann1-0/+1
Just like proto_tree_add_item_ret_uint, but with 64-bit support Change-Id: Ie0cbfda9e63bf21e85df2d674e391a6c0abe92f7 Reviewed-on: https://code.wireshark.org/review/21355 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-04-24Move UI-only stuff out of libwireshark.Guy Harris1-6/+0
Packet ranges are used only in the UI; move the packet range stuff into libui. Don't pass a print_args_t structure to libwireshark packet-printing routines, just pass the few parameters they need. Move the declaration of print_args_t into file.h. Change-Id: Icff5991eea7d7d56f33b4716105895263d275bcf Reviewed-on: https://code.wireshark.org/review/21308 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-1/+1
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-17Rename some routines and structure members.Guy Harris1-3/+3
They deal with sets of hfids, which can belong to protocols as well as fields (I guess you could argue that a protocol is a field, but...). Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae Reviewed-on: https://code.wireshark.org/review/21154 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-15Update symbols.Guy Harris1-1/+3
Change-Id: I41a075758103f0c37d30b3e764eef5f87e87234f Reviewed-on: https://code.wireshark.org/review/21106 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-14Make prefs_register_module() static.Guy Harris1-1/+0
It's not used outside epan/prefs.c, and it *shouldn't* be used outside epan/prefs.c - there are other APIs that call it, and handle the details of picking the right name, title, description, etc.. Change-Id: Ib95b4811d50c2bf1c480f115ee998274252243c9 Reviewed-on: https://code.wireshark.org/review/21095 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12Rename routines to clarify what they do.Guy Harris1-2/+2
XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that we're not priming YYY, we're priming XXX *using* YYY. Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133 Reviewed-on: https://code.wireshark.org/review/21031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12Add an API to let a postdissector specify fields whose values it needs.Guy Harris1-0/+2
Currently, this is only used to determine whether a protocol tree needs to be built on the first pass or not - if there are postdissectors that need fields, it does - but eventually we should be able to use it to prime the dissection to deliver those fields in cases where we don't need the *entire* protocol tree (rather than using a hack such as cooking up a fake tap with a fake filter to do that). Update MATE and TRANSUM to use it. Clean up code to check whether we need a protocol tree, and add comments before that code indicating, in each case, what the criteria are. The array of postdissectors includes a length, so we don't need to separately keep track of the number of postdissectors. Clean up indentation while we're at it. Change-Id: I71d4025848206d144bc54cc82941089a50e80ab7 Reviewed-on: https://code.wireshark.org/review/21029 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09Pull all the "load settings" calls into a epan_load_settings() routine.Guy Harris1-4/+1
That way, nothing using libwireshark needs to know what settings need to be loaded, they just call epan_load_settings(). Change-Id: I9390e259e286fc4f5acaeaac2767e4c3c4b656af Reviewed-on: https://code.wireshark.org/review/20983 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09Pull the code to save enabled/disabled lists into libwireshark.Guy Harris1-4/+2
It's identical in the GTK+ and Qt UIs, and it should just be done in libwireshark. Rename some routines to just speak of enabled_and_disabled_lists, so we don't have to say enabled_and_disabled_protos_and_heuristic_dissectors or something such as that. Clean up indentation. Change-Id: Ief2e612d9e1b60d8d0123b6bd3409dce5faf6495 Reviewed-on: https://code.wireshark.org/review/20970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08Update symbol lists.Guy Harris2-6/+24
Change-Id: I5bd2aaaa28923a6fb5f0954e306cf0fc0c6dca5a Reviewed-on: https://code.wireshark.org/review/20969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-16Add support for verifying CIP Safety CRC values.Michael Mann1-0/+4
Change-Id: I44f7ff6980f27b1a0d4199a91f9b217aec7e4652 Reviewed-on: https://code.wireshark.org/review/20557 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-03-10Replace aes.c and des.c by Libgcrypterikdejong1-7/+1
Follow-up of https://code.wireshark.org/review/20095 Rewritten functions: - crypt_des_ecb crypt_des_ecb verified against previous crypt_des_ecb implementation with 4294967295 random keys and input buffers from /dev/random as I cannot find a suitable pcap which uses DES Change-Id: I21ec2572451e0ded4299ffadd8dd687817bc6318 Reviewed-on: https://code.wireshark.org/review/20429 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-03-08Introduce "bytes_string" type, similar to "value_string"Peter Wu1-0/+4
In order to map arbitrary byte buffers to strings, introduce a new "bytes_string" type. Since "bytes_to_str" is already used for other purposes, name the generic function "bytesval_to_str" instead similar to the name( "val_to_str"). Accept "size_t" as length parameter since this is what is returned by the "sizeof" operator. Do not add a "try_bytesval_to_str_idx" variant since this pattern is not needed for now. Add a variant to match the prefix since this is currently expected by the ISAKMP dissector. Change-Id: I6d790325e85d9fb1384330f28a8c36e2057fdf30 Reviewed-on: https://code.wireshark.org/review/20386 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl>