diff options
Diffstat (limited to 'asn1')
27 files changed, 480 insertions, 24 deletions
diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile new file mode 100755 index 0000000000..3124abcd03 --- /dev/null +++ b/asn1/cms/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-cms.c : ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf + python ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn + cp packet-cms.* ../../epan/dissectors + diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf new file mode 100644 index 0000000000..9fbeb1ab7c --- /dev/null +++ b/asn1/cms/cms-exp.cnf @@ -0,0 +1,30 @@ +#.IMPORT_TAG +ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +ContentType BER_CLASS_UNI BER_UNI_TAG_OID +SignedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +DigestAlgorithmIdentifiers BER_CLASS_UNI BER_UNI_TAG_SET +SignerInfos BER_CLASS_UNI BER_UNI_TAG_SET +EncapsulatedContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +SignerInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +SignerIdentifier -1/*choice*/ -1/*choice*/ +SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET +UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET +SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING +IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +#.END + +#.TYPE_ATTR +ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ContentType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +DigestAlgorithmIdentifiers TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SignerInfos TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +EncapsulatedContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignerInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignerIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(SignerIdentifier_vals) BITMASK = 0 +SignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +UnsignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 +IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +#.END + diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index aeead66849..ca6f88f3f4 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -12,11 +12,17 @@ InformationFramework x509if #.EXPORTS ContentInfo +ContentType +DigestAlgorithmIdentifiers EncapsulatedContentInfo -SignedData -Countersignature IssuerAndSerialNumber -OtherKeyAttribute +SignedAttributes +SignedData +SignerIdentifier +SignerInfo +SignerInfos +SignatureValue +UnsignedAttributes #.REGISTER SignedData B "1.2.840.113549.1.7.2" "id-signedData" diff --git a/asn1/cms/cms_exp.cnf b/asn1/cms/cms_exp.cnf deleted file mode 100644 index 97673d6923..0000000000 --- a/asn1/cms/cms_exp.cnf +++ /dev/null @@ -1,19 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Ethereal dissector compiler -# ./cms-exp.cnf -# ../../tools/asn2eth.py -e -X -b -p cms -c cms.cnf CryptographicMessageSyntax.asn - -#.IMPORT_TAG -ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -SignedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -#.END - -#.TYPE_ATTR -ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Countersignature TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -#.END - diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 86d478fd14..439f23e267 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -1,5 +1,6 @@ /* packet-cms.c * Routines for RFC2630 Cryptographic Message Syntax packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/cms/packet-cms-template.h b/asn1/cms/packet-cms-template.h index 3479f9a55f..6284c15eef 100644 --- a/asn1/cms/packet-cms-template.h +++ b/asn1/cms/packet-cms-template.h @@ -1,5 +1,6 @@ /* packet-cms.h * Routines for RFC2630 Cryptographic Message Syntax packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/ess/ExtendedSecurityServices.asn b/asn1/ess/ExtendedSecurityServices.asn new file mode 100644 index 0000000000..7ba3b89271 --- /dev/null +++ b/asn1/ess/ExtendedSecurityServices.asn @@ -0,0 +1,248 @@ +-- ExtendedSecurityServices as defined in RFC2634 +-- +-- The ASN definition has been modified to suit the Ethereal ASN2ETH compiler +-- +-- +-- +-- The original ASN.1 definition from RFC2634 contains the following +-- copyright statement: +-- +-- Full Copyright Statement +-- +-- Copyright (C) The Internet Society (1999). All Rights Reserved. +-- +-- This document and translations of it may be copied and furnished to +-- others, and derivative works that comment on or otherwise explain it +-- or assist in its implementation may be prepared, copied, published +-- and distributed, in whole or in part, without restriction of any +-- kind, provided that the above copyright notice and this paragraph are +-- included on all such copies and derivative works. However, this +-- document itself may not be modified in any way, such as by removing +-- the copyright notice or references to the Internet Society or other +-- Internet organizations, except as needed for the purpose of +-- developing Internet standards in which case the procedures for +-- copyrights defined in the Internet Standards process must be +-- followed, or as required to translate it into languages other than +-- English. +-- +-- The limited permissions granted above are perpetual and will not be +-- revoked by the Internet Society or its successors or assigns. +-- +-- This document and the information contained herein is provided on an +-- "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING +-- TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING +-- BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION +-- HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF +-- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. +-- + +ExtendedSecurityServices + { iso(1) member-body(2) us(840) rsadsi(113549) + pkcs(1) pkcs-9(9) smime(16) modules(0) ess(2) } + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + +-- Cryptographic Message Syntax (CMS) + ContentType, IssuerAndSerialNumber + FROM CryptographicMessageSyntax { iso(1) member-body(2) us(840) + rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) modules(0) cms(1)} + +-- X.509 + CertificateSerialNumber FROM AuthenticationFramework + + SubjectKeyIdentifier, PolicyInformation, GeneralNames + FROM CertificateExtensions + {joint-iso-ccitt ds(5) module(1) certificateExtensions(26) 0}; + + +-- Extended Security Services + +-- The construct "SEQUENCE SIZE (1..MAX) OF" appears in several ASN.1 +-- constructs in this module. A valid ASN.1 SEQUENCE can have zero or +-- more entries. The SIZE (1..MAX) construct constrains the SEQUENCE to +-- have at least one entry. MAX indicates the upper bound is unspecified. +-- Implementations are free to choose an upper bound that suits their +-- environment. + +-- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING + -- The contents are formatted as described in [UTF8] + +-- Section 2.7 + +ReceiptRequest ::= SEQUENCE { + signedContentIdentifier ContentIdentifier, + receiptsFrom ReceiptsFrom, + receiptsTo SEQUENCE OF GeneralNames } + +-- ub-receiptsTo INTEGER ::= 16 +-- +-- +-- id-aa-receiptRequest OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 1} + +ContentIdentifier ::= OCTET STRING + +-- id-aa-contentIdentifier OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 7} + +ReceiptsFrom ::= CHOICE { + allOrFirstTier [0] AllOrFirstTier, + -- formerly "allOrNone [0]AllOrNone" + receiptList [1] SEQUENCE OF GeneralNames } + +AllOrFirstTier ::= INTEGER { -- Formerly AllOrNone + allReceipts (0), + firstTierRecipients (1) } + + +-- Section 2.8 + +Receipt ::= SEQUENCE { + version ESSVersion, + contentType ContentType, + signedContentIdentifier ContentIdentifier, + originatorSignatureValue OCTET STRING } + +-- id-ct-receipt OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) +-- rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-ct(1) 1} + +ESSVersion ::= INTEGER { v1(1) } + +-- Section 2.9 + +ContentHints ::= SEQUENCE { + contentDescription UTF8String OPTIONAL, + contentType ContentType } + +-- id-aa-contentHint OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) +-- rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 4} + +-- Section 2.10 + +MsgSigDigest ::= OCTET STRING + +-- id-aa-msgSigDigest OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 5} + +-- Section 2.11 + +ContentReference ::= SEQUENCE { + contentType ContentType, + signedContentIdentifier ContentIdentifier, + originatorSignatureValue OCTET STRING } + +-- id-aa-contentReference OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 10 } + + +-- Section 3.2 +-- ASN2ETH cant handle sets yet +--ESSSecurityLabel ::= SET { +-- security-policy-identifier SecurityPolicyIdentifier, +-- security-classification SecurityClassification OPTIONAL, +-- privacy-mark ESSPrivacyMark OPTIONAL, +-- security-categories SecurityCategories OPTIONAL } +-- +-- id-aa-securityLabel OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 2} + +SecurityPolicyIdentifier ::= OBJECT IDENTIFIER + +SecurityClassification ::= INTEGER { + unmarked (0), + unclassified (1), + restricted (2), + confidential (3), + secret (4), + top-secret (5) } + +-- ub-integer-options INTEGER ::= 256 + +ESSPrivacyMark ::= CHOICE { + pString PrintableString, + utf8String UTF8String +} + +-- ub-privacy-mark-length INTEGER ::= 128 + +SecurityCategories ::= SET OF SecurityCategory + +-- ub-security-categories INTEGER ::= 64 + +SecurityCategory ::= SEQUENCE { + type [0] OBJECT IDENTIFIER, + value [1] ANY +} + +--Note: The aforementioned SecurityCategory syntax produces identical +--hex encodings as the following SecurityCategory syntax that is +--documented in the X.411 specification: +-- +--SecurityCategory ::= SEQUENCE { +-- type [0] SECURITY-CATEGORY, +-- value [1] ANY DEFINED BY type } +-- +--SECURITY-CATEGORY MACRO ::= +--BEGIN +--TYPE NOTATION ::= type | empty +--VALUE NOTATION ::= value (VALUE OBJECT IDENTIFIER) +--END + +-- Section 3.4 + +-- ASN2ETH cant generate code for ESSSecurityLabel yet +--EquivalentLabels ::= SEQUENCE OF ESSSecurityLabel + +-- id-aa-equivalentLabels OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 9} + + +-- Section 4.4 + +MLExpansionHistory ::= SEQUENCE OF MLData + +-- id-aa-mlExpandHistory OBJECT IDENTIFIER ::= { iso(1) member-body(2) +-- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 3} + +-- ub-ml-expansion-history INTEGER ::= 64 + +MLData ::= SEQUENCE { + mailListIdentifier EntityIdentifier, + expansionTime GeneralizedTime, + mlReceiptPolicy MLReceiptPolicy OPTIONAL } + +EntityIdentifier ::= CHOICE { + issuerAndSerialNumber IssuerAndSerialNumber, + subjectKeyIdentifier SubjectKeyIdentifier } + +MLReceiptPolicy ::= CHOICE { + none [0] NULL, + insteadOf [1] SEQUENCE OF GeneralNames, + inAdditionTo [2] SEQUENCE OF GeneralNames } + +SigningCertificate ::= SEQUENCE { + certs SEQUENCE OF ESSCertID, + policies SEQUENCE OF PolicyInformation OPTIONAL +} + +-- id-aa-signingCertificate OBJECT IDENTIFIER ::= { iso(1) +-- member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9) +-- smime(16) id-aa(2) 12 } + +ESSCertID ::= SEQUENCE { + certHash Hash, + issuerSerial IssuerSerial OPTIONAL +} + +Hash ::= OCTET STRING -- SHA1 hash of entire certificate + +IssuerSerial ::= SEQUENCE { + issuer GeneralNames, + serialNumber CertificateSerialNumber +} + +END -- of ExtendedSecurityServices + diff --git a/asn1/ess/Makefile b/asn1/ess/Makefile new file mode 100755 index 0000000000..8c5fdcb141 --- /dev/null +++ b/asn1/ess/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-ess.c : ../../tools/asn2eth.py ExtendedSecurityServices.asn packet-ess-template.c packet-ess-template.h ess.cnf + python ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn + cp packet-ess.* ../../epan/dissectors + diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf new file mode 100644 index 0000000000..f630d4dc80 --- /dev/null +++ b/asn1/ess/ess.cnf @@ -0,0 +1,43 @@ +# ess.cnf +# ExtendedSecurityServices conformation file + +# $Id: ess.cnf 12558 2004-11-21 10:16:06Z sahlberg $ + +#.MODULE_IMPORT +AuthenticationFramework x509af +CertificateExtensions x509ce +CryptographicMessageSyntax cms + +#.INCLUDE ../x509af/x509af-exp.cnf +#.INCLUDE ../x509ce/x509ce-exp.cnf +#.INCLUDE ../cms/cms-exp.cnf + +#.EXPORTS + +#.PDU + +#.REGISTER +ReceiptRequest B "1.2.840.113549.1.9.16.2.1" "id-aa-receiptRequest" +ContentIdentifier B "1.2.840.113549.1.9.16.2.7" "id-aa-contentIdentifier" +Receipt B "1.2.840.113549.1.9.16.1.1" "id-ct-receipt" +ContentHints B "1.2.840.113549.1.9.16.2.4" "id-aa-contentHint" +MsgSigDigest B "1.2.840.113549.1.9.16.2.5" "id-aa-msgSigDigest" +ContentReference B "1.2.840.113549.1.9.16.2.10" "id-aa-contentReference" +MLExpansionHistory B "1.2.840.113549.1.9.16.2.3" "id-aa-mlExpandHistory" +SigningCertificate B "1.2.840.113549.1.9.16.2.12" "id-aa-signingCertificate" + +#.NO_EMIT + +#.TYPE_RENAME + +#.FIELD_RENAME + +#.FN_BODY SecurityCategory/type + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_ess_SecurityCategory_type_OID, object_identifier_id); + +#.FN_BODY SecurityCategory/value + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + +#.END + diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c new file mode 100644 index 0000000000..1d0edcf3be --- /dev/null +++ b/asn1/ess/packet-ess-template.c @@ -0,0 +1,89 @@ +/* packet-ess.c + * Routines for RFC2634 Extended Security Services packet dissection + * Ronnie Sahlberg 2004 + * + * $Id: packet-ess-template.c 12438 2004-10-30 02:36:58Z sahlberg $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-ess.h" +#include "packet-cms.h" +#include "packet-x509ce.h" +#include "packet-x509af.h" + +#define PNAME "Extended Security Services" +#define PSNAME "ESS" +#define PFNAME "ess" + +/* Initialize the protocol and registered fields */ +static int proto_ess = -1; +static int hf_ess_SecurityCategory_type_OID = -1; +#include "packet-ess-hf.c" + +/* Initialize the subtree pointers */ +#include "packet-ess-ett.c" + +static char object_identifier_id[64]; /*64 chars should be long enough? */ + +#include "packet-ess-fn.c" + + +/*--- proto_register_ess ----------------------------------------------*/ +void proto_register_ess(void) { + + /* List of fields */ + static hf_register_info hf[] = { + { &hf_ess_SecurityCategory_type_OID, + { "type", "ess.type_OID", FT_STRING, BASE_NONE, NULL, 0, + "Type of Security Category", HFILL }}, +#include "packet-ess-hfarr.c" + }; + + /* List of subtrees */ + static gint *ett[] = { +#include "packet-ess-ettarr.c" + }; + + /* Register protocol */ + proto_ess = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_ess, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_ess -------------------------------------------*/ +void proto_reg_handoff_ess(void) { +#include "packet-ess-dis-tab.c" +} + diff --git a/asn1/ess/packet-ess-template.h b/asn1/ess/packet-ess-template.h new file mode 100644 index 0000000000..fecc0788ab --- /dev/null +++ b/asn1/ess/packet-ess-template.h @@ -0,0 +1,32 @@ +/* packet-ess.h + * Routines for RFC2634 Extended Security Services packet dissection + * Ronnie Sahlberg 2004 + * + * $Id: packet-ess-template.h 12437 2004-10-30 02:18:44Z sahlberg $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef PACKET_ESS_H +#define PACKET_ESS_H + +/*#include "packet-ess-exp.h"*/ + +#endif /* PACKET_ESS_H */ + diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c index 44d3b73316..87bba37dcd 100644 --- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c +++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c @@ -1,5 +1,6 @@ /* packet-ns_cert_exts.c * Routines for NetScape Certificate Extensions packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h b/asn1/ns-cert-exts/packet-ns_cert_exts-template.h index fdbd43db25..b1ea1fc128 100644 --- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h +++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.h @@ -1,5 +1,6 @@ /* packet-ns-cert-exts.h * Routines for NetScape Certificate Extensions packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index 7445376f1e..452ac97725 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -1,5 +1,6 @@ /* packet-pkcs1.c * Routines for PKCS#1/RFC2313 packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/pkcs1/packet-pkcs1-template.h b/asn1/pkcs1/packet-pkcs1-template.h index 8facce40b4..6cdd04fb54 100644 --- a/asn1/pkcs1/packet-pkcs1-template.h +++ b/asn1/pkcs1/packet-pkcs1-template.h @@ -1,5 +1,6 @@ /* packet-pkcs1.h * Routines for PKCS#1/RFC2313 packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c index 8b217b6228..462214abc6 100644 --- a/asn1/pkinit/packet-pkinit-template.c +++ b/asn1/pkinit/packet-pkinit-template.c @@ -1,5 +1,6 @@ /* packet-pkinit.c * Routines for PKINIT packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/pkinit/packet-pkinit-template.h b/asn1/pkinit/packet-pkinit-template.h index 7f9e78edeb..6b924cef4d 100644 --- a/asn1/pkinit/packet-pkinit-template.h +++ b/asn1/pkinit/packet-pkinit-template.h @@ -1,5 +1,6 @@ /* packet-pkinit.h * Routines for PKINIT packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf index 4e48a92eee..4918190300 100644 --- a/asn1/pkinit/pkinit.cnf +++ b/asn1/pkinit/pkinit.cnf @@ -8,7 +8,7 @@ PKIX1Explicit88 pkix1explicit CryptographicMessageSyntax cms #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf -#.INCLUDE ../cms/cms_exp.cnf +#.INCLUDE ../cms/cms-exp.cnf #.EXPORTS diff --git a/asn1/pkixqualified/packet-pkixqualified-template.h b/asn1/pkixqualified/packet-pkixqualified-template.h index 856f3e631a..32ab885b0d 100644 --- a/asn1/pkixqualified/packet-pkixqualified-template.h +++ b/asn1/pkixqualified/packet-pkixqualified-template.h @@ -1,5 +1,6 @@ /* packet-pkixqualified.h * Routines for RFC3739 PKIXqualified packet dissection + * Ronnie Sahlberg 2004 * * $Id: packet-pkixqualified-template.h 12434 2004-10-29 12:11:42Z sahlberg $ * diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index e202523d5d..bd9abac00f 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -1,5 +1,6 @@ /* packet-x509af.c * Routines for X.509 Authentication Framework packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509af/packet-x509af-template.h b/asn1/x509af/packet-x509af-template.h index 91a487ba95..aee498631c 100644 --- a/asn1/x509af/packet-x509af-template.h +++ b/asn1/x509af/packet-x509af-template.h @@ -1,5 +1,6 @@ /* packet-x509af.h * Routines for X.509 Authentication Framework packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index 7a6391eeae..d463058d29 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -1,5 +1,6 @@ /* packet-x509ce.c * Routines for X.509 Certificate Extensions packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509ce/packet-x509ce-template.h b/asn1/x509ce/packet-x509ce-template.h index f88f4ee741..cc6c44e5fa 100644 --- a/asn1/x509ce/packet-x509ce-template.h +++ b/asn1/x509ce/packet-x509ce-template.h @@ -1,5 +1,6 @@ /* packet-x509ce.h * Routines for X.509 Certificate Extensions packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index 306d671319..4123820793 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -1,5 +1,6 @@ /* packet-x509if.c * Routines for X.509 Information Framework packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * @@ -42,7 +43,7 @@ /* Initialize the protocol and registered fields */ int proto_x509if = -1; -int hf_x509if_object_identifier_id = -1; +static int hf_x509if_object_identifier_id = -1; #include "packet-x509if-hf.c" /* Initialize the subtree pointers */ diff --git a/asn1/x509if/packet-x509if-template.h b/asn1/x509if/packet-x509if-template.h index 70f826af9e..1326b15a40 100644 --- a/asn1/x509if/packet-x509if-template.h +++ b/asn1/x509if/packet-x509if-template.h @@ -1,5 +1,6 @@ /* packet-x509if.h * Routines for X.509 Information Framework packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 01f8446b4e..c5fde897b4 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -1,6 +1,7 @@ #define BER_UNI_TAG_TeletexString 20 /* until we fix the bug in asn2eth */ /* packet-x509sat.c * Routines for X.509 Selected Attribute Types packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/x509sat/packet-x509sat-template.h b/asn1/x509sat/packet-x509sat-template.h index 4e936a0a59..fde2edce5f 100644 --- a/asn1/x509sat/packet-x509sat-template.h +++ b/asn1/x509sat/packet-x509sat-template.h @@ -1,5 +1,6 @@ /* packet-x509sat.h * Routines for X.509 Selected Attribute Types packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * |