aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt
AgeCommit message (Collapse)AuthorFilesLines
2013-04-14Update some of the old FSF addresses caught by the new licensecheck buildbotEvan Huus6-6/+6
step. svn path=/trunk/; revision=48848
2013-03-15Bugfix Decryption Key Management dialog, bug 8446 ↵Michael Mann1-6/+5
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446) Needed to convert use of old IEEE802.11 preference strings to UAT. Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed. svn path=/trunk/; revision=48308
2013-03-12From David Arnold:Jaap Keuter1-3/+3
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools. svn path=/trunk/; revision=48261
2013-03-02From beroset:Anders Broman2-4/+4
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48006
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey5-2/+16
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-26it's ==> its & its ==> it's as needed.Bill Meier1-2/+2
svn path=/trunk/; revision=47898
2013-02-21include the wsutil/wsgcrypt.h instead of including gcrypt.h directlyMartin Kaiser1-1/+1
svn path=/trunk/; revision=47802
2013-01-27Bugfix crash caused by AirPDcap decryption. Bug 8177 ↵Michael Mann1-3/+5
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177) svn path=/trunk/; revision=47314
2013-01-26Make airpcap's print_debug_line take const arguments so that it compilesEvan Huus2-2/+2
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
2013-01-04replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned ↵Michael Mann1-1/+1
int" instead. bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825) svn path=/trunk/; revision=46928
2012-11-05From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>Anders Broman1-2/+12
airpdcap: For FromDS and ToDS both set use magic All 802.11 data frames on the AMP link shall be sent with ToDS and FromDS bits in the Frame Control field both set to one. Currently for this packets we get different associations for the same EAPOL sequence since addr2 and addr1 change. svn path=/trunk/; revision=45923
2012-11-05From Andrei Emeltchenko:Anders Broman1-1/+9
Add 802.11 AMP LLC/SNAP header Add LLC/SNAP header specified in BLUETOOTH SPECIFICATION Version 4.0 [Vol 5] 802.11 Protocol Adaptation Layer Functional Specification. The SNAP header composed of the OUI of the Bluetooth SIG and the protocol identifier given in spec mentioned shall be used to distinguish AMP 4-way handshake messages from external security traffic. Decode this traffic as 802.1X authentication. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633 svn path=/trunk/; revision=45920
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss7-19/+5
svn path=/trunk/; revision=45016
2012-09-03(Attempt to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7411 :Jeff Morriss2-2/+5
Use LIBGCRYPT_CFLAGS if we have it. svn path=/trunk/; revision=44758
2012-08-31From Chris Elston:Anders Broman2-70/+88
Split md5_hmac for incremental use https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7680 svn path=/trunk/; revision=44710
2012-08-31From Chris Elston:Anders Broman2-27/+46
Split sha1_hmac for incremental use. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7680 svn path=/trunk/; revision=44709
2012-08-29Allow wpa-psk decryption keys to be successfully entered.Chris Maynard1-6/+6
Problems reported on ask.wireshark.org here: 1) http://ask.wireshark.org/questions/13951/invalid-key-format-wireshark-182 2) http://ask.wireshark.org/questions/13688/error-updating-record-invalid-key-format #BACKPORT (to 1.8) svn path=/trunk/; revision=44694
2012-08-09Don't define HAVE_UMTS_KASUMI to anything unless we actually have it.Jeff Morriss1-1/+3
Use #ifdef HAVE_UMTS_KASUMI instead of #if HAVE_UMTS_KASUMI Put $Id$ tag in kasumi.h svn path=/trunk/; revision=44398
2012-08-09Small fixes:Pascal Quantin1-3/+3
- put back return NULL in line 947 that got removed in r44384: it is mandatory to avoid accessing non initialized variables. Change rlc_channel_assign a bit to fix what was the root cause of this removal (I guess) - put back add_channel_info in dissect_rlc_am (removed by error?) - fix some typo errors - fix indentation a bit svn path=/trunk/; revision=44393
2012-08-09Add Custom.common to dist.Anders Broman1-0/+1
svn path=/trunk/; revision=44387
2012-08-09From Jacob Nordgren and Rishie Sharma:Anders Broman3-1/+40
FP: fixed so hsdsch type 1 also uses communication context id Added experimental conditional decryption support. svn path=/trunk/; revision=44384
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
2012-06-28Update FSF address - part II.Jakub Zawadzki4-4/+4
svn path=/trunk/; revision=43538
2012-06-28Update Free Software Foundation address.Jakub Zawadzki4-4/+4
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-28Neither C90 nor C99 explicitly guarantee that a memcpy() call with aGuy Harris1-1/+3
null source argument and a zero count will work; in practice, they probably will (with a zero count, there's nothing to fetch from the source), but the Clang static analyzer still warns about it. svn path=/trunk/; revision=42305
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss2-2/+2
from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
2012-01-29Add *.sbr files to the clean target.Anders Broman1-1/+1
svn path=/trunk/; revision=40762
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