diff options
Diffstat (limited to 'epan/dissectors/packet-x509af.c')
-rw-r--r-- | epan/dissectors/packet-x509af.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index b555ed75be..1fa165c10a 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -8,7 +8,7 @@ /* packet-x509af.c * Routines for X.509 Authentication Framework packet dissection * - * $Id: packet-x509af-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $ + * $Id: packet-x509af-template.c 12245 2004-10-08 20:28:04Z guy $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -192,7 +192,7 @@ dissect_hf_x509af_extension_type(packet_info *pinfo, proto_tree *tree, tvbuff_t return offset; } -static ber_sequence Extension_sequence[] = { +static const ber_sequence Extension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_extension_id }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical }, { BER_CLASS_ANY, 0, 0, dissect_hf_x509af_extension_type }, @@ -225,7 +225,7 @@ dissect_hf_x509af_algorithm_type(packet_info *pinfo, proto_tree *tree, tvbuff_t } /* Algorithm Identifier can not yet be handled by the compiler */ -static ber_sequence AlgorithmIdentifier_sequence[] = { +static const ber_sequence AlgorithmIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_algorithm_id }, { BER_CLASS_ANY, 0, 0, dissect_hf_x509af_algorithm_type }, { 0, 0, 0, NULL } @@ -368,7 +368,7 @@ static const value_string Time_vals[] = { { 0, NULL } }; -static ber_choice Time_choice[] = { +static const ber_choice Time_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime }, { 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime }, { 0, 0, 0, 0, NULL } @@ -397,7 +397,7 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate); } -static ber_sequence Validity_sequence[] = { +static const ber_sequence Validity_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter }, { 0, 0, 0, NULL } @@ -430,7 +430,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey); } -static ber_sequence SubjectPublicKeyInfo_sequence[] = { +static const ber_sequence SubjectPublicKeyInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey }, { 0, 0, 0, NULL } @@ -451,7 +451,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item); } -static ber_sequence Extensions_sequence_of[1] = { +static const ber_sequence Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -472,7 +472,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions); } -static ber_sequence T_signedCertificate_sequence[] = { +static const ber_sequence T_signedCertificate_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, @@ -497,7 +497,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate); } -static ber_sequence Certificate_sequence[] = { +static const ber_sequence Certificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -527,7 +527,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate); } -static ber_sequence CrossCertificates_set_of[1] = { +static const ber_sequence CrossCertificates_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item }, }; @@ -542,7 +542,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item); } -static ber_sequence ForwardCertificationPath_sequence_of[1] = { +static const ber_sequence ForwardCertificationPath_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item }, }; @@ -557,7 +557,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath); } -static ber_sequence Certificates_sequence[] = { +static const ber_sequence Certificates_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath }, { 0, 0, 0, NULL } @@ -571,7 +571,7 @@ dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static ber_sequence CertificatePair_sequence[] = { +static const ber_sequence CertificatePair_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA }, { 0, 0, 0, NULL } @@ -588,7 +588,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree, return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item); } -static ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = { +static const ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item }, }; @@ -603,7 +603,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates); } -static ber_sequence CertificationPath_sequence[] = { +static const ber_sequence CertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates }, { 0, 0, 0, NULL } @@ -617,7 +617,7 @@ dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static ber_sequence T_revokedCertificates_item_sequence[] = { +static const ber_sequence T_revokedCertificates_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_userCertificate1 }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions }, @@ -635,7 +635,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item); } -static ber_sequence T_revokedCertificates_sequence_of[1] = { +static const ber_sequence T_revokedCertificates_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item }, }; @@ -650,7 +650,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates); } -static ber_sequence T_signedCertificateList_sequence[] = { +static const ber_sequence T_signedCertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer }, @@ -672,7 +672,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList); } -static ber_sequence CertificateList_sequence[] = { +static const ber_sequence CertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -687,7 +687,7 @@ dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static ber_sequence IssuerSerial_sequence[] = { +static const ber_sequence IssuerSerial_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID }, @@ -712,7 +712,7 @@ static const value_string InfoSubject_vals[] = { { 0, NULL } }; -static ber_choice InfoSubject_choice[] = { +static const ber_choice InfoSubject_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID }, { 1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName }, { 0, 0, 0, 0, NULL } @@ -729,7 +729,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject); } -static ber_sequence AttCertValidityPeriod_sequence[] = { +static const ber_sequence AttCertValidityPeriod_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime }, { 0, 0, 0, NULL } @@ -746,7 +746,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod); } -static ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = { +static const ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item }, }; @@ -761,7 +761,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes); } -static ber_sequence AttributeCertificateInfo_sequence[] = { +static const ber_sequence AttributeCertificateInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 }, @@ -785,7 +785,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo); } -static ber_sequence AttributeCertificate_sequence[] = { +static const ber_sequence AttributeCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -803,7 +803,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate); } -static ber_sequence ACPathData_sequence[] = { +static const ber_sequence ACPathData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate }, { 0, 0, 0, NULL } @@ -820,7 +820,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item); } -static ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = { +static const ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item }, }; @@ -835,7 +835,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath); } -static ber_sequence AttributeCertificationPath_sequence[] = { +static const ber_sequence AttributeCertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath }, { 0, 0, 0, NULL } @@ -856,7 +856,7 @@ static const value_string AssertionSubject_vals[] = { { 0, NULL } }; -static ber_choice AssertionSubject_choice[] = { +static const ber_choice AssertionSubject_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID }, { 1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName }, { 0, 0, 0, 0, NULL } @@ -873,7 +873,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject); } -static ber_sequence SET_OF_AttributeType_set_of[1] = { +static const ber_sequence SET_OF_AttributeType_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item }, }; @@ -888,7 +888,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType); } -static ber_sequence AttributeCertificateAssertion_sequence[] = { +static const ber_sequence AttributeCertificateAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity }, @@ -1037,7 +1037,7 @@ void proto_register_x509af(void) { FT_STRING, BASE_NONE, NULL, 0, "Time/generalizedTime", HFILL }}, { &hf_x509af_Extensions_item, - { "Item[##]", "x509af.Extensions_item", + { "Item", "x509af.Extensions_item", FT_NONE, BASE_NONE, NULL, 0, "Extensions/_item", HFILL }}, { &hf_x509af_userCertificate, @@ -1049,11 +1049,11 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "Certificates/certificationPath", HFILL }}, { &hf_x509af_ForwardCertificationPath_item, - { "Item[##]", "x509af.ForwardCertificationPath_item", + { "Item", "x509af.ForwardCertificationPath_item", FT_UINT32, BASE_DEC, NULL, 0, "ForwardCertificationPath/_item", HFILL }}, { &hf_x509af_CrossCertificates_item, - { "Item(##)", "x509af.CrossCertificates_item", + { "Item", "x509af.CrossCertificates_item", FT_NONE, BASE_NONE, NULL, 0, "CrossCertificates/_item", HFILL }}, { &hf_x509af_theCACertificates, @@ -1061,7 +1061,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "CertificationPath/theCACertificates", HFILL }}, { &hf_x509af_theCACertificates_item, - { "Item[##]", "x509af.theCACertificates_item", + { "Item", "x509af.theCACertificates_item", FT_NONE, BASE_NONE, NULL, 0, "CertificationPath/theCACertificates/_item", HFILL }}, { &hf_x509af_issuedByThisCA, @@ -1089,7 +1089,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "CertificateList/signedCertificateList/revokedCertificates", HFILL }}, { &hf_x509af_revokedCertificates_item, - { "Item[##]", "x509af.revokedCertificates_item", + { "Item", "x509af.revokedCertificates_item", FT_NONE, BASE_NONE, NULL, 0, "CertificateList/signedCertificateList/revokedCertificates/_item", HFILL }}, { &hf_x509af_userCertificate1, @@ -1117,7 +1117,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificationPath/acPath", HFILL }}, { &hf_x509af_acPath_item, - { "Item[##]", "x509af.acPath_item", + { "Item", "x509af.acPath_item", FT_NONE, BASE_NONE, NULL, 0, "AttributeCertificationPath/acPath/_item", HFILL }}, { &hf_x509af_certificate, @@ -1153,7 +1153,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificateInfo/attributes", HFILL }}, { &hf_x509af_attributes_item, - { "Item[##]", "x509af.attributes_item", + { "Item", "x509af.attributes_item", FT_NONE, BASE_NONE, NULL, 0, "AttributeCertificateInfo/attributes/_item", HFILL }}, { &hf_x509af_issuerUniqueID, @@ -1197,7 +1197,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificateAssertion/attType", HFILL }}, { &hf_x509af_attType_item, - { "Item(##)", "x509af.attType_item", + { "Item", "x509af.attType_item", FT_STRING, BASE_NONE, NULL, 0, "AttributeCertificateAssertion/attType/_item", HFILL }}, |