aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-11-16Add an API to get a description of a compression type, and use it.Guy Harris13-95/+35
Add wtap_compression_type_description(), which returns NULL for WTAP_UNCOMPRESSED and a descriptive string for other compression types. Instead of checking for WTAP_GZIP_COMPRESSED and appending "(gzip compressed)", just pass the compression type to wtap_compression_type_description() and, if the result is non-null, append its result, wrapped in parentheses, with a space before the left parenthesis. Change-Id: I79a999c7838a883953795d5cbab009966e14b65e Reviewed-on: https://code.wireshark.org/review/30666 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-16nettrace: fix var init.Dario Lombardo1-1/+3
Error: ../wiretap/nettrace_3gpp_32_423.c:745:47: error: missing field 'src_ip' initializer [-Werror,-Wmissing-field-initializers] exported_pdu_info_t exported_pdu_info = { 0 }; ^ 1 error generated. ninja: build stopped: subcommand failed. Change-Id: I6c083b474854ea062f0a1c9f94e83af83574fc91 Reviewed-on: https://code.wireshark.org/review/30661 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-16dictionary.symbol: Update to version received from vendor with minor ↵Joerg Mayer1-53/+45
formatting changes Change-Id: I569e2fdb96ffc6757fffce8ddaf0086037cfa64f Reviewed-on: https://code.wireshark.org/review/30665 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-11-16Use an enum for compression types in various interfaces.Guy Harris33-253/+281
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 Harris15-221/+194
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-15Always use the input file's encapsulation for the output file.Guy Harris1-8/+0
Using WTAP_ENCAP_PER_PACKET if there's more than one interface forces a format supporting multiple encapsulations even if all interfaces use the same encapsulation; there's no reason to force that - you might as well let the user specify pcap format, for example, if that's what they really want. (If there are multiple interfaces and they have different encapsulations, the file encapsulation will be WTAP_ENCAP_PER_PACKET *anyway*.) Change-Id: I0e65c06e1ae3ff159ccd27f72cc63014e30a58f3 Reviewed-on: https://code.wireshark.org/review/30658 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-15Just pass on a snapshot length of 0 to the dumper.Guy Harris1-6/+0
It means "snapshot length unknown". For most file formats, the snapshot length isn't recorded (even for formats that support slicing - all they record is the on-the-network length, and length after slicing, for each packet), so it's ignored in the dumper. The one exception is pcap, which records it in the file header; if it's unknown, the pcap-writing code picks the maximum supported snapshot length for the file's link-layer header type. Change-Id: Ieda5dfe34c4bac63e43fdadeff31799ac3c908de Reviewed-on: https://code.wireshark.org/review/30657 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-15test: convert suite_dfilter to use fixturesPeter Wu18-516/+586
Stop using subprocesstest, drop the (now redundant) DFTestCase base class and use pytest-style fixtures to inject the dependency on tshark. This approach makes it easier to switch to pytest in the future. Most substitutions were automated, so no typos should be present. Change-Id: I3516029162f87423816937410ff63507ff82e96f Reviewed-on: https://code.wireshark.org/review/30649 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-15test: convert suite_nameres to use fixturesPeter Wu2-39/+57
Create a special custom profile just for the nameres tests, instead of doing this for all tests. Other tests do not need it. Change-Id: I41de0ece9dcf1ee310957beab2bbee0a99784753 Reviewed-on: https://code.wireshark.org/review/30633 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-15test: convert suite_text2pcap to use fixturesPeter Wu2-208/+221
Inline all capture file names and use fixtures instead of the global config object. This makes dependencies more explicit. Change-Id: I37a6eda73822735b5a6957b44bce53bb5ecd1aa0 Reviewed-on: https://code.wireshark.org/review/30631 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-15Don't set anything in *wth until we've decided it's a Peek classic file.Guy Harris1-3/+5
Change-Id: I8b6f5b46cc578a65eec3e255d468d3841f9b0197 Reviewed-on: https://code.wireshark.org/review/30652 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-15Dumpcap: Update our pipe closed logic.Gerald Combs1-10/+12
Check for pipe status only when we no longer have packets. This keeps us from flushing packets that we should have written. Change-Id: I714f52597da792a0b228b5e1a1dd3a993dc93681 Reviewed-on: https://code.wireshark.org/review/30651 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-15nettrace: Parse IPv6 addresses.Anders Broman1-50/+137
Change-Id: Iad583c39605ed2dd7a1c64f3729500c6b8a31fd3 Reviewed-on: https://code.wireshark.org/review/30650 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-15Simplify code.Guy Harris1-6/+3
Just directly set wth->file_encap. Change-Id: I9fb3d34d3d46d9bef6b7206e25ba72049d9b12f1 Reviewed-on: https://code.wireshark.org/review/30648 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-15Debian: Add missing symbols.Gerald Combs2-0/+30
Change-Id: Ia8a385faad06a1221a9ab6f31e27e4be09a5590d Reviewed-on: https://code.wireshark.org/review/30646 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-15Always use the file header to set the encapsulation type for Peek classic.Guy Harris2-26/+25
The information given by the person who provided the change to do so for V7 files seems to indicate that 1) V5 and V6 files have the same file header and 2) the protoNum field shouldn't be used for this purpose. It also provided information about the bits in the flags and status field, so add that. The first three of those bits appear to match the first three bits of the flags field in Peek tagged files, so note that in the Peek tagged reader, in case the other bits also match. Change-Id: I492afd594676efc14b487b3030c861bf5feb2d23 Reviewed-on: https://code.wireshark.org/review/30647 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-14Dumpcap: Make sure we set our pipe error status.Gerald Combs1-10/+20
Make sure cap_pipe_read_data_bytes sets pcap_src->cap_pipe_err if it encounters an error or EOF. This fixes a regression introduced in ga51b3d1d16. Have it return -1 or the number of bytes read similar to read(2). Explicitly treat its return value as a signed integer. Change-Id: I3de92859eee45e8d4a24a8c8309a816ef1b7924a Reviewed-on: https://code.wireshark.org/review/30639 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-14WSDG: update test section with pytest fixturesPeter Wu2-14/+55
Try to describe the motivation of pytest fixtures and update the examples. Add a missing build dependency in CMake while at it. Change-Id: I5384a86f2191835b834285b81343a7ee56f88e79 Reviewed-on: https://code.wireshark.org/review/30632 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
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-14macos-setup.sh: Update library and tool versions.Gerald Combs1-6/+6
Update the following versions: CMake: 3.7.2 to 3.12.4 Qt: 5.9.5 to 5.9.7 (Current LTS) libxml2: 2.9.4 to 2.9.7 (2.9.4 has security issues) c-ares: 1.12.0 to 1.15.0 (1.12.0 has security issues) libssh: 0.7.4 to 0.8.5 (0.7.4 has security issues) Change-Id: Ia97b436981705a4d99c0b0a2f238738e18394d45 Reviewed-on: https://code.wireshark.org/review/30589 Reviewed-by: Gerald Combs <gerald@wireshark.org>
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-14nettrace_3gpp_32_423: Don't crash on error and improve error output.Anders Broman1-1/+18
Change-Id: I4ea7ccf51321d6ce316456bde24aa37880ea52ed Reviewed-on: https://code.wireshark.org/review/30627 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-14ui: add missing break.Dario Lombardo1-0/+1
Error: ../ui/alert_box.c: In function ‘cfile_write_failure_alert_box’: ../ui/alert_box.c:359:13: error: this statement may fall through [-Werror=implicit-fallthrough=] simple_error_message_box( ^~~~~~~~~~~~~~~~~~~~~~~~~ "Frame %u%s has a network type that differs from the network type of earlier packets, which isn't supported in a \"%s\" file.", ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ framenum, in_file_string, ~~~~~~~~~~~~~~~~~~~~~~~~~ wtap_file_type_subtype_string(file_type_subtype)); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../ui/alert_box.c:364:9: note: here case WTAP_ERR_PACKET_TOO_LARGE: ^~~~ Change-Id: I55464afff5625ae8c587470e417234560c7e606c Reviewed-on: https://code.wireshark.org/review/30623 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-14All Veriwave files and packets use WTAP_ENCAP_IXVERIWAVE.Guy Harris1-15/+0
We set the file encapsulation to WTAP_ENCAP_IXVERIWAVE when we open the file; we don't need to update it when we read packets. and we don't need to set the per-packet encapsulation because it's set to the file encapsulation for us by wtap_read() and wtap_seek_read(). Change-Id: I2f123e3fb0d505334f3451685290bdbae77a598b Reviewed-on: https://code.wireshark.org/review/30622 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-14Fix whitespace.Guy Harris1-3/+3
Change-Id: I4e1ca2bcefbaf8bb04e26bed0c668c43b1a6f788 Reviewed-on: https://code.wireshark.org/review/30621 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-14Fail more cleanly if the file has no records.Guy Harris1-33/+93
If we have no records, we can't determine the link-layer type. Also: Use more signed values, and do more sanity checks on the file header and TLVs to make sure we don't run into the first packet. When writing the file header, accumulate the header length/first packet offset in a 32-bit variable, and stuff it into the offset-to-first-packet fields (plural) once we're done. Change-Id: I3aeb5258bc16ddd8cf0ec86ef379287d0c4b351a Reviewed-on: https://code.wireshark.org/review/30620 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-14Dumpcap: Don't let individual pipes stop our capture.Gerald Combs1-13/+23
If a capture source is a pipe and it reaches the end of its input, don't stop capturing globally since we might have other active interfaces. We do need to stop capturing if all of our interfaces are pipes and none of them are open, so add a check to do so. Change-Id: Id7f950349e72113c9b4bfeee4f0a9c8a97aefe8c Reviewed-on: https://code.wireshark.org/review/30615 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14test: convert some more tests to use fixturesPeter Wu11-674/+641
Continue the conversion from use of globals (the config module) to fixtures. If a program (like wmem_test or tshark) is unavailable, it will be skipped now rather than failing the test. The general conversion pattern is: - Decorate each class with `@fixtures.uses_fixtures` and (for tests that run tshark) `@fixtures.mark_usefixtures('test_env')`. - Convert all `config.cmd_*` to `cmd_*` and add an argument. - Convert all `config.*_dir` to `dirs.*_dir` and add an argument. - Convert users of `os.path.join(dirs.capture_file, ...)` to use a new 'capture_file' fixture to reduce boilerplate code. Inline variables if possible (this conversion was done in an automated way using regexes). Some other changes: tests that do not require a test environment (like wmem_test) will use 'base_env' which avoids copying config files, `env=config.test_env` got removed since this is the default. Some test classes in suite_clopts were combined. Removed unused imports. Change-Id: Id5480ffaee7d8d56cf2cb3189a38ae9afa7605a1 Reviewed-on: https://code.wireshark.org/review/30591 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14Dumpcap: Move packet dequeueing code to a common routine.Gerald Combs1-50/+46
Dequeue and write packets in capture_loop_dequeue_packet. This ensures that we properly handle pcapng packets both inside our capture loop and after it's finished. Change-Id: Iacc980c90481b1378761eac83d8044aaddabfdc2 Reviewed-on: https://code.wireshark.org/review/30609 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14extcap: save debug flag and use it to activate ssh debug.Dario Lombardo6-0/+18
Change-Id: Ida32834f8c0838f1d815f7e33116b6a6161acf34 Reviewed-on: https://code.wireshark.org/review/30572 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14ssh-base: define a struct for storing ssh parameters.Dario Lombardo4-94/+101
Update sshdump and ciscodump to use it. Change-Id: I5fbb9e3a870ec8baa0f326ad34733743cbb981f3 Reviewed-on: https://code.wireshark.org/review/30571 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14ssh-base: support libssh config file.Dario Lombardo1-11/+23
It's operating system dependent, but the library takes care of it on different operating systems. Options are set with this precedence: - if user-provided, use it - if not, take the one from config file - (username only) if none in the config file, take the current user from OS Change-Id: I00dcc1c9a8613e6d1250b6404bf2100f6ccff7b7 Reviewed-on: https://code.wireshark.org/review/30558 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-14Catch attempts to write multiple encapsulation types if unsupported.Guy Harris14-0/+149
If, in the process of opening the input file, we determine that it has packets of more than one link-layer type, we can catch attempts to write that file to a file of a format that doesn't support more than one link-layer type at the time we try to open the output file. If, however, we don't discover that the file has more than one link-layer type until we've already created the output file - for example, if we have a pcapng file with a new IDB, with a different link-layer type from previous IDBs, after packet blocks for the earlier interfces - we can't catch that until we try to write the packet. Currently, that causes the packet's data to be written out as is, so the output file claims it's of the file's link-layer type, causing programs reading the file to misdissect the packet. Report WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED on the write attempt instead, and have a nicer error message for WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED on a write. Change-Id: Ic41f2e4367cfe5667eb30c88cc6d3bfe422462f6 Reviewed-on: https://code.wireshark.org/review/30617 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-13Give an error if an output file isn't specified.Guy Harris1-393/+390
Just silently not bothering to do any work isn't all that useful in that case; giving the usage message indicates that you need both input and output files. Change-Id: I9512d3e45e1e9a9d4bccb28b49aeea8c12ad0100 Reviewed-on: https://code.wireshark.org/review/30614 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-13tshark: Print the packets' comments in the expert infoVasil Velichkov3-3/+80
Previously 'tshark -z expert' was failing with abort when a packet contains a comment - Add a new comment parameter and update the tshark's manual page - Add a new comment_level severity and change the default lavel to it. - Add various 'tshark -z expert' tests Change-Id: I188317da5e00019b8f2b725f0fe84942f774520f Reviewed-on: https://code.wireshark.org/review/30610 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-13extcap: Allow ASCII '0' in preference nameStig Bjørlykke1-1/+1
Update another regex to also allow '0' in the preference name. Change-Id: I61e39a160d86195c989ab53623bc5887a10dcaad Reviewed-on: https://code.wireshark.org/review/30606 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:06:05 +0000