aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pkcs1
AgeCommit message (Collapse)AuthorFilesLines
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann2-14/+14
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-1/+1
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-11-25Require BER dissector (OID) registration to be "new style".Michael Mann1-13/+13
Both old and new style API existed, just remove the "old" one. Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013 Reviewed-on: https://code.wireshark.org/review/12107 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-18x509af: dissect subjectPublicKey for RSAPeter Wu1-0/+3
The subjectPublicKey field of a Certificate (TBSCertificate) is defined as type BIT STRING. The actual contents depend on the Algorithm Identifier which is preceding the subjectPublicKey field. This patch adds support for dissection of the public key for RSA public keys which show up below the subjectPublicKey tree: subjectPublicKeyInfo algorithm (rsaEncryption) Algorithm Id: 1.2.840.113549.1.1.1 (rsaEncryption) subjectPublicKey: 3082010a0282010100b7c769e2d0eacaeb929fc08238a9ff... modulus : 0x00b7c769e2d0eacaeb929fc08238a9ffc59cab39c28a2e26... publicExponent: 65537 Change-Id: Ib92645433b0a0078a947ff0ac26c5e6a64877b93 Reviewed-on: https://code.wireshark.org/review/10967 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-18pkcs1: remove unused RSAPrivateKey definitionPeter Wu2-15/+0
RSA private keys are typically not found in network captures, so let's just remove it. This removal avoids overloading the pkcs1.modulus field with the same meaning from two different contexts (RSAPrivateKey and RSAPublicKey). Change-Id: I65239718e6fc801fc53fa46c467dc86620aa3b29 Reviewed-on: https://code.wireshark.org/review/10546 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-07Add SHA2 algos to certificate dissection in SSLTimothy Geiser1-1/+10
Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9 Reviewed-on: https://code.wireshark.org/review/9880 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-06PKCS1: fix a typo for OID 1.3.132.0.35Robert P1-2/+2
Bug: 11106 Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456 Reviewed-on: https://code.wireshark.org/review/7941 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-2/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss8-18/+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-07- Make local functions static.Anders Broman1-0/+3
- Forward declaration of register functions. svn path=/trunk/; revision=53821
2013-06-19Apparently one of our major global headers must include emem.h, because I justEvan Huus1-0/+1
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/+35
svn path=/trunk/; revision=49233
2013-05-05Just whitespace changesJörg Mayer1-2/+3
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
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-06-24From Martin Kaiser:Anders Broman2-0/+9
add oid for sha256. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7395 svn path=/trunk/; revision=43469
2011-11-10From Martin Kaiser:Anders Broman2-2/+63
RSASSA-PSS support for X.509 certificates. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6541 svn path=/trunk/; revision=39785
2011-10-10Build the ASN.1 dissectors directly into epan/dissectors (rather than buildingJeff Morriss1-7/+3
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-07-14Update the algorithms in line with RFC 5912 including support for eliptic ↵Graeme Lunt5-58/+602
curve algorithms. svn path=/trunk/; revision=38017
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-10-08Remove unused NEED_PACKET_PROTO_H variableKovarththanan Rajaratnam1-1/+0
svn path=/trunk/; revision=30409
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
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-04Update do use the -X and -T asn2wrs flags.Anders Broman1-1/+1
svn path=/trunk/; revision=23360
2007-10-16- Fix svn:ignore for all directoriesJörg Mayer1-1/+1
- 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
2007-10-10Add missing dependencies and update syntax of existing ones.Jörg Mayer1-1/+5
svn path=/trunk/; revision=23143
2007-10-10- Change Makefiles to include preincJörg Mayer2-1/+3
- Add missing new directories to asn1/Makefile.nmake svn path=/trunk/; revision=23141
2007-10-09More Makefile conversionsJörg Mayer4-56/+96
svn path=/trunk/; revision=23116
2007-05-13Second step in introducing asn context to BER dissectors just like in PER.Anders Broman1-1/+2
svn path=/trunk/; revision=21753
2007-05-03uppercase identifiers are not allowedTomas Kukosa1-1/+1
svn path=/trunk/; revision=21659
2006-10-29put every python script name into "" so the call won't fail on Win32 native ↵Ulf Lamping1-1/+1
python. The problem is the slash in e.g.: @$(PYTHON) ../../tools/make-dissector-reg.py is interpreted as an option instead of being part of the path. I didn't wanted to use backslashes as this might introduce new problems with cygwin's python port. svn path=/trunk/; revision=19730
2006-05-24- remove some #.MODULE_IMPORT from .cng filesTomas Kukosa1-3/+0
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs svn path=/trunk/; revision=18217
2006-05-21- asn2eth renamed to asn2wrsTomas Kukosa2-5/+5
- remove obsolete -X option from makefiles - not generate enumerated map table for BER dissector will be regenerated later svn path=/trunk/; revision=18199
2006-05-21name changeRonnie Sahlberg2-4/+4
svn path=/trunk/; revision=18197
2006-04-25Add distclean and maintainerclean rules.Guy Harris1-0/+4
svn path=/trunk/; revision=17999
2006-02-23Add parsertab.pyc in clean targetAnders Broman1-3/+3
svn path=/trunk/; revision=17387
2005-09-07Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in orderGerald Combs1-2/+2
to fix compilation under Windows NT. This should fix bug 403. The changes were made using "find . -name Makefile.nmake | xargs perl -pi.bak -e 's: /y::i'". They appear to work under XP, but if anything broke I blame Larry Wall. svn path=/trunk/; revision=15710
2005-08-02Fix more "no previous declaration" warnings - the forgotten filesJörg Mayer1-0/+1
svn path=/trunk/; revision=15170
2005-01-16When using Cygwin's python asn2eth.pyLars Roland1-5/+24
generates dissectors with mixed EOL! SVN doesn't allow you to commit such files. Add a target to all nmake makefiles in asn1 subdirectory which will fix these files. svn path=/trunk/; revision=13077
2005-01-16Supply Makefile.nmake files.Guy Harris1-0/+23
svn path=/trunk/; revision=13072
2005-01-16Make the Makefile look like the h235 Makefiles, with the new rules.Guy Harris1-2/+14
Get rid of their "executable" property, and set svn:keywords to Id and svn:eol-style to native if they're not already set. svn path=/trunk/; revision=13071
2004-12-12updates from tomas and andersRonnie Sahlberg1-0/+4
create some missing makefiles for autogenerated dissectors finish the transition to the new ber integer dissetor helper signature and regenerate all ber dissectors svn path=/trunk/; revision=12724
2004-11-22New protocol: RFC2634 ExtendedSecurityServicesRonnie Sahlberg2-0/+2
updates to cms to accomodate the new protocol add author to some files svn path=/trunk/; revision=12573
2004-11-21cleanup for x509afRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=12558