aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pkcs12
AgeCommit message (Collapse)AuthorFilesLines
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann1-2/+13
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-07-30Add some files under asn1 to the distribution.Guy Harris1-1/+1
Include CMakeLists.txt files and the gnm subdirectory, along with the top-level Makefile.inc and Makefile.preinc files. Don't explicitly include Custom.make, as automake does that automatically given that it's included by asn1/Makefile.am. Add some files to EXTRA_DIST lists. Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES, as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in EXTRA_DIST so that they're in the distribution. Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6 Reviewed-on: https://code.wireshark.org/review/3273 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Remove unneeded sys/types.hJoerg Mayer1-4/+0
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 "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin1-2/+2
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b. Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071 Reviewed-on: https://code.wireshark.org/review/2435 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update ASN.1 source files with the API changes done in g021e7afPascal Quantin1-2/+2
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-9/+9
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 Morriss8-19/+0
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-1/+5
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-42/+49
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 Mann2-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-0/+1
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-11I added EXPORT_FILES in too many places, remove themJörg Mayer1-4/+0
(via "copy - modify too little - paste" cycle) svn path=/trunk/; revision=49255
2013-05-10Some more protocols can be generated via cmakeJörg Mayer1-0/+37
svn path=/trunk/; revision=49233
2013-05-05Just whitespace changesJörg Mayer1-1/+2
svn path=/trunk/; revision=49167
2013-04-23Stub cmake support for generating the asn1 dissectors.Jörg Mayer1-0/+23
It doesn't do anything yet, it is just to make svn status readable again. svn path=/trunk/; revision=49007
2013-03-28-Wmissing-prototypesAnders Broman1-0/+3
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-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45015
2012-06-28Update Free Software Foundation address.Jakub Zawadzki5-5/+5
(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-14Don't generate the conformance file for exported types when building theJeff Morriss1-3/+3
dissector; instead built it only when the separate target (generate_export) is built. Built generate_export when building "all". This prevents the exp_*.cnf files from being regenerated each time another one of the exp_*.cnf files (which the current dissector depends on) has changed (despite the fact that the exported types does not depe Also fix the CLEANFILES definition so it actually cleans things. svn path=/trunk/; revision=39421
2011-10-10Build the ASN.1 dissectors directly into epan/dissectors (rather than buildingJeff Morriss1-13/+9
them and then copying them over). The "all" target to builds these dissectors now (instead of "generate_files" and/or "copy_files"). asn2wrs's "-O" option now means "the dissector goes in this directory" (rather than "all output goes in this directory"); it also means that the "-s" (single output file) option is now required. Fix things up so that it's possible to build all of the ASN.1 dissectors in one shot. Fix building of conformance files when doing out-of-source-tree builds. Unfortunately "make all" in the asn1 directory always builds something--I think because of circular depedencies. svn path=/trunk/; revision=39333
2011-05-27Corrected "old-style function definition".Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=37433
2010-04-07#include <string.h> and/or #include <stdio.h> not needed.Bill Meier1-3/+0
svn path=/trunk/; revision=32417
2010-04-06Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from ↵Anders Broman1-3/+4
epan/dissectors version. It's a pain to get these circular dependencies right. svn path=/trunk/; revision=32409
2010-02-23Squelch a bunch of compiler warnings.Guy Harris1-1/+1
svn path=/trunk/; revision=31961
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-31/+28
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=31054
2009-10-11Make all proto_* values static.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=30516
2009-10-08Remove unused NEED_PACKET_PROTO_H variableKovarththanan Rajaratnam1-1/+0
svn path=/trunk/; revision=30409
2009-08-21Use <gcrypt.h> instead of 'gcrypt.h'Kovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29501
2009-02-07#include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...Bill Meier1-1/+0
svn path=/trunk/; revision=27390
2008-07-23Get rid of some unused code warnings and fix an Id marking and some ↵Anders Broman1-1/+1
indentation changes. svn path=/trunk/; revision=25803
2008-05-11g_string_sprintf --> g_string_printf and g_string_sprintfa --> ↵Bill Meier1-1/+1
g_string_append_printf svn path=/trunk/; revision=25276
2008-01-16- Removed some unused variables in asn1 dissectorsStig Bjørlykke1-1/+1
- 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-3/+3
svn path=/trunk/; revision=24002
2007-12-19asn1/*/Makefile.nmake were not part of the source package.Jörg Mayer1-1/+2
Spotted by Tomas Kukosa. svn path=/trunk/; revision=23921
2007-12-10ANSI TCAP regenerated and tested with -T -X asn2wrs optionsTomas Kukosa1-1/+1
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior remove all -T and -X usage svn path=/trunk/; revision=23823
2007-11-01Change:Anders Broman1-2/+2
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-3/+4
[asn1 template plu generated .c file] svn path=/trunk/; revision=23301
2007-10-16- Fix svn:ignore for all directoriesJörg Mayer1-3/+3
- gsmmap: uncomment -s option in gsmmap.cnf - Fix cyclic dependencies: + Remove EXPORT_CNF from dependencies for cnf files + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf svn path=/trunk/; revision=23202
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 18:22:26 +0000