summaryrefslogtreecommitdiff
path: root/epan/crypt
AgeCommit message (Collapse)AuthorFilesLines
2010-08-29Doxygen changes.Anders Broman2-3/+3
svn path=/trunk/; revision=33990
2010-08-28Doxygen changes.Anders Broman1-1/+1
svn path=/trunk/; revision=33981
2010-08-26Fix a number of doxygen directives.Anders Broman1-1/+1
svn path=/trunk/; revision=33930
2010-08-26- Try to fix a couple of doxygen comments. Anders Broman1-2/+2
- whitspace changes. svn path=/trunk/; revision=33926
2010-02-23Fix some compiler warnings.Guy Harris2-6/+6
svn path=/trunk/; revision=31969
2010-02-23Squelch a bunch of compiler warnings.Guy Harris1-10/+10
svn path=/trunk/; revision=31961
2009-10-11Creatig static sublibs was not a good idea:Jörg Mayer1-43/+0
========================================================================= "du -s build" with sublibs: 396868 build ----------------------------------- "du -s build" without sublibs: 197588 build/ ========================================================================= tshark with sublibs: -rwxr-xr-x 1 jmayer users 27399706 2009-10-11 08:39 tshark* ----------------------------------- tshark without sublibs: -rwxr-xr-x 1 jmayer users 226748 2009-10-11 09:05 tshark* ========================================================================= So undo the following patches: ------------------------------------------------------------------------ r30459 | krj | 2009-10-10 07:08:48 +0200 (Sa, 10 Okt 2009) | 1 line Sort subdirectories alphabetically ------------------------------------------------------------------------ r30458 | krj | 2009-10-10 07:03:36 +0200 (Sa, 10 Okt 2009) | 1 line Add epan/dissectors/CMakeLists.txt which creates a static dissectors library ------------------------------------------------------------------------ --> readd!! *** r30443 | krj | 2009-10-09 21:43:42 +0200 (Fr, 09 Okt 2009) | 1 line Rename DISSECTOR_ASM_UTILS to LIBWIRESHARK_ASM_FILES since these files belongs to ep an not dissectors ------------------------------------------------------------------------ r30442 | krj | 2009-10-09 21:17:26 +0200 (Fr, 09 Okt 2009) | 1 line Add epan/ftypes/CMakeLists.txt which creates a static ftypes library ------------------------------------------------------------------------ r30441 | krj | 2009-10-09 21:13:01 +0200 (Fr, 09 Okt 2009) | 1 line Add epan/dfilter/CMakeLists.txt which creates a static dfilter library ------------------------------------------------------------------------ r30440 | krj | 2009-10-09 21:05:29 +0200 (Fr, 09 Okt 2009) | 1 line Add epan/crypt/CMakeLists.txt which creates a static crypt library ------------------------------------------------------------------------ r30439 | krj | 2009-10-09 20:22:22 +0200 (Fr, 09 Okt 2009) | 1 line Add epan/crc/CMakeLists.txt which creates a static crc library ------------------------------------------------------------------------ To avoid merge problems, I needed to revert r30443 as well, will readd this one in my next patch. svn path=/trunk/; revision=30494
2009-10-09Add epan/crypt/CMakeLists.txt which creates a static crypt libraryKovarththanan Rajaratnam1-0/+43
svn path=/trunk/; revision=30440
2009-10-07Fix some LLP64 issues.Guy Harris2-3/+3
svn path=/trunk/; revision=30393
2009-09-10WPA decryption fix from Greg Schwendimann via bug 3890:Gerald Combs1-3/+4
I'm reasonably sure that I introduced this bug and I apologize for the problems with my previous patch. The problem is that I did not use all of the seen keys, I used all except the first key, which in a case of one key is none. The attached patch fixes the error. svn path=/trunk/; revision=29843
2009-07-29Break the aes set ket/decrypt/encrypt out from airpdcap_raindoll into Ronnie Sahlberg6-1301/+1325
its own crypt-aes. change the integer types to glib style integers this may/will be helpful if/when we implement our own version of kerberos aes decryption of dcerpc since the existing libraries can not (yet) handle when header signing is used. we should implement our own decryption of this for cfx+aes just as we did for classic+arcfour svn path=/trunk/; revision=29228
2009-07-23Fix some whitespace ....Bill Meier1-386/+389
svn path=/trunk/; revision=29184
2009-07-16Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmakeAnders Broman1-1/+1
for MSVC variant 2008 only. As suggested by Bill Meier. svn path=/trunk/; revision=29114
2009-07-15Add /MP flag to make use of multi cores.Anders Broman1-1/+1
svn path=/trunk/; revision=29104
2009-05-22From Greg Schwendimann via bug 3156:Gerald Combs2-26/+61
Airpdcap does not allow for more than one key to be stored for a pair of nodes. This means that when a device associates more than once the previous keys are lost. This is ok for the first pass as the newest key is all that is needed but when the user tries to click on a packet, to get the tree, which used a previous key all that is seen is the encrypted data. The attached patch stores previous associations in a linked list and will try all known keys before decided the packet can't be decrypted. The list of keys is garbage collected when a new capture is started. svn path=/trunk/; revision=28449
2009-04-03Make some lengths size_t's.Gerald Combs2-5/+5
svn path=/trunk/; revision=27942
2009-03-11More Win64 fixes.Gerald Combs1-2/+2
svn path=/trunk/; revision=27707
2008-10-16Removed a "statement not reached" warning.Stig Bjørlykke1-1/+0
svn path=/trunk/; revision=26478
2008-09-02Fetch the key length using pntohs. Initialize and check its length.Gerald Combs1-5/+4
svn path=/trunk/; revision=26115
2008-09-02Fix a few Emacs "file variables" to have "safe" values.Bill Meier1-1/+1
That is: indent-tabs-mode: tabs --> indent-tabs-mode: t Also: fix a typo: set-tabs-mode --> indent-tabs-mode svn path=/trunk/; revision=26113
2008-08-25Add another buffer length check to group key decryption.Gerald Combs1-0/+6
svn path=/trunk/; revision=26071
2008-08-25Fix a couple of crashes in WPA group key decryption.Gerald Combs2-0/+7
svn path=/trunk/; revision=26070
2008-07-30Add WPA group key decryption from Brian Stormont, via bug 1420:Gerald Combs6-24/+757
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-07-02Add Makefile.common files for epan/dfilter and epan/ftypes.Guy Harris1-0/+4
Add checkapi rules to Makefile.am files. svn path=/trunk/; revision=25656
2008-07-01Put printf into a separate "termoutput" API group. For most files,Guy Harris1-1/+1
check for it - but not for TShark plugins, as they are expected to print to the standard output. svn path=/trunk/; revision=25653
2008-06-24Fix another variable named "index".Guy Harris1-6/+6
svn path=/trunk/; revision=25581
2008-06-23Rename a local variable in a macro to avoid collisions with regularGuy Harris1-4/+4
variables. svn path=/trunk/; revision=25553
2008-06-23Rename a variable to avoid collisions with the old V7 index() function,Guy Harris1-4/+4
still declared by <string.h> on some platforms (at least the way we compile, with all sorts of non-ANSI C/non-POSIX stuff added). svn path=/trunk/; revision=25551
2008-05-23Fix some of the Errors/warnings detected by checkapi.Anders Broman2-1/+5
svn path=/trunk/; revision=25368
2008-04-09Remove:Anders Broman1-3/+0
#ifdef NEED_G_ASCII_STRCASECMP_H #include "g_ascii_strcasecmp.h" #endif svn path=/trunk/; revision=24859
2008-04-07- Remove GLIB1 codeStephen Fisher1-1/+0
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION - Remove ws_strsplit files because we no longer need to borrow GLIB2's g_strsplit code for the no longer supported GLIB1 builds svn path=/trunk/; revision=24829
2008-03-11If we haven't found a handshake packet, say so.Gerald Combs1-1/+1
svn path=/trunk/; revision=24605
2008-03-10Change the BSD-licensed written by CACE to BSD+GPL.Gerald Combs9-0/+36
svn path=/trunk/; revision=24599
2008-03-05Move the contents of AirPDcapCleanKeys() into AirPDcapInitContext()Gerald Combs2-38/+14
and call AirPDcapInitContext() where we were previously calling AirPDcapCleanKeys(). If we're resetting our keys, we should reset our SA list and other associated data as well. svn path=/trunk/; revision=24562
2007-11-28we must include config.h or else NEED_G_ASCII_STRCASECMP_H will never be Ronnie Sahlberg1-1/+5
defined we must also include g_ascii_strcasecmp.h from the parent directory svn path=/trunk/; revision=23634
2007-11-27strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delendaGuy Harris1-3/+7
est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our own versions if they're missing from GLib (as is the case with GLib 1.x). In the code to build the list of named fields for Diameter, don't use g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping in the hash function and use g_ascii_strcasecmp() in the compare function. We do this because there is no guarantee that toupper(), tolower(), and functions that use them will, for example, map between "I" and "i" in all locales; in Turkish locales, for example, there are, in both upper case and lower case, versions of "i" with and without a dot, and the upper-case version of "i" is "I"-with-a-dot and the lower-case version of "I" is "i"-without-a-dot. This causes strings that should match not to match. This finishes fixing bug 2010 - an earlier checkin prevented the crash (as there are other ways to produce the same crash, e.g. a bogus dictionary.xml file), but didn't fix the case-insensitive string matching. svn path=/trunk/; revision=23623
2007-10-31From Christopher McKenzie: Zero out our SAs before we use them.Gerald Combs2-22/+8
Remove an unneeded for loop in AirPDcapCleanKeys(), and make it static. svn path=/trunk/; revision=23314
2007-10-16From tmiller@hcjbtech.org : Spelling error on GDS DB protocol dissector: ↵Sake Blok3-3/+3
"Buffer lenght:" (recursively grepped through the source and corrected all occurences, even the ones just in comments) svn path=/trunk/; revision=23211
2007-06-27Make the WPA passphrase a percent-escaped string. Constify and GLib-izeGerald Combs1-9/+16
some variables. svn path=/trunk/; revision=22210
2007-06-23A recent checkin broke wpa-psk keys; fix it.Gerald Combs1-2/+2
svn path=/trunk/; revision=22169
2007-06-21In packet-ieee802.11.c, fix a serious preference bug introduced in theGerald Combs1-2/+5
last checkin. In airpcap.c, appease the toolbar code by returning a lower-case, non-separated WEP key. svn path=/trunk/; revision=22152
2007-06-21Be less restrictive about WEP key preferences. Use hex_str_to_bytes toGerald Combs2-254/+148
process WEP keys. Allow the "wep:" prefix for WEP keys even when HAVE_AIRPDCAP isn't defined. Add a NULL pointer check to hex_str_to_bytes(). Fixes bug 1584. Fixup indentation. svn path=/trunk/; revision=22151
2007-06-18Be a little less picky about EAPOL packet lengths. Someone sent in aGerald Combs1-2/+2
capture that has extra data in the 4th handshake message. svn path=/trunk/; revision=22138
2007-06-14The 802.11 dissector calculates the header size, so pass that value toGerald Combs4-117/+71
the WEP/WPA decryption code instead of re-calculating it. Fixes bug 1639. Remove fcsPresent, radiotapPresent, and associated code from airpdcap.c since they were always FALSE. Glib-ize some data types. Fixup white space. Update the release notes. svn path=/trunk/; revision=22104
2007-06-03(Minor) Use _WIN32 (instead of WIN32) like the rest of Wireshark Bill Meier1-1/+1
svn path=/trunk/; revision=22030
2007-05-20The fix for ad-hoc WEP decryption in r21814 broke WPA. Replace it withGerald Combs3-1157/+1185
a better fix. Clean up whitespace while we're at it. svn path=/trunk/; revision=21847
2007-05-17Try WEP decryption before WPA. This keeps us from returningGerald Combs1-113/+110
prematurely if we have an IBSS frame. svn path=/trunk/; revision=21814
2007-04-23Need to include <epan/pint.h> to get pletohl() defined.Guy Harris1-0/+1
svn path=/trunk/; revision=21544
2007-04-23byteReverse assumes its argument is aligned on a 32-bit boundary; makeGuy Harris1-10/+9
it a pointer to a guint32. Also, use pletohl() to fetch a 32-bit little-endian quantity. svn path=/trunk/; revision=21542
2007-04-23The "in" array in an MD5 context is expected to be aligned on a 4-byteGuy Harris1-1/+1
boundary; make it an array of 16 guint32's rather than 64 guint8's, to ensure that, and add now-necessary casts and remove now-unnecessary casts. (Missed on the previous checkin.) svn path=/trunk/; revision=21541