aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x509sat
AgeCommit message (Collapse)AuthorFilesLines
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-2/+2
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26cmake: add asn1 target, avoid unnecessary rebuildsPeter Wu1-2/+2
Add an "asn1" build target that rebuilds all ASN.1 dissectors. Do not always generate the ASN.1 dissector when invoking the "generate_dissector-PROTO" target. Use a special "packet-PROTO-stamp" file to detect whether the dissector is out of date. This indirection is needed because cmake removes output files from add_custom_command in the clean target, but we would like to keep the generated packet-PROTO.c files. Make all EXTRA_CNF and EXPORT_DEPENDS point to absolute paths for generated exported configs (PROTO-exp.cnf). This is done by automake too and is needed for proper dependency tracking. Example: when h225.cnf is updated, h225-exp.cnf needs to be generated. That is the purpose of the "generate-h225-exp.cnf" target. Now h235 (and other) dissectors need to be regenerated as well because the h225-exp.cnf is updated. This is why there is a separate add_custom_command and add_custom_target. Change-Id: I8cfc1f8f43cea595267b21eae30b4548f3407c0b Reviewed-on: https://code.wireshark.org/review/12080 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman1-1/+1
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-1/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13ASN1: Register BER syntaxes as NEWStig Bjørlykke1-1/+1
Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986 Reviewed-on: https://code.wireshark.org/review/4639 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13ASN1: Register PDU-dissectors as NEWStig Bjørlykke1-1/+1
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
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-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin1-1/+1
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-1/+1
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-07Handle string types with somewhat appropriate encodings.Guy Harris1-14/+0
For various string types defined in X.680, use the appropriate encoding, or ENC_ASCII|ENC_NA in some cases where we don't have an appropriate encoding yet. This most significantly fixes the handling of BMPString and UniversalString, which are supersets of ASCII (Unicode Basic Multilingual Plane and Unicode, respectively), but don't encode ASCII characters as single octets. It also fixes UTF8String to, well, properly recognize UTF-8. This also lets us get rid of the special handling of SyntaxBMPString in X.509sat (and, in fact, *requires* us to get rid of it, as, otherwise, the string value appears twice). Change-Id: I325c4e71a6110278eb23b86e0d986e6439cfc328 Reviewed-on: https://code.wireshark.org/review/994 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-1/+1
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 Morriss7-17/+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>
2013-12-19Use proto_tree_add_item() or tvb_get_string_enc() instead ofGuy Harris1-1/+1
tvb_get_unicode_string(). If there's an indication that the encoding is UCS-2, use that, otherwise use UTF-16. (For example, "BMP" stands for "Basic Multilingual Plane", which is the part of Unicode that can be encoded in 16 bits, hence UCS-2.) In the description of the "Use Heuristics for UDP" preference for the XML dissector, note that it's not just trying to recognize XML in UCS-2, it's trying to recognize XML in *big-endian* UCS-2. svn path=/trunk/; revision=54245
2013-12-07- Make local functions static.Anders Broman1-0/+3
- Forward declaration of register functions. svn path=/trunk/; revision=53821
2013-09-22emem -> wmem conversion:Pascal Quantin1-1/+1
- 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-09-15Fix checkapi warnings (missing id)Jörg Mayer1-13/+13
Replace Makefile.{am,nmake,common} that did not conform by their asn1/c133/ version. svn path=/trunk/; revision=52062
2013-05-07Allow generating some more dissectors with cmake.Jörg Mayer1-0/+36
svn path=/trunk/; revision=49196
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-02Use explicit casts.Anders Broman1-2/+2
svn path=/trunk/; revision=48008
2012-12-07Added deltaRevocationList.Stig Bjørlykke1-3/+3
svn path=/trunk/; revision=46438
2012-11-12Added attributes from RFC 2798.Stig Bjørlykke2-1/+13
svn path=/trunk/; revision=46013
2012-11-12Fixed some typosStig Bjørlykke1-2/+2
svn path=/trunk/; revision=46009
2012-11-12Update ACP133 to edition D.Stig Bjørlykke1-0/+19
svn path=/trunk/; revision=46008
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
2012-04-03Fix off by one shift error introduced in r39531.Jakub Zawadzki1-1/+1
In tvb_get_ephemeral_unicode_string() length is number of bytes (not characters). svn path=/trunk/; revision=41903
2011-10-23Replace use of tvb_get_ephemeral_faked_unicode() by use of ↵Bill Meier1-1/+1
tvb_get_ephemeral_unicode_string(); Fix encoding arg. svn path=/trunk/; revision=39531
2011-10-14Don't generate the conformance file for exported types when building theJeff Morriss1-2/+2
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-10/+6
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-02-20Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistentStig Bjørlykke3-6/+6
on the naming policy for X.400 protocols. svn path=/trunk/; revision=36013
2010-08-03Added some missing elements from MS Certificate:Stig Bjørlykke1-0/+3
- Previous Cert Hash - Virtual Base - Next Publisher svn path=/trunk/; revision=33695
2010-06-29New "#.SYNTAX" section for the asn2wrs conformance file. Graeme Lunt1-17/+16
This allows syntaxes to be registered separately from PDUs. Within the new section, the ASN.1 types to be used as syntaxes should be iterated. An optional second parameter on each line may be provided to provide an alternative name for the syntax (that the user will see). This name must be in double quotes. svn path=/trunk/; revision=33370
2010-06-28Remove the -R flag (used to generate syntax registrations) and replace with a Graeme Lunt2-1/+3
packet-<proto>-syn-reg.c output file. This is more generic and allows the syntax registrations to the directed from the template file. svn path=/trunk/; revision=33342
2010-06-24Build dependency to x411.Stig Bjørlykke1-1/+5
svn path=/trunk/; revision=33314
2010-06-23Update to register basic ASN.1 syntaxes.Graeme Lunt3-9/+32
svn path=/trunk/; revision=33299
2010-06-02CA Version certificate extensionGraeme Lunt1-0/+1
svn path=/trunk/; revision=33049
2010-04-07#include <string.h> and/or #include <stdio.h> not needed.Bill Meier1-2/+0
svn path=/trunk/; revision=32417
2010-04-06#include <stdio.h> not needed.Bill Meier1-1/+0
svn path=/trunk/; revision=32405
2009-11-27Corrected OID for organizationalUnit.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=31096
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-06-15Bug 2833: Graeme Lunt1-3/+5
Naming attributes in subject DNs defined for Extended Validation Certificates http://www.cabforum.org/EV_Certificate_Guidelines_draft11.pdf svn path=/trunk/; revision=28746
2009-06-05Microsoft PKCS#12 local machine keyset bag attributeGraeme Lunt1-0/+1
svn path=/trunk/; revision=28641
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-11-10fix problem with X.411 asn2wrs compilation, all dissectors regeneratedTomas Kukosa1-1/+1
svn path=/trunk/; revision=26740
2008-09-21Try to fix some "defined but not used" warnings.Anders Broman1-0/+23
svn path=/trunk/; revision=26243
2008-09-02Try to fix unused code warnings.Anders Broman1-3/+0
svn path=/trunk/; revision=26111
2008-09-02Try to fix unused code warnings.Anders Broman3-1128/+1115
svn path=/trunk/; revision=26110
2008-07-23Get rid of some unused code warnings.Anders Broman1-11/+21
svn path=/trunk/; revision=25804