aboutsummaryrefslogtreecommitdiffstats
path: root/test
AgeCommit message (Collapse)AuthorFilesLines
2016-11-06lua: Added new integer sizes in TvbRangeFranklin "Snaipe" Mathieu1-1/+27
* Added support for 3-byte integers in :int() and :le_int() * Added support for 5, 6, and 7-byte integers in :int64() and :le_int64() Change-Id: If9ab4ea806191bc63effe45a081b9c65693c2367 Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io> Reviewed-on: https://code.wireshark.org/review/18672 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-25lua: Added support for FT_IPv6 fieldsSnaipe1-1/+43
* Implement Tvb:ipv6() * Handle FT_IPv6 protofields during insertion in the lua tree * Implement Address.ipv6(hostname) Change-Id: I585c392681b3aef02ed8ee956f74051d77fb28d4 Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io> Reviewed-on: https://code.wireshark.org/review/18442 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-21tests: do not invoke missing unit testsPeter Wu1-7/+8
If the "test-programs" target is not built, then it should not try to invoke the last program (wireshark-gtk in my case). Change-Id: Ida60a71d1dc47305ef8abe10e6c96c8a1cb8dcbb Reviewed-on: https://code.wireshark.org/review/18346 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21test: make GTK support optionalPeter Wu3-8/+7
Current Ubuntu buildbot is failing because GTK support was removed. Tests should not fail if GTK is not available, so make it optional. Change-Id: I1640c8bcea5208299f6846eb366e105c39a3ebf3 Reviewed-on: https://code.wireshark.org/review/18345 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-19Add a Kerberos decryption test.Gerald Combs4-2/+33
Test Kerberos decryption using files from krb-816.zip on the SampleCaptures page. Change-Id: Ic1360b637ca6a1f6cb86d09a6aebfd7f5ff89419 Reviewed-on: https://code.wireshark.org/review/18275 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>
2016-10-18wslua: prepare for split class/instance (meta)methodsPeter Wu1-25/+0
Previously the metatables for classes were the same for the class and its instances. This results in issues like calling __gc on the class table on exit. Make it possible to declare separate class methods (functions) and instance methods. Observe that all attributes apply to the instances only, so make these just available on the instance. The attribute/methods lookup method (via __index/__newindex) have been rewritten to use upvalues, removing the technical need for the properties __getters/__setters/__methods. The "lua globals" test still checks for these, but it could be removed in the future. To fix bug 12968, the __gc method is removed from the class method. Future patches should remove the WSLUA_REGISTER_CLASS, WSLUA_REGISTER_META and WSLUA_REGISTER_ATTRIBUTES macros completely and create split class functions/methods (such that __call for an instance cannot accidentally be invoked on the class). Removed duplicate "fragmented" property from Pinfo (which triggered an error) and replaced exit() by g_error() for debugger friendliness. Remove lua_shiftstring since checkstring always returns non-NULL. Bug: 12968 Change-Id: I57f8a93d08bb84c79b0e94cf2c82d8402fc16646 Reviewed-on: https://code.wireshark.org/review/18026 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-16More wlan_mgt cleanup:Joerg Mayer1-1/+1
- Fix test script to use wlan instead of wlan_mgt - Remove a now useless test in the dissector Change-Id: I9a7644947c3002c759a7ae5728a8559682cfd4fd Reviewed-on: https://code.wireshark.org/review/18215 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey2-0/+8
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-10Disable wslua GRegex unit testJoão Valverde1-1/+2
It's broken for recent GLib versions and there is no time frame for a fix. Ping-Bug: 12997 Change-Id: Ia687af9b0df8fc37121179ba20761c878bf57057 Reviewed-on: https://code.wireshark.org/review/18140 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06ssl: fix TLS renegotiation, add test for thisPeter Wu2-0/+17
A handshake starts a new session, be sure to clear the previous state to avoid creating a decoder with wrong secrets. Renegotiations are also kind of transparant to the application layer, so be sure to re-use an existing SslFlow. This fixes the Follow SSL stream functionality which would previously ignore everything except for the first session. The capture file contains a crafted HTTP request/response over TLS 1.2, interleaved with renegotiations. The HTTP response contains the Python script used to generate the traffic. Surprise! Change-Id: I0110ce76893d4a79330845e53e47e10f1c79e47e Reviewed-on: https://code.wireshark.org/review/17480 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-04ssl,http: rename http-over-ssl to http-over-tlsPeter Wu2-3/+3
This name is displayed in the SSL prototcol tree (Application Data Protocol: http-over-tls), rename to avoid possible user confusion. Modify the SSL dissector such that both "http" and "http-over-tls" invoke the same dissector function. Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc Reviewed-on: https://code.wireshark.org/review/17481 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-25Go back to having only one SocketCAN LINKTYPE_ value.Guy Harris1-2/+1
Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we don't need it any more. Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a Reviewed-on: https://code.wireshark.org/review/17327 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-23dissector ISAKMP IKEv2: fixed bug with libgcrypt-1.6.x and AEAD ciphersMichał Skalski10-0/+134
IKEv2: Fixed bug with AEAD ciphers with 8- and 12-byte length ICVs and libgcrypt 1.6.x - gcry_cipher_checktag() returned INVALID_LENGTH. Fixed for merged changeset https://code.wireshark.org/review/17078 Added support for verification of encrypted data with HMAC_MD5_128 [RFC4595] and HMAC_SHA1_160 [RFC4595] integrity algorithms Added IKEv2 decryption suite for few combinations of encryption and integrity algorithms: 3DES-CBC/SHA1_160, AES-128-CCM-12, AES-128-CCM-12 (using CTR mode), AES-192-CTR/SHA2-512, AES-256-CBC/SHA2-256, AES-256-CCM-16, AES-256-GCM-16, AES-256-GCM-8 Change-Id: Ic564b25f1fd41e913c605322b7b8aa030cf90ddf Reviewed-on: https://code.wireshark.org/review/17213 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-20ISAKMP: Add regression testsMirko Parthey4-0/+34
Add regression tests for bugs 12610 and 12620 Bug: 12610 Bug: 12620 Change-Id: I6325a3ccb3e27fd4d3be52190e8763737b99fe73 Reviewed-on: https://code.wireshark.org/review/17083 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: Anders Broman <a.broman58@gmail.com>
2016-08-19Adjust to the split of the SocketCAN encapsulation.Guy Harris1-1/+2
Change-Id: Ibbe97f15854163163ad2bdf3b425c63d4cbfed50 Reviewed-on: https://code.wireshark.org/review/17158 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-15Fix unit test location for out of tree autotools buildJoão Valverde1-0/+3
Make it find test programs under the build tree. Change-Id: Ie7ff547417e8f248bb58f6c96896977ca4e710d1 Reviewed-on: https://code.wireshark.org/review/17048 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-09Use -r rather than -i for the "via stdin" tests.Guy Harris1-4/+4
TShark, at least when running in one-pass mode, now supports reading from the standard input if the file format is one that *can* be read purely sequentially; both pcap and pcapng can be read purely sequentially (unlike, for example, Microsoft Network Monitor format, where you have to read the frame table, at the end of the file, before you can read the frames, meaning you have to seek backwards, which you can't do on a pipe). Using -r 1) tests the "read from standard input" path, which we should do in versions that support it, and 2) means we can check whether, for the crashes we're seeing on 32-bit Windows 8.1, it's a problem with reading from the standard input in general, or just a problem with *capturing* from the standard input. Change-Id: I67da34de43f47dd8c63fa2f2072be41148cfe5a7 Reviewed-on: https://code.wireshark.org/review/16968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-06test.sh: Don't abort on failed testJoão Valverde1-2/+0
This behavior severely limits the usefulness of the test suite. An option to configure it would still be nice. Change-Id: I2bc96a043cc4ec76f334a3bfe48967703ef1be5e Reviewed-on: https://code.wireshark.org/review/16890 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-05Fix copyright.Guy Harris1-1/+1
I'd just copied and pasted the copyright notice from test/test.sh; Ulf wrote test/test.sh, but didn't write test/run_and_catch_crashes - I did, but, hey, might as well give the copyright to Gerald. Fix the date as well. Change-Id: Id307f354289ca72931dd83f472d879d733618e3c Reviewed-on: https://code.wireshark.org/review/16910 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05Put the usual copyright notice on test/run_and_catch_crashes.Guy Harris1-0/+20
Change-Id: I397e5483baa79b5bf043d746aabab6c54499fabc Reviewed-on: https://code.wireshark.org/review/16903 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-28Add an ESP decryption test.Gerald Combs3-1/+20
Add an ESP decryption test using the capture+keys from bug 12671. Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96 Ping-Bug: 12671 Reviewed-on: https://code.wireshark.org/review/16733 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2016-07-15We no longer add default names to interfaces in an IDB.Guy Harris1-0/+0
The way you say "this interface's name is unknown" is by not giving it an if_name option, not by giving it an if_name option that says "this isn't known". Remove the if_name option from the interfaces in this capture file. Change-Id: Ie3569c81bd065e48278cfa83b82b06ea6b5258af Reviewed-on: https://code.wireshark.org/review/16455 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27test: ensure temporary directory outside source treePeter Wu1-1/+1
The whole point of using mktemp is to get a temporary directory outside the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the invocation for *BSD (including OS X), but by adding a template it dropped the implicit --tmpdir option for GNU mktemp on Linux.. Use the GNU mktemp invocation and if it fails (for example, because a template is expected for BSD/OS X), provide a template. Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713 Reviewed-on: https://code.wireshark.org/review/16178 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-15Remove Nmake build systemPascal Quantin1-1/+1
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-05-27Test: Revert debugging output.Gerald Combs1-4/+0
Revert "Test: Make capture_step_stdin more verbose." and "Test: more suite-capture debugging." Tests on the Windows 8.1 builder have been passing since recommended OS updates were installed on the 24th. This reverts commits 7f710ef2b54d9eeb06c35ab1bd834f2df0696024 and f52c3c468a508e1e770c32d479cdd761cb412af8. Change-Id: I7cf10a38ba001426baea5fc76a34610c3a26ced2 Reviewed-on: https://code.wireshark.org/review/15590 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-26Test: capture_step_stdin updates.Gerald Combs1-0/+12
In capture_step_stdin, print information about our test capture if we fail. Change-Id: I046f9d22b1bb2d52d96926f50379ab51e6279eb3 Reviewed-on: https://code.wireshark.org/review/15125 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-26Test: more suite-capture debugging.Gerald Combs1-0/+2
Change-Id: I94967aeabdf2786868c3f7fce9e95633332d4948 Reviewed-on: https://code.wireshark.org/review/15123 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-26Test: Make capture_step_stdin more verbose.Gerald Combs1-0/+2
Add some verbosity to the stdin capture test. Hopefully this will shed some light on the Windows 8 builder failures. Change-Id: Ife2bbbaeed7a1e4a7ddd1c1f86322ba25d154f4c Reviewed-on: https://code.wireshark.org/review/15122 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-17The dissector for HTTP-over-SSL is now called "http-over-ssl", not just "http".Guy Harris2-3/+3
The "http" dissector is what's used for protocols other than TCP, SCTP, and SSL/TLS. Change-Id: Ib5138d3a082f1017b7ef190e5128a21eb9a49e92 Reviewed-on: https://code.wireshark.org/review/14947 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-02There are two separate IP-over-Infiniband encapsulations.Guy Harris1-1/+2
pcap files and snoop files have different headers, so there's no IP_OVER_IB encapsulation type, there are separate types for pcap and snoop. Change-Id: I00146e478d05bb11c634df0c386329db8de5635d Reviewed-on: https://code.wireshark.org/review/14774 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23Use absolute path for test suite TEST_OUTDIRJoão Valverde1-6/+6
Error out if it can't be created. Change-Id: I1a087f0e0cc064be7a417b9a2e66cf3c940e02fa Reviewed-on: https://code.wireshark.org/review/14565 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-25Try putting the output directly into the error message.Guy Harris1-4/+2
When the tests are run in the buildbot, messages such as Error during test execution: see {pathname} aren't very useful. Change-Id: I4509ea58c162c264c316358019a1cbc01cd93e31 Reviewed-on: https://code.wireshark.org/review/14135 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20Initial support for FreeBSD USB captures.Guy Harris1-1/+1
(There's also work needed in libpcap; that's also in progress.) Change-Id: Iff5a34c139a000865e2d78cc17a4af5ff24fb44b Reviewed-on: https://code.wireshark.org/review/14025 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15Allow test of the -D and -L options to succeed or fail with a permissions error.Guy Harris1-14/+28
We cannot easily predict what will happen, given the configuration of the OS, the permissions on files, the availability of extcap devices, the version of libpcap/WinPcap/NPcap (present or future), etc., etc., etc.. Allow those tests to succeed (as would be the case if you have the necessary permissions) or fail with a non-command-line-syntax error (as would be the case if you don't have the necessary permissions), but not to fail with a command-line syntax error. Change-Id: I76af898d5f146fcf3507c06f101acb578085e6fa Reviewed-on: https://code.wireshark.org/review/13957 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-04[text2pcap] Fix parsing of hash sign at the end of the lineVasil Velichckov2-0/+39
Change-Id: I4ff1ef28aba353fd7548cb5c0603fc29479aa854 Reviewed-on: https://code.wireshark.org/review/13294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04[airpdcap] Add support to decrypt TDLS trafficCedric Izoard2-0/+23
- When scanning for keys, check for TDLS action frames (need to have TLDS response or confirm to derive the key) - When deriving PTK, also check MIC to ensure the key has been correctly computed. - As SA is between two STAs (and not STA and AP), store highest MAC address in sa.bssid, and the other one in sa.sta => Add new function (AirPDcapGetSaAddress) that will check for TDLS case. - Add test in decryption suite Bug: 11312 Change-Id: Ieccb6a23a0ffbf3b705dac9b67c856ae2d3eeca9 Reviewed-on: https://code.wireshark.org/review/13664 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03suite-decrypt: fix mixed indent (use tabs)Alexis La Goutte1-49/+49
Change-Id: I80f2afb6e0cc44af6466fa255e91a40b29c4ca13 Reviewed-on: https://code.wireshark.org/review/13685 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03suite-mergecap: fix indent (use tabs)Alexis La Goutte1-156/+156
Change-Id: I9b3fb7d09d8dc90366167b1072dcdd4efc6f0516 Reviewed-on: https://code.wireshark.org/review/13684 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03Suite test: fix modelines for bash script (emac)Alexis La Goutte10-10/+10
c-basic-offset -> sh-basic-offset Change-Id: I16b19b608fbdb7f0408f7c31871fae746c8c4f50 Reviewed-on: https://code.wireshark.org/review/13683 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-24Update Lua tests after g9eda2faPascal Quantin1-6/+6
Change-Id: I3e9849afc8df9d81d0d9e0a4eaa9800d9c1ce8ec Reviewed-on: https://code.wireshark.org/review/13517 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-14test: Add test in decryption test suite for 802.11wCedric Izoard3-0/+23
- Add a test to check decryption of management frames Bug: 11995 Change-Id: I588d0f17b9e5efc841266b9dae4764e5e931be3f Reviewed-on: https://code.wireshark.org/review/13259 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> 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>
2015-12-13Explicitly specify the template for the mktemp command.Guy Harris1-1/+1
Not all versions of mktemp support omitting the template; in particular, the one provided by some BSD-flavored OSes don't. Change-Id: I657e002559dce165c677a473aa10bb17cc506037 Reviewed-on: https://code.wireshark.org/review/12592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-12Ping on Windows isn't necessarily IPv4-only.Gerald Combs1-5/+5
The default prefix policy on modern versions of Windows prefers IPv6. This in combination with the fact that our ping target (www.wireshark.org) currently has both A and AAAA records might result in ICMPv6 traffic instead of ICMPv4. Update the capture test suite accordingly. Change-Id: I5c88f24fb9458526ffd44c5003f09247b6999ce7 Reviewed-on: https://code.wireshark.org/review/12553 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-26Change Lua tests to reflect the disappearance of ↵Guy Harris4-1495/+30
WTAP_ENCAP_IEEE_802_11_AIROPEEK. The old global tests don't work; get rid of them. Fix the values of the Lua globals in the new test, and get rid of IEEE_802_11_AIROPEEK. (Yes, if you have a Lua script that depends on IEEE_802_11_AIROPEEK being defined, or that depends on the values of the Wiretap encapsulations not changing, it breaks. Fix it.) Change-Id: I245c1c0c3ba1c450f7950c754624c51b5564848a Reviewed-on: https://code.wireshark.org/review/12210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25WPA (IEEE802.11) decryption function cleanupsAlexander Wetzel1-1/+1
- Updated AirPDcapPacketProcess function description - Try to return better error codes - Remove broken/useless return of keys from AirPDcapRsna4WHandshake Change-Id: I1e4e0a76f6d1307e11c0466f17935dd7030561e1 Reviewed-on: https://code.wireshark.org/review/12033 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-16For now, call the finish routine in Lua file writers "close".Guy Harris1-3/+3
If we ever change the way file writers work, in a fashion incompatible with the existing way they work, we'll also rename this member - and get rid of checks for earlier versions of the Lua interface. Change-Id: I64065944fa31371f5249cafd930c18f180ad7299 Reviewed-on: https://code.wireshark.org/review/11879 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-09Update tests to reflect Lua file API change (write_close -> write_finish).Guy Harris1-3/+3
Change-Id: I7288cd3660dfd14be95dc42910faed47eca8226b Reviewed-on: https://code.wireshark.org/review/11661 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-09WPA/WPA2 decoding fixes and improvementsAlexander Wetzel3-0/+18
- start decoding when we have eapol1+2 packets Do not insist on a complete captured handshake, decode what we can. - more robust way to detect eapol #2 packets At least Win 10 is violating the spec on rekey by setting the secure bit in #2. Unpatched version shows and handles #2 as #4, breaking decoding after rekey. - fixed eapol rekey key handling Inital patch (see https://code.wireshark.org/review/8268) is adding redundant keys, since it scans all the time and not only once. - ignore tailing garbage after eapol sections in frame See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9065#c8 Included testcase to test decode for incomplete handshakes and eapol2 packets with secure bit set on rekey. Ping-Bug: 9065 Change-Id: Id775088db9b5aaa80da9efdeed6902d024b5c0cd Reviewed-on: https://code.wireshark.org/review/11484 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-15text2pcap: Add test suiteVasil Velichckov3-0/+337
Use the pcap captures from test/captures/ and - Get information for the input pcap file with capinfos - Generate an ASCII hexdump with text2pcap - Convert the ASCII hexdump back to pcap using text2pcap - Get information for the output pcap file with capinfs - Check that file type, encapsulation type, number of packets and data size in the output file are the same as in the input file Change-Id: I659204fb0a46e9cd99d03eb666f55fac95ae053e Reviewed-on: https://code.wireshark.org/review/11042 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-28Fix tests to allow selection of suite 10Graham Bloice1-48/+23
The tests only allowed a single character suite selection, which prevented suite 10 from being run on its own. Modified test.sh to now require a newline in addition to the input so that a 2 digit number can be entered. Also fixed test display to remove illusion that an individual step could be run. Only whole suites can be run. Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54 Reviewed-on: https://code.wireshark.org/review/10676 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>