aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pkcs12.c
AgeCommit message (Collapse)AuthorFilesLines
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann1-8/+19
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24Remove unneeded sys/types.hJoerg Mayer1-10/+6
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516 Reviewed-on: https://code.wireshark.org/review/2604 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21batch of tvb-length conversionsEvan Huus1-2/+2
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-2/+2
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-2/+2
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-6/+6
dissectors. Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss1-23/+21
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 Reviewed-on: https://code.wireshark.org/review/244 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-01-27Added back x509af_get_last_algorithm_id() removed in revision 54647 to Stig Bjørlykke1-1/+1
restore usage in cms and pkcs12. They never got a valid value in actx->external.direct_reference because they use another actx in this case. This will add back the global variable in x509af, but this is needed until we manage to pass the value in another way. See comments in bug 9573. svn path=/trunk/; revision=54975
2014-01-22Another probably-wrong tvb_get_string().Guy Harris1-7/+11
Also, add a URL for the PKCS #12 spec. svn path=/trunk/; revision=54894
2014-01-22To quote section B.5 "Keys for password integrity mode" of PKCS #12Guy Harris1-1/+1
v1.1: Personal Information Exchange Syntax: http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf "When password integrity mode is used to protect a PFX PDU, a password and salt are used to derive a MAC key. As with password privacy mode, the password is a Unicode string, and the salt is a byte string." So, not having found any other references to salts as text strings, copy it with tvb_memdup(), not tvb_get_string(). svn path=/trunk/; revision=54893
2014-01-22Clean up indentation and bracketing.Guy Harris1-46/+53
svn path=/trunk/; revision=54892
2014-01-08Make global algorithm_id in x509af dissector a direct_reference instead. ↵Michael Mann1-1/+1
Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code. svn path=/trunk/; revision=54647
2013-10-31Add a data parameter to call_ber_oid_callback to be able to pass data to ↵Michael Mann1-6/+6
subdissectors found with dissector_try_string_new. The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. svn path=/trunk/; revision=52994
2013-09-22emem -> wmem conversion:Pascal Quantin1-2/+2
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:11:56 +0000