aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pkcs12.c
AgeCommit message (Collapse)AuthorFilesLines
2013-06-19Add some missing wmem includes that apparently only show up on Windows.Evan Huus1-6/+7
svn path=/trunk/; revision=50071
2013-06-19Apparently one of our major global headers must include emem.h, because I justEvan Huus1-2/+2
found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-05-27Postfix FT_NONE fields with "_element" string to reduce number of ↵Pascal Quantin1-32/+32
incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-04-11Update the ASN.1 based dissectors following the changes done in r48812Pascal Quantin1-2/+2
svn path=/trunk/; revision=48820
2013-03-28-Wmissing-prototypesAnders Broman1-6/+9
svn path=/trunk/; revision=48609
2013-03-02Use explicit casts.Anders Broman1-3/+3
svn path=/trunk/; revision=48008
2013-02-21include the wsutil/wsgcrypt.h instead of including gcrypt.h directlyMartin Kaiser1-1/+1
svn path=/trunk/; revision=47802
2012-12-03Fix [-Wshadow] warnings.Bill Meier1-7/+7
svn path=/trunk/; revision=46357
2012-09-24Regenerate asn.1 dissectors.Jakub Zawadzki1-6/+6
svn path=/trunk/; revision=45110
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2011-11-20Get rid of Warnings.Anders Broman1-4/+4
svn path=/trunk/; revision=39954
2011-10-15Update generated ASN1 *.[hc] files after recent work done by Jeff Morriss;Bill Meier1-1/+1
The only change in each file is in a comment showing the asn2wrs cmd used to build that file. svn path=/trunk/; revision=39427
2011-05-27Corrected "old-style function definition".Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=37433
2011-05-13Regenerate ASN.1 dissectors to update the #line directive.Stig Bjørlykke1-28/+28
svn path=/trunk/; revision=37118
2010-05-11Add a little more code to avoid not-very-useful blurbs:Jeff Morriss1-12/+12
- Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11Regenerate a few more of the ASN.1 dissectorsJeff Morriss1-54/+54
svn path=/trunk/; revision=32745
2010-04-07#include <string.h> and/or #include <stdio.h> not needed.Bill Meier1-9/+6
svn path=/trunk/; revision=32417
2010-04-06Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from ↵Anders Broman1-2/+2
epan/dissectors version. It's a pain to get these circular dependencies right. svn path=/trunk/; revision=32409
2010-01-11Fix part of Bug 3917 "tvb_new_real_data is prone to memory leak"Anders Broman1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917 svn path=/trunk/; revision=31499
2009-12-21Switch to using a bundled version of the openSUSE Build Service packagesGerald Combs1-32/+29
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no longer have winposixtype.h, so remove its #includes and add a ssize_t typedef to config.h.win32. svn path=/trunk/; revision=31341
2009-11-23Guard #include <sys/types.h> with HAVE_SYS_TYPES_H.Stig Bjørlykke1-1/+4
svn path=/trunk/; revision=31053
2009-10-11Make all proto_* values static.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=30516
2009-08-21Use <gcrypt.h> instead of 'gcrypt.h'Kovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29501
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-6/+6
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-05-16Regenerate all asn2wrs generated dissectors.Stig Bjørlykke1-6/+6
svn path=/trunk/; revision=28379
2009-02-07#include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...Bill Meier1-7/+6
svn path=/trunk/; revision=27390
2008-11-10fix problem with X.411 asn2wrs compilation, all dissectors regeneratedTomas Kukosa1-1/+1
svn path=/trunk/; revision=26740
2008-11-01Regenerate all asn2wrs generated dissectorsAnders Broman1-6/+6
svn path=/trunk/; revision=26670
2008-05-11Fix some of the Errors/warnings detected by checkapiBill Meier1-1/+1
svn path=/trunk/; revision=25274
2008-01-16- Removed some unused variables in asn1 dissectorsStig Bjørlykke1-6/+6
- Fixed last parameter to cry_cipher_open() in pkcs12 svn path=/trunk/; revision=24116
2008-01-03get rid of get_ber_last_created_item()Tomas Kukosa1-4/+4
svn path=/trunk/; revision=24002
2007-11-01Change:Anders Broman1-3/+3
get_oid_str_name() -> oid_resolved_from_string() get_oid_name() -> oid_resolved_from_encoded() svn path=/trunk/; revision=23331
2007-10-29Include winposixtype.h only if building with GNUTLS; Bug #1949: Part 1 of fixBill Meier1-9/+10
[asn1 template plu generated .c file] svn path=/trunk/; revision=23301
2007-08-25get users of oid_resolv to use the new oids, rollout packet-snmp.cLuis Ontanon1-1/+1
svn path=/trunk/; revision=22651
2007-08-24get_ber_length doesn't need the tree argument, get rid of it.Jörg Mayer1-1/+1
Rebuild asn1 dissectors. svn path=/trunk/; revision=22627
2007-08-17Further tidy up for preference.Graeme Lunt1-1/+1
svn path=/trunk/; revision=22539
2007-08-17Fix for OSX gremlin in PKCS12 template.Graeme Lunt1-7/+6
svn path=/trunk/; revision=22537
2007-08-17Support for decrypting of PKCS#12 bag contents.Graeme Lunt1-284/+522
Supports RC2, RC4 and 3DES with SHA1 Password-based Encryption using libgcrypt functions. Password is provided as a preference, as is trying to decode with a empty/NULL password. svn path=/trunk/; revision=22534
2007-06-05not allow #.FN_HDR/FTR for Wireshark types but only for ASN.1 typesTomas Kukosa1-40/+87
it makes interconnection between .cnf file and ASN.1 source more readable (changes for #.FN_BODY will follow) svn path=/trunk/; revision=22043
2007-05-22Prepare for the use of the new -X parameter for BER encoded protocols.Anders Broman1-61/+61
svn path=/trunk/; revision=21889
2007-05-15actx in the rest of dissect_ber..()lAnders Broman1-8/+8
svn path=/trunk/; revision=21773
2007-05-13Second step in introducing asn context to BER dissectors just like in PER.Anders Broman1-168/+198
svn path=/trunk/; revision=21753
2007-05-06Start introducing actx to ber functions.Anders Broman1-47/+48
svn path=/trunk/; revision=21705
2007-03-21change the signature that asn2wrs generates for functions to marm all ↵Ronnie Sahlberg1-88/+88
parameters as _U_ to reduce the number of compiler warnings. update some template and cnf files to use _U_ as well svn path=/trunk/; revision=21088
2007-02-19Get rid of an unused variable.Guy Harris1-7/+6
svn path=/trunk/; revision=20845
2007-01-13New protocol dissector for PKCS#12 - Personal Information Exchange Syntax.Graeme Lunt1-0/+1203
Generally found within a file (.p12 or .pfx) or as a directory attribute (userPKCS12 from iNetOrgPerson). Wiki page and sample file to follow. svn path=/trunk/; revision=20416