diff options
| -rw-r--r-- | epan/dissectors/Makefile.common | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.c | 74 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.h | 13 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 93 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkinit.c | 223 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkinit.h | 40 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkix1explicit.c | 210 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkix1explicit.h | 44 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkix1implicit.c | 289 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkix1implicit.h | 38 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509af.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509af.h | 1 |
12 files changed, 905 insertions, 128 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 6e85e7f5f7..c48be33c73 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -377,6 +377,9 @@ DISSECTOR_SRC = \ packet-pgm.c \ packet-pim.c \ packet-pkcs1.c \ + packet-pkix1explicit.c \ + packet-pkix1implicit.c \ + packet-pkinit.c \ packet-pktc.c \ packet-pop.c \ packet-portmap.c \ @@ -653,6 +656,9 @@ DISSECTOR_INCLUDES = \ packet-pflog.h \ packet-pim.h \ packet-pkcs1.h \ + packet-pkix1explicit.h \ + packet-pkix1implicit.h \ + packet-pkinit.h \ packet-pktc.h \ packet-portmap.h \ packet-ppp.h \ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 6d8d539e87..4fdb1f8070 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1,10 +1,9 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ./packet-cms.c */ +/* ../../tools/asn2eth.py -e -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.c */ -/* Include files: packet-cms-hf.c, packet-cms-ett.c, packet-cms-fn.c, packet-cms-hfarr.c, packet-cms-ettarr.c, packet-cms-val.h */ /* packet-cms.c * Routines for RFC2630 Cryptographic Message Syntax packet dissection @@ -53,14 +52,10 @@ /* Initialize the protocol and registered fields */ int proto_cms = -1; static int hf_cms_keyAttr_id = -1; +static int hf_cms_ci_contentType = -1; /*--- Included file: packet-cms-hf.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-hf.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ - static int hf_cms_version = -1; /* CMSVersion */ static int hf_cms_digestAlgorithms = -1; /* DigestAlgorithmIdentifiers */ static int hf_cms_encapContentInfo = -1; /* EncapsulatedContentInfo */ @@ -133,14 +128,10 @@ static int hf_cms_attributes = -1; /* UnauthAttributes */ /* Initialize the subtree pointers */ +static gint ett_cms_ContentInfo = -1; /*--- Included file: packet-cms-ett.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-ett.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ - static gint ett_cms_SignedData = -1; static gint ett_cms_DigestAlgorithmIdentifiers = -1; static gint ett_cms_SignerInfos = -1; @@ -189,10 +180,7 @@ static int dissect_cms_OtherKeyAttribute(gboolean implicit_tag _U_, tvbuff_t *tv /*--- Included file: packet-cms-fn.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-fn.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/*--- Fields for imported types ---*/ static int dissect_algorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_x509af_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_algorithm); @@ -213,6 +201,7 @@ static int dissect_serialNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509af_CertificateSerialNumber(FALSE, tvb, offset, pinfo, tree, hf_cms_serialNumber); } + static int dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, @@ -492,7 +481,7 @@ static ber_sequence IssuerAndSerialNumber_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber); @@ -1224,11 +1213,49 @@ dissect_cms_AuthenticatedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_ dissect_cms_AuthenticatedData(FALSE, tvb, 0, pinfo, tree, -1); } + + +/* ContentInfo can not yet be handled by the compiler */ +static char ci_contentType[64]; /*64 chars should be long enough? */ +static int +dissect_hf_cms_contentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) +{ + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_cms_ci_contentType, ci_contentType); + return offset; +} +static int +dissect_hf_cms_contentType_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) +{ + offset=call_ber_oid_callback(ci_contentType, tvb, offset, pinfo, tree); + + return offset; +} + +static ber_sequence ContentInfo_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_cms_contentType }, + { BER_CLASS_ANY, 0, 0, dissect_hf_cms_contentType_content }, + { 0, 0, 0, NULL } +}; + +int +dissect_cms_ContentInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + ContentInfo_sequence, hf_index, ett_cms_ContentInfo); + + return offset; +} + + /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { /* List of fields */ static hf_register_info hf[] = { + { &hf_cms_ci_contentType, + { "contentType", "cms.contentInfo.contentType", + FT_STRING, BASE_NONE, NULL, 0, + "ContentType", HFILL }}, { &hf_cms_keyAttr_id, { "keyAttr_id", "cms.keyAttr_id", FT_STRING, BASE_NONE, NULL, 0, @@ -1236,11 +1263,6 @@ void proto_register_cms(void) { /*--- Included file: packet-cms-hfarr.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-hfarr.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ - { &hf_cms_version, { "version", "cms.version", FT_INT32, BASE_DEC, VALS(CMSVersion_vals), 0, @@ -1516,14 +1538,10 @@ void proto_register_cms(void) { /* List of subtrees */ static gint *ett[] = { + &ett_cms_ContentInfo, /*--- Included file: packet-cms-ettarr.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-ettarr.c */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ - &ett_cms_SignedData, &ett_cms_DigestAlgorithmIdentifiers, &ett_cms_SignerInfos, diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index 561dfe5701..6dfdf3dc2b 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -1,10 +1,9 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms.h */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ./packet-cms.h */ +/* ../../tools/asn2eth.py -e -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.h */ -/* Include files: packet-cms-exp.h, packet-cms-valexp.h */ /* packet-cms.h * Routines for RFC2630 Cryptographic Message Syntax packet dissection @@ -33,15 +32,13 @@ #ifndef PACKET_CMS_H #define PACKET_CMS_H +int dissect_cms_ContentInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index); -/*--- Included file: packet-cms-exp.h ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-cms-exp.h */ -/* ../../tools/asn2eth.py -X -b -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/*--- Included file: packet-cms-exp.h ---*/ int dissect_cms_SignedData(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_Countersignature(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); /*--- End of included file: packet-cms-exp.h ---*/ diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index f659094fa2..9bd7d564d1 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1,9 +1,3 @@ -/* TODO: - PKINIT embryo inside should be pulled out into its own dissector, preferably - one that can handle generic PAtype additions via some registration API. - Keep an eye on ietf/krbwg on what they design for their framework for - adding PAtypes. -*/ /* packet-kerberos.c * Routines for Kerberos * Wes Hardaker (c) 2000 @@ -69,6 +63,7 @@ #include <epan/dissectors/packet-tcp.h> #include "prefs.h" #include <epan/dissectors/packet-ber.h> +#include <epan/dissectors/packet-pkinit.h> #include <epan/dissectors/packet-cms.h> #include <epan/dissectors/packet-windows-common.h> @@ -99,7 +94,6 @@ static gint hf_krb_w2k_pac_type = -1; static gint hf_krb_w2k_pac_size = -1; static gint hf_krb_w2k_pac_offset = -1; static gint hf_krb_padata = -1; -static gint hf_krb_contentinfo_contenttype = -1; static gint hf_krb_error_code = -1; static gint hf_krb_ticket = -1; static gint hf_krb_AP_REP_enc = -1; @@ -181,7 +175,6 @@ static gint hf_krb_EncKDCRepPart = -1; static gint hf_krb_LastReq = -1; static gint hf_krb_Authenticator = -1; static gint hf_krb_Checksum = -1; -static gint hf_krb_signedAuthPack = -1; static gint hf_krb_s_address = -1; static gint hf_krb_HostAddress = -1; static gint hf_krb_HostAddresses = -1; @@ -227,7 +220,6 @@ static gint hf_krb_e_checksum = -1; static gint ett_krb_kerberos = -1; static gint ett_krb_TransitedEncoding = -1; static gint ett_krb_PAC_LOGON_INFO = -1; -static gint ett_krb_signedAuthPack = -1; static gint ett_krb_PAC_CREDENTIAL_TYPE = -1; static gint ett_krb_PAC_SERVER_CHECKSUM = -1; static gint ett_krb_PAC_PRIVSVR_CHECKSUM = -1; @@ -1488,80 +1480,6 @@ dissect_krb5_PA_PAC_REQUEST(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, -static char ContentType[64]; /*64 chars should be long enough */ -static int -dissect_krb5_ContentInfo_ContentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - ContentType[0]=0; - offset=dissect_ber_object_identifier(TRUE, pinfo, tree, tvb, offset, hf_krb_contentinfo_contenttype, ContentType); - - return offset; -} - -/* the content of this structure depends on the ContentType object identifier */ -static int -dissect_krb5_ContentInfo_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - offset=call_ber_oid_callback(ContentType, tvb, offset, pinfo, tree); - - return offset; -} - -static ber_sequence ContentInfo_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_krb5_ContentInfo_ContentType }, - { BER_CLASS_CON, 0, 0, dissect_krb5_ContentInfo_content }, - { 0, 0, 0, NULL } -}; - -static int -dissect_krb5_PA_PK_AS_REQ_signedAuthPack(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, ContentInfo_sequence, hf_krb_signedAuthPack, ett_krb_signedAuthPack); - - return offset; -} - -static int -dissect_krb5_PA_PK_AS_REQ_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - BER_NOT_DECODED_YET("trustedCertifiers"); - - return offset; -} -static int -dissect_krb5_PA_PK_AS_REQ_kdcCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - BER_NOT_DECODED_YET("kdcCert"); - - return offset; -} -static int -dissect_krb5_PA_PK_AS_REQ_encryptionCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - BER_NOT_DECODED_YET("encryptionCert"); - - return offset; -} - - - -static ber_sequence PA_PK_AS_REQ_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_krb5_PA_PK_AS_REQ_signedAuthPack }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_PA_PK_AS_REQ_trustedCertifiers }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_PA_PK_AS_REQ_kdcCert }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_krb5_PA_PK_AS_REQ_encryptionCert }, - { 0, 0, 0, NULL } -}; -static int -dissect_krb5_PA_PK_AS_REQ(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) -{ - - offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, PA_PK_AS_REQ_sequence, -1, -1); - - return offset; -} - - static int dissect_krb5_PA_PROV_SRV_LOCATION(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { @@ -1744,7 +1662,7 @@ dissect_krb5_PA_DATA_value(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t offset=dissect_ber_octet_string_wcb(FALSE, pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice); break; case KRB5_PA_PK_AS_REQ: - offset=dissect_ber_octet_string_wcb(FALSE, pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PK_AS_REQ); + offset=dissect_ber_octet_string_wcb(FALSE, pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ); break; case KRB5_PA_PAC_REQUEST: offset=dissect_ber_octet_string_wcb(FALSE, pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST); @@ -3508,9 +3426,6 @@ proto_register_kerberos(void) { &hf_krb_address_netbios, { "NetBIOS Address", "kerberos.addr_nb", FT_STRING, BASE_NONE, NULL, 0, "NetBIOS Address and type", HFILL }}, - { &hf_krb_contentinfo_contenttype, { - "ContentType", "kerberos.contenttype", FT_STRING, BASE_NONE, - NULL, 0, "ContentInfo ContentType field", HFILL }}, { &hf_krb_authtime, { "Authtime", "kerberos.authtime", FT_STRING, BASE_NONE, NULL, 0, "Time of initial authentication", HFILL }}, @@ -3766,9 +3681,6 @@ proto_register_kerberos(void) { &hf_krb_s_address, { "S-Address", "kerberos.s_address", FT_NONE, BASE_DEC, NULL, 0, "This is the Senders address", HFILL }}, - { &hf_krb_signedAuthPack, { - "signedAuthPack", "kerberos.signedAuthPack", FT_NONE, BASE_DEC, - NULL, 0, "This is a Kerberos ContentInfo sequence", HFILL }}, { &hf_krb_key, { "key", "kerberos.key", FT_NONE, BASE_DEC, NULL, 0, "This is a Kerberos EncryptionKey sequence", HFILL }}, @@ -3910,7 +3822,6 @@ proto_register_kerberos(void) &ett_krb_PAC_SERVER_CHECKSUM, &ett_krb_PAC_PRIVSVR_CHECKSUM, &ett_krb_PAC_CLIENT_INFO_TYPE, - &ett_krb_signedAuthPack, &ett_krb_e_checksum, }; module_t *krb_module; diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c new file mode 100644 index 0000000000..66b92177ee --- /dev/null +++ b/epan/dissectors/packet-pkinit.c @@ -0,0 +1,223 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkinit.c */ +/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ + +/* Input file: packet-pkinit-template.c */ + +/* packet-pkinit.c + * Routines for PKINIT packet dissection + * + * $Id: packet-pkinit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * + * 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 <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-pkinit.h" + +#define PNAME "PKINIT" +#define PSNAME "PKInit" +#define PFNAME "pkinit" + +/* Initialize the protocol and registered fields */ +static int proto_pkinit = -1; + +/*--- Included file: packet-pkinit-hf.c ---*/ + +static int hf_pkinit_signedAuthPack = -1; /* ContentInfo */ +static int hf_pkinit_trustedCertifiers = -1; /* SEQUNCE_OF_TrustedCA */ +static int hf_pkinit_trustedCertifiers_item = -1; /* TrustedCA */ +static int hf_pkinit_kdcCert = -1; /* IssuerAndSerialNumber */ +static int hf_pkinit_caName = -1; /* Name */ +static int hf_pkinit_issuerAndSerial = -1; /* IssuerAndSerialNumber */ + +/*--- End of included file: packet-pkinit-hf.c ---*/ + + +/* Initialize the subtree pointers */ + +/*--- Included file: packet-pkinit-ett.c ---*/ + +static gint ett_pkinit_PaPkAsReq = -1; +static gint ett_pkinit_SEQUNCE_OF_TrustedCA = -1; +static gint ett_pkinit_TrustedCA = -1; + +/*--- End of included file: packet-pkinit-ett.c ---*/ + + + + +/*--- Included file: packet-pkinit-fn.c ---*/ + +/*--- Fields for imported types ---*/ + +static int dissect_signedAuthPack(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_cms_ContentInfo(FALSE, tvb, offset, pinfo, tree, hf_pkinit_signedAuthPack); +} +static int dissect_kdcCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_cms_IssuerAndSerialNumber(FALSE, tvb, offset, pinfo, tree, hf_pkinit_kdcCert); +} +static int dissect_caName(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1explicit_Name(FALSE, tvb, offset, pinfo, tree, hf_pkinit_caName); +} +static int dissect_issuerAndSerial(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_cms_IssuerAndSerialNumber(FALSE, tvb, offset, pinfo, tree, hf_pkinit_issuerAndSerial); +} + + +static const value_string TrustedCA_vals[] = { + { 0, "caName" }, + { 2, "issuerAndSerial" }, + { 0, NULL } +}; + +static ber_choice TrustedCA_choice[] = { + { 0, BER_CLASS_CON, 0, 0, dissect_caName }, + { 2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial }, + { 0, 0, 0, 0, NULL } +}; + +static int +dissect_pkinit_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_choice(pinfo, tree, tvb, offset, + TrustedCA_choice, hf_index, ett_pkinit_TrustedCA); + + return offset; +} +static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item); +} + +static ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = { + { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item }, +}; + +static int +dissect_pkinit_SEQUNCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, + SEQUNCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUNCE_OF_TrustedCA); + + return offset; +} +static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers); +} + +static ber_sequence PaPkAsReq_sequence[] = { + { BER_CLASS_CON, 0, 0, dissect_signedAuthPack }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert }, + { 0, 0, 0, NULL } +}; + +static int +dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq); + + return offset; +} + + +/*--- End of included file: packet-pkinit-fn.c ---*/ + + +int +dissect_pkinit_PA_PK_AS_REQ(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + offset = dissect_pkinit_PaPkAsReq(FALSE, tvb, offset, pinfo, tree, -1); + return offset; +} + + +/*--- proto_register_pkinit ----------------------------------------------*/ +void proto_register_pkinit(void) { + + /* List of fields */ + static hf_register_info hf[] = { + +/*--- Included file: packet-pkinit-hfarr.c ---*/ + + { &hf_pkinit_signedAuthPack, + { "signedAuthPack", "pkinit.signedAuthPack", + FT_NONE, BASE_NONE, NULL, 0, + "PaPkAsReq/signedAuthPack", HFILL }}, + { &hf_pkinit_trustedCertifiers, + { "trustedCertifiers", "pkinit.trustedCertifiers", + FT_UINT32, BASE_DEC, NULL, 0, + "PaPkAsReq/trustedCertifiers", HFILL }}, + { &hf_pkinit_trustedCertifiers_item, + { "Item[##]", "pkinit.trustedCertifiers_item", + FT_UINT32, BASE_DEC, VALS(TrustedCA_vals), 0, + "PaPkAsReq/trustedCertifiers/_item", HFILL }}, + { &hf_pkinit_kdcCert, + { "kdcCert", "pkinit.kdcCert", + FT_NONE, BASE_NONE, NULL, 0, + "PaPkAsReq/kdcCert", HFILL }}, + { &hf_pkinit_caName, + { "caName", "pkinit.caName", + FT_UINT32, BASE_DEC, NULL, 0, + "TrustedCA/caName", HFILL }}, + { &hf_pkinit_issuerAndSerial, + { "issuerAndSerial", "pkinit.issuerAndSerial", + FT_NONE, BASE_NONE, NULL, 0, + "TrustedCA/issuerAndSerial", HFILL }}, + +/*--- End of included file: packet-pkinit-hfarr.c ---*/ + + }; + + /* List of subtrees */ + static gint *ett[] = { + +/*--- Included file: packet-pkinit-ettarr.c ---*/ + + &ett_pkinit_PaPkAsReq, + &ett_pkinit_SEQUNCE_OF_TrustedCA, + &ett_pkinit_TrustedCA, + +/*--- End of included file: packet-pkinit-ettarr.c ---*/ + + }; + + /* Register protocol */ + proto_pkinit = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_pkinit, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_pkinit -------------------------------------------*/ +void proto_reg_handoff_pkinit(void) { +} + diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h new file mode 100644 index 0000000000..841d88ad17 --- /dev/null +++ b/epan/dissectors/packet-pkinit.h @@ -0,0 +1,40 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkinit.h */ +/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ + +/* Input file: packet-pkinit-template.h */ + +/* packet-pkinit.h + * Routines for PKINIT packet dissection + * + * $Id: packet-pkinit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $ + * + * 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_PKINIT_H +#define PACKET_PKINIT_H + +int dissect_pkinit_PA_PK_AS_REQ(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset); + +/*#include "packet-pkinit-exp.h"*/ + +#endif /* PACKET_PKINIT_H */ + diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c new file mode 100644 index 0000000000..83e37c959d --- /dev/null +++ b/epan/dissectors/packet-pkix1explicit.c @@ -0,0 +1,210 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkix1explicit.c */ +/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ + +/* Input file: packet-pkix1explicit-template.c */ + +#define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2eth */ + +/* packet-pkix1explicit.c + * Routines for PKIX1Explitic packet dissection + * + * $Id: packet-pkix1explicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * + * 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 <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-pkix1explicit.h" +#include "packet-x509af.h" +#include "packet-x509if.h" + +#define PNAME "PKIX1Explitit" +#define PSNAME "PKIX1EXPLICIT" +#define PFNAME "pkix1explicit" + +/* Initialize the protocol and registered fields */ +static int proto_pkix1explicit = -1; + +/*--- Included file: packet-pkix1explicit-hf.c ---*/ + +static int hf_pkix1explicit_type = -1; /* TeletexString */ +static int hf_pkix1explicit_value = -1; /* TeletexString */ + +/*--- End of included file: packet-pkix1explicit-hf.c ---*/ + + +/* Initialize the subtree pointers */ + +/*--- Included file: packet-pkix1explicit-ett.c ---*/ + +static gint ett_pkix1explicit_TeletexDomainDefinedAttribute = -1; + +/*--- End of included file: packet-pkix1explicit-ett.c ---*/ + + + +int +dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_x509af_CertificateSerialNumber(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} + +int +dissect_pkix1explicit_Name(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) { + offset = dissect_x509if_Name(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} + +static int +dissect_pkix1explicit_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} + +int +dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) { + offset = dissect_x509af_SubjectPublicKeyInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} + + + +/*--- Included file: packet-pkix1explicit-fn.c ---*/ + +/*--- Fields for imported types ---*/ + + + + +static const value_string TerminalType_vals[] = { + { 3, "telex" }, + { 4, "teletex" }, + { 5, "g3-facsimile" }, + { 6, "g4-facsimile" }, + { 7, "ia5-terminal" }, + { 8, "videotex" }, + { 0, NULL } +}; + + +static int +dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_integer(pinfo, tree, tvb, offset, hf_index, NULL); + + return offset; +} + + +static int +dissect_pkix1explicit_TeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, + pinfo, tree, tvb, offset, hf_index, + NULL); + + return offset; +} +static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_type); +} +static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value); +} + +static ber_sequence TeletexDomainDefinedAttribute_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type }, + { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value }, + { 0, 0, 0, NULL } +}; + +static int +dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute); + + return offset; +} + + +/*--- End of included file: packet-pkix1explicit-fn.c ---*/ + + + +/*--- proto_register_pkix1explicit ----------------------------------------------*/ +void proto_register_pkix1explicit(void) { + + /* List of fields */ + static hf_register_info hf[] = { + +/*--- Included file: packet-pkix1explicit-hfarr.c ---*/ + + { &hf_pkix1explicit_type, + { "type", "pkix1explicit.type", + FT_STRING, BASE_NONE, NULL, 0, + "TeletexDomainDefinedAttribute/type", HFILL }}, + { &hf_pkix1explicit_value, + { "value", "pkix1explicit.value", + FT_STRING, BASE_NONE, NULL, 0, + "TeletexDomainDefinedAttribute/value", HFILL }}, + +/*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ + + }; + + /* List of subtrees */ + static gint *ett[] = { + +/*--- Included file: packet-pkix1explicit-ettarr.c ---*/ + + &ett_pkix1explicit_TeletexDomainDefinedAttribute, + +/*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ + + }; + + /* Register protocol */ + proto_pkix1explicit = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_pkix1explicit, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_pkix1explicit -------------------------------------------*/ +void proto_reg_handoff_pkix1explicit(void) { +} + diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h new file mode 100644 index 0000000000..e571217f57 --- /dev/null +++ b/epan/dissectors/packet-pkix1explicit.h @@ -0,0 +1,44 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkix1explicit.h */ +/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ + +/* Input file: packet-pkix1explicit-template.h */ + +/* packet-pkix1explicit.h + * Routines for PKIX1Explicit packet dissection + * + * $Id: packet-pkix1explicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $ + * + * 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_PKIX1EXPLICIT_H +#define PACKET_PKIX1EXPLICIT_H + +int dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_pkix1explicit_Name(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_pkix1explicit_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index); +int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); + + +/*#include "packet-pkix1explicit-exp.h"*/ + +#endif /* PACKET_PKIX1EXPLICIT_H */ + diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c new file mode 100644 index 0000000000..3f4c450f13 --- /dev/null +++ b/epan/dissectors/packet-pkix1implicit.c @@ -0,0 +1,289 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkix1implicit.c */ +/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ + +/* Input file: packet-pkix1implicit-template.c */ + +/* packet-pkix1implicit.c + * Routines for PKIX1Implitic packet dissection + * + * $Id: packet-pkix1implicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * + * 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 <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" +#include "packet-pkix1implicit.h" + +#define PNAME "PKIX1Implitit" +#define PSNAME "PKIX1IMPLICIT" +#define PFNAME "pkix1implicit" + +/* Initialize the protocol and registered fields */ +static int proto_pkix1implicit = -1; + +/*--- Included file: packet-pkix1implicit-hf.c ---*/ + +static int hf_pkix1implicit_noticeRef = -1; /* NoticeReference */ +static int hf_pkix1implicit_explicitText = -1; /* DisplayText */ +static int hf_pkix1implicit_organization = -1; /* DisplayText */ +static int hf_pkix1implicit_noticeNumbers = -1; /* SEQUNCE_OF_INTEGER */ +static int hf_pkix1implicit_noticeNumbers_item = -1; /* INTEGER */ +static int hf_pkix1implicit_visibleString = -1; /* VisibleString */ +static int hf_pkix1implicit_bmpString = -1; /* BMPString */ +static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ + +/*--- End of included file: packet-pkix1implicit-hf.c ---*/ + + +/* Initialize the subtree pointers */ + +/*--- Included file: packet-pkix1implicit-ett.c ---*/ + +static gint ett_pkix1implicit_UserNotice = -1; +static gint ett_pkix1implicit_NoticeReference = -1; +static gint ett_pkix1implicit_SEQUNCE_OF_INTEGER = -1; +static gint ett_pkix1implicit_DisplayText = -1; + +/*--- End of included file: packet-pkix1implicit-ett.c ---*/ + + + + +/*--- Included file: packet-pkix1implicit-fn.c ---*/ + +/*--- Fields for imported types ---*/ + + + +static int +dissect_pkix1implicit_VisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString, + pinfo, tree, tvb, offset, hf_index, + NULL); + + return offset; +} +static int dissect_visibleString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_VisibleString(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_visibleString); +} + + +static int +dissect_pkix1implicit_BMPString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_BMPString, + pinfo, tree, tvb, offset, hf_index, + NULL); + + return offset; +} +static int dissect_bmpString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_BMPString(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_bmpString); +} + + +static int +dissect_pkix1implicit_UTF8String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String, + pinfo, tree, tvb, offset, hf_index, + NULL); + + return offset; +} +static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_utf8String); +} + + +static const value_string DisplayText_vals[] = { + { 0, "visibleString" }, + { 1, "bmpString" }, + { 2, "utf8String" }, + { 0, NULL } +}; + +static ber_choice DisplayText_choice[] = { + { 0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString }, + { 1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString }, + { 2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String }, + { 0, 0, 0, 0, NULL } +}; + +static int +dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_choice(pinfo, tree, tvb, offset, + DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText); + + return offset; +} +static int dissect_explicitText(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_DisplayText(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_explicitText); +} +static int dissect_organization(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_DisplayText(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_organization); +} + + + +static int +dissect_pkix1implicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_integer(pinfo, tree, tvb, offset, hf_index, NULL); + + return offset; +} +static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item); +} + +static ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = { + { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item }, +}; + +static int +dissect_pkix1implicit_SEQUNCE_OF_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, + SEQUNCE_OF_INTEGER_sequence_of, hf_index, ett_pkix1implicit_SEQUNCE_OF_INTEGER); + + return offset; +} +static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers); +} + +static ber_sequence NoticeReference_sequence[] = { + { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers }, + { 0, 0, 0, NULL } +}; + +static int +dissect_pkix1implicit_NoticeReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference); + + return offset; +} +static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef); +} + +static ber_sequence UserNotice_sequence[] = { + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef }, + { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText }, + { 0, 0, 0, NULL } +}; + +static int +dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, + UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice); + + return offset; +} + + +/*--- End of included file: packet-pkix1implicit-fn.c ---*/ + + + +/*--- proto_register_pkix1implicit ----------------------------------------------*/ +void proto_register_pkix1implicit(void) { + + /* List of fields */ + static hf_register_info hf[] = { + +/*--- Included file: packet-pkix1implicit-hfarr.c ---*/ + + { &hf_pkix1implicit_noticeRef, + { "noticeRef", "pkix1implicit.noticeRef", + FT_NONE, BASE_NONE, NULL, 0, + "UserNotice/noticeRef", HFILL }}, + { &hf_pkix1implicit_explicitText, + { "explicitText", "pkix1implicit.explicitText", + FT_UINT32, BASE_DEC, VALS(DisplayText_vals), 0, + "UserNotice/explicitText", HFILL }}, + { &hf_pkix1implicit_organization, + { "organization", "pkix1implicit.organization", + FT_UINT32, BASE_DEC, VALS(DisplayText_vals), 0, + "NoticeReference/organization", HFILL }}, + { &hf_pkix1implicit_noticeNumbers, + { "noticeNumbers", "pkix1implicit.noticeNumbers", + FT_UINT32, BASE_DEC, NULL, 0, + "NoticeReference/noticeNumbers", HFILL }}, + { &hf_pkix1implicit_noticeNumbers_item, + { "Item[##]", "pkix1implicit.noticeNumbers_item", + FT_INT32, BASE_DEC, NULL, 0, + "NoticeReference/noticeNumbers/_item", HFILL }}, + { &hf_pkix1implicit_visibleString, + { "visibleString", "pkix1implicit.visibleString", + FT_STRING, BASE_NONE, NULL, 0, + "DisplayText/visibleString", HFILL }}, + { &hf_pkix1implicit_bmpString, + { "bmpString", "pkix1implicit.bmpString", + FT_STRING, BASE_NONE, NULL, 0, + "DisplayText/bmpString", HFILL }}, + { &hf_pkix1implicit_utf8String, + { "utf8String", "pkix1implicit.utf8String", + FT_STRING, BASE_NONE, NULL, 0, + "DisplayText/utf8String", HFILL }}, + +/*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ + + }; + + /* List of subtrees */ + static gint *ett[] = { + +/*--- Included file: packet-pkix1implicit-ettarr.c ---*/ + + &ett_pkix1implicit_UserNotice, + &ett_pkix1implicit_NoticeReference, + &ett_pkix1implicit_SEQUNCE_OF_INTEGER, + &ett_pkix1implicit_DisplayText, + +/*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ + + }; + + /* Register protocol */ + proto_pkix1implicit = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_pkix1implicit, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_pkix1implicit -------------------------------------------*/ +void proto_reg_handoff_pkix1implicit(void) { +} + diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h new file mode 100644 index 0000000000..162152a43e --- /dev/null +++ b/epan/dissectors/packet-pkix1implicit.h @@ -0,0 +1,38 @@ +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-pkix1implicit.h */ +/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ + +/* Input file: packet-pkix1implicit-template.h */ + +/* packet-pkix1implicit.h + * Routines for PKIX1Implicit packet dissection + * + * $Id: packet-pkix1implicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $ + * + * 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_PKIX1IMPLICIT_H +#define PACKET_PKIX1IMPLICIT_H + +/*#include "packet-pkix1implicit-exp.h"*/ + +#endif /* PACKET_PKIX1IMPLICIT_H */ + diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 768a62e89e..b555ed75be 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -436,7 +436,7 @@ static ber_sequence SubjectPublicKeyInfo_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo); diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index 8c3c75e68b..9fea7025a0 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -39,6 +39,7 @@ int dissect_x509af_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int int dissect_x509af_Certificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509af_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509af_Certificates(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509af_CertificationPath(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509af_CertificateList(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); |