aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt/airpdcap_debug.h
AgeCommit message (Collapse)AuthorFilesLines
2016-07-29Enable airpdcap debugging explicitly.Gerald Combs1-4/+6
Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending on your build type and the extra output breaks the decryption tests. Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0 Reviewed-on: https://code.wireshark.org/review/16755 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-26Move airpdcap's print_debug_line() to airpdcap_debug.hMichael Mann1-2/+6
It saves a little on file pollution and the g_warning call isn't bothered in the header file. Change-Id: Ia9bdd96d9d93bbba6811769c4e6e1ed9124c2e5a Reviewed-on: https://code.wireshark.org/review/16698 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>
2015-11-13Fix compilation when _DEBUG is defined.Gerald Combs1-2/+2
CMake's Visual C++ generator creates projects that compile with the Debug configuration by default, which defines _DEBUG. Fix DEBUG_DUMP's declaration so that we compile in that case. While we're here note that the "airpd" prefix isn't limited to AirPcap, so we might want to change it accordingly. Change-Id: I5476f28c63020f0f66ee9128731bc4b3dc720765 Reviewed-on: https://code.wireshark.org/review/11787 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>
2015-11-09WPA/WPA2 decoding fixes and improvementsAlexander Wetzel1-1/+1
- 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-01-09Fix airpdcap debugging code.Gerald Combs1-6/+8
Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10 Reviewed-on: https://code.wireshark.org/review/6457 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-08bytes_to_ep_str -> bytes_to_strMichael Mann1-1/+6
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750 Reviewed-on: https://code.wireshark.org/review/6389 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-19Rename a couple of to_str functions to have ep_ in the name. This makes itEvan Huus1-1/+1
obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-01-26Make airpcap's print_debug_line take const arguments so that it compilesEvan Huus1-1/+1
on newer GCC's when _DEBUG is #defined. Found while investigating https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177 svn path=/trunk/; revision=47309
2012-07-18Fix some system header files that were #included with "" instead of <>.Evan Huus1-1/+1
They made cppcheck unhappy. svn path=/trunk/; revision=43779
2008-07-30Add WPA group key decryption from Brian Stormont, via bug 1420:Gerald Combs1-0/+4
Although this patch successfully recognizes group keys and decrypts packets properly using the group key, there is a limitation. If an AP is using key rotation, clicking on individual packets in a trace may not properly decrypt a packet encrypted with a group key. This is because the current structure used in Wireshark only supports one active unicast and one active group key. If a new key has been seen, but you are looking at a packet encrypted with an older key, it will not decrypt. The summary lines, however, do show the packets properly decrypted. I've written up a much longer and more detailed explanation in a comment in the code, along with a proposed idea for a solution, plus a clunky work-around in the GUI when using the current code. I also suspect there might still be a problem with decrypting TKIP groups keys that are sent using WPA2 authentication. In the most common operation, if you are using WPA2, you'll also be using AES keys. It's not a common AP configuration to use WPA2 with TKIP. In fact, most APs don't seem to support it. Since it is an uncommon setup, I haven't put aside the time to test this patch against such an AP. I do have access to an AP that supports this, so when I have the time I'll test it and if needed, will submit another patch to handle that odd-ball condition. From me: Remove the decrypt element of s_rijndael_ctx (which was unused, as indicated in the comments). Preserve the GPL licensing text in several files (which the patch shouldn't have removed). Remove changes that added whitespace. Convert C++-style comments to C-style. Update to include recent SVN changes (e.g. renaming variables named "index"). Remove extraneous printf's. Define DEBUG_DUMP in airpdcap_debug.h. Comment out some instances of DEBUG_DUMP. Change malloc/free to g_malloc/g_free. Use g_memdup instead of allocating and copying. Use gint16 instead of INT16 in airpdcap_rijndael.c. Add Brian to AUTHORS. svn path=/trunk/; revision=25879
2008-03-10Change the BSD-licensed written by CACE to BSD+GPL.Gerald Combs1-0/+4
svn path=/trunk/; revision=24599
2007-01-12Add copyright attributions and licenses. License each derived workGerald Combs1-0/+32
according to its pedigree. svn path=/trunk/; revision=20401
2006-12-28Move the contents of airpdcap to epan/crypt. Try to fix the currentGerald Combs1-0/+70
distcheck failure. Move the nmake build targets for airpdcap from epan/dissectors to epan. This will probably break the Windows build. svn path=/trunk/; revision=20231