aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt
AgeCommit message (Collapse)AuthorFilesLines
2012-01-19fix compile errors found by dumpabi targetBalint Reczey1-0/+1
svn path=/trunk/; revision=40595
2012-01-15The last commit failed to check in the deleted filesJörg Mayer12-2916/+0
svn path=/trunk/; revision=40512
2012-01-15Rename crypt-xxx to xxxJörg Mayer16-18/+2934
svn path=/trunk/; revision=40511
2012-01-14Maybe adding $(GNUTLS_CFLAGS) will fix the build problem.Jörg Mayer1-2/+2
svn path=/trunk/; revision=40502
2012-01-14Ed Beroset <beroset@mindspring.com> via bug 5531Jörg Mayer3-1/+312
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including gas, water and electric. The dissector implemented in the patch file includes full support for all EPSEM (Extended Protocol Specification for Electricity Metering) services and includes a full implementation of the C12.22 security modes. [...] To decrypt the attached sample file, you need to set up the key table in the preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44. Me: Fixes for: [ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’: ../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable] [ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable] svn path=/trunk/; revision=40500
2012-01-04More C++ updates.Gerald Combs1-0/+9
svn path=/trunk/; revision=40377
2011-09-21Fix ex "modeline" so it works;Bill Meier1-1/+1
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748 svn path=/trunk/; revision=39081
2011-09-12Move airpcap_wep.c to /wsutilAnders Broman5-116/+1
svn path=/trunk/; revision=38969
2011-08-31Make lookup functions for accessing crc32c_table and crc32_ccitt_table.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=38817
2011-08-31Second try to move crc routines to libwsutil.Stig Bjørlykke2-2/+2
This time keep the tvb routines in epan. Now we can use common crc routines outside epan. svn path=/trunk/; revision=38810
2011-08-30Revert r38800, as the crc routines contains some tvb functions.Stig Bjørlykke2-2/+2
svn path=/trunk/; revision=38803
2011-08-30Move all crc routines to libwsutil.Stig Bjørlykke2-2/+2
This way we can use the crc routines in wiretap. svn path=/trunk/; revision=38800
2011-08-07Replace deprecated glib functions.Jörg Mayer1-1/+1
In order to compile the whole project with -DG_DISABLE_DEPRECATED the mate plugin needs to replace its usage of GMemChunk. All other places should be clean. svn path=/trunk/; revision=38392
2011-07-04From Michael Mann:Anders Broman2-113/+84
Removed "key prefix" need within GUI so it's a little more intuitive (because that's what this bug is complaining about). Slight backwards compatibility issue with UAT (because key prefix was in previous keys), but all development (including fix for BUG 1123 that created UAT) has just been on SVN and not released. Also adjusted AirPCap (airpcap_loader.c) to account for the lack of "key prefix". Addressed some memory leaks/excess string creation. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5985 svn path=/trunk/; revision=37888
2011-04-08Fix Coverity CID 557.Gerald Combs1-2/+5
svn path=/trunk/; revision=36526
2011-03-31Clear the entire contents of ctx at the end of md5_finish(). Fixes CID 712.Chris Maynard1-3/+1
svn path=/trunk/; revision=36420
2011-03-21Add a comment re a "suspicious" sizeof() reported by Coverity Prevent.Bill Meier1-0/+2
(The report seems correct but I'm not altogether sure). svn path=/trunk/; revision=36227
2011-02-17On Windows, try putting __declspec(noreturn) in front of declarations ofGuy Harris1-0/+4
routines that don't return. (This requires that some files include config.h to get WS_MSVC_NORETURN declared properly.) svn path=/trunk/; revision=35989
2011-02-16Fix Visual C++ code analysis errors.Gerald Combs2-3/+25
svn path=/trunk/; revision=35970
2011-02-02A bit of Windows makefiles rework and cleanup:Bill Meier1-3/+4
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... svn path=/trunk/; revision=35747
2010-12-06Make some symbols static.Jeff Morriss1-2/+2
svn path=/trunk/; revision=35140
2010-11-30Oh yeah, there's a reason we don't put targets in Makefile.common: the first ↵Jeff Morriss3-8/+11
target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069. svn path=/trunk/; revision=35075
2010-11-29Move some checkapi targets into Makefile.commonJeff Morriss3-11/+8
svn path=/trunk/; revision=35073
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 00:32:27 +0000