ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18921 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 75 insertions, 75 deletions

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index e1d4c65343..a414d6d0ec 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-x509af.c                                                          */
+/* .\packet-x509af.c                                                          */
 /* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
 
 /* Input file: packet-x509af-template.c */
@@ -1144,299 +1144,299 @@ void proto_register_x509af(void) {
     { &hf_x509af_Certificate_PDU,
       { "Certificate", "x509af.Certificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Certificate", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_CertificatePair_PDU,
       { "CertificatePair", "x509af.CertificatePair",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificatePair", HFILL }},
+        "x509af.CertificatePair", HFILL }},
     { &hf_x509af_CertificateList_PDU,
       { "CertificateList", "x509af.CertificateList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateList", HFILL }},
+        "x509af.CertificateList", HFILL }},
     { &hf_x509af_AttributeCertificate_PDU,
       { "AttributeCertificate", "x509af.AttributeCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeCertificate", HFILL }},
+        "x509af.AttributeCertificate", HFILL }},
     { &hf_x509af_DSS_Params_PDU,
       { "DSS-Params", "x509af.DSS_Params",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DSS-Params", HFILL }},
+        "x509af.DSS_Params", HFILL }},
     { &hf_x509af_signedCertificate,
       { "signedCertificate", "x509af.signedCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Certificate/signedCertificate", HFILL }},
+        "x509af.T_signedCertificate", HFILL }},
     { &hf_x509af_version,
       { "version", "x509af.version",
         FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
-        "", HFILL }},
+        "x509af.Version", HFILL }},
     { &hf_x509af_serialNumber,
       { "serialNumber", "x509af.serialNumber",
         FT_INT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "x509af.CertificateSerialNumber", HFILL }},
     { &hf_x509af_signature,
       { "signature", "x509af.signature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_issuer,
       { "issuer", "x509af.issuer",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "", HFILL }},
+        "x509if.Name", HFILL }},
     { &hf_x509af_validity,
       { "validity", "x509af.validity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Certificate/signedCertificate/validity", HFILL }},
+        "x509af.Validity", HFILL }},
     { &hf_x509af_subject,
       { "subject", "x509af.subject",
         FT_UINT32, BASE_DEC, VALS(x509af_SubjectName_vals), 0,
-        "Certificate/signedCertificate/subject", HFILL }},
+        "x509af.SubjectName", HFILL }},
     { &hf_x509af_subjectPublicKeyInfo,
       { "subjectPublicKeyInfo", "x509af.subjectPublicKeyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Certificate/signedCertificate/subjectPublicKeyInfo", HFILL }},
+        "x509af.SubjectPublicKeyInfo", HFILL }},
     { &hf_x509af_issuerUniqueIdentifier,
       { "issuerUniqueIdentifier", "x509af.issuerUniqueIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Certificate/signedCertificate/issuerUniqueIdentifier", HFILL }},
+        "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_subjectUniqueIdentifier,
       { "subjectUniqueIdentifier", "x509af.subjectUniqueIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Certificate/signedCertificate/subjectUniqueIdentifier", HFILL }},
+        "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_extensions,
       { "extensions", "x509af.extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "x509af.Extensions", HFILL }},
     { &hf_x509af_algorithmIdentifier,
       { "algorithmIdentifier", "x509af.algorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_encrypted,
       { "encrypted", "x509af.encrypted",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_rdnSequence,
       { "rdnSequence", "x509af.rdnSequence",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SubjectName/rdnSequence", HFILL }},
+        "x509if.RDNSequence", HFILL }},
     { &hf_x509af_algorithmId,
       { "algorithmId", "x509af.algorithmId",
         FT_OID, BASE_NONE, NULL, 0,
-        "AlgorithmIdentifier/algorithmId", HFILL }},
+        "x509af.T_algorithmId", HFILL }},
     { &hf_x509af_parameters,
       { "parameters", "x509af.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AlgorithmIdentifier/parameters", HFILL }},
+        "x509af.T_parameters", HFILL }},
     { &hf_x509af_notBefore,
       { "notBefore", "x509af.notBefore",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "Validity/notBefore", HFILL }},
+        "x509af.Time", HFILL }},
     { &hf_x509af_notAfter,
       { "notAfter", "x509af.notAfter",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "Validity/notAfter", HFILL }},
+        "x509af.Time", HFILL }},
     { &hf_x509af_algorithm,
       { "algorithm", "x509af.algorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SubjectPublicKeyInfo/algorithm", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_subjectPublicKey,
       { "subjectPublicKey", "x509af.subjectPublicKey",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "SubjectPublicKeyInfo/subjectPublicKey", HFILL }},
+        "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_utcTime,
       { "utcTime", "x509af.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/utcTime", HFILL }},
+        "x509af.UTCTime", HFILL }},
     { &hf_x509af_generalizedTime,
       { "generalizedTime", "x509af.generalizedTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/generalizedTime", HFILL }},
+        "x509af.GeneralizedTime", HFILL }},
     { &hf_x509af_Extensions_item,
       { "Item", "x509af.Extensions_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Extensions/_item", HFILL }},
+        "x509af.Extension", HFILL }},
     { &hf_x509af_extnId,
       { "extnId", "x509af.extnId",
         FT_OID, BASE_NONE, NULL, 0,
-        "Extension/extnId", HFILL }},
+        "x509af.T_extnId", HFILL }},
     { &hf_x509af_critical,
       { "critical", "x509af.critical",
         FT_BOOLEAN, 8, NULL, 0,
-        "Extension/critical", HFILL }},
+        "x509af.BOOLEAN", HFILL }},
     { &hf_x509af_extnValue,
       { "extnValue", "x509af.extnValue",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Extension/extnValue", HFILL }},
+        "x509af.T_extnValue", HFILL }},
     { &hf_x509af_userCertificate,
       { "userCertificate", "x509af.userCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_certificationPath,
       { "certificationPath", "x509af.certificationPath",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Certificates/certificationPath", HFILL }},
+        "x509af.ForwardCertificationPath", HFILL }},
     { &hf_x509af_ForwardCertificationPath_item,
       { "Item", "x509af.ForwardCertificationPath_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ForwardCertificationPath/_item", HFILL }},
+        "x509af.CrossCertificates", HFILL }},
     { &hf_x509af_CrossCertificates_item,
       { "Item", "x509af.CrossCertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CrossCertificates/_item", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_theCACertificates,
       { "theCACertificates", "x509af.theCACertificates",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertificationPath/theCACertificates", HFILL }},
+        "x509af.SEQUENCE_OF_CertificatePair", HFILL }},
     { &hf_x509af_theCACertificates_item,
       { "Item", "x509af.theCACertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificationPath/theCACertificates/_item", HFILL }},
+        "x509af.CertificatePair", HFILL }},
     { &hf_x509af_issuedByThisCA,
       { "issuedByThisCA", "x509af.issuedByThisCA",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificatePair/issuedByThisCA", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_issuedToThisCA,
       { "issuedToThisCA", "x509af.issuedToThisCA",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificatePair/issuedToThisCA", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_signedCertificateList,
       { "signedCertificateList", "x509af.signedCertificateList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateList/signedCertificateList", HFILL }},
+        "x509af.T_signedCertificateList", HFILL }},
     { &hf_x509af_thisUpdate,
       { "thisUpdate", "x509af.thisUpdate",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "CertificateList/signedCertificateList/thisUpdate", HFILL }},
+        "x509af.Time", HFILL }},
     { &hf_x509af_nextUpdate,
       { "nextUpdate", "x509af.nextUpdate",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "CertificateList/signedCertificateList/nextUpdate", HFILL }},
+        "x509af.Time", HFILL }},
     { &hf_x509af_revokedCertificates,
       { "revokedCertificates", "x509af.revokedCertificates",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertificateList/signedCertificateList/revokedCertificates", HFILL }},
+        "x509af.T_revokedCertificates", HFILL }},
     { &hf_x509af_revokedCertificates_item,
       { "Item", "x509af.revokedCertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateList/signedCertificateList/revokedCertificates/_item", HFILL }},
+        "x509af.T_revokedCertificates_item", HFILL }},
     { &hf_x509af_revokedUserCertificate,
       { "userCertificate", "x509af.userCertificate",
         FT_INT32, BASE_DEC, NULL, 0,
-        "CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate", HFILL }},
+        "x509af.CertificateSerialNumber", HFILL }},
     { &hf_x509af_revocationDate,
       { "revocationDate", "x509af.revocationDate",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "CertificateList/signedCertificateList/revokedCertificates/_item/revocationDate", HFILL }},
+        "x509af.Time", HFILL }},
     { &hf_x509af_crlEntryExtensions,
       { "crlEntryExtensions", "x509af.crlEntryExtensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertificateList/signedCertificateList/revokedCertificates/_item/crlEntryExtensions", HFILL }},
+        "x509af.Extensions", HFILL }},
     { &hf_x509af_crlExtensions,
       { "crlExtensions", "x509af.crlExtensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertificateList/signedCertificateList/crlExtensions", HFILL }},
+        "x509af.Extensions", HFILL }},
     { &hf_x509af_attributeCertificate,
       { "attributeCertificate", "x509af.attributeCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.AttributeCertificate", HFILL }},
     { &hf_x509af_acPath,
       { "acPath", "x509af.acPath",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AttributeCertificationPath/acPath", HFILL }},
+        "x509af.SEQUENCE_OF_ACPathData", HFILL }},
     { &hf_x509af_acPath_item,
       { "Item", "x509af.acPath_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeCertificationPath/acPath/_item", HFILL }},
+        "x509af.ACPathData", HFILL }},
     { &hf_x509af_certificate,
       { "certificate", "x509af.certificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACPathData/certificate", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_x509af_signedAttributeCertificateInfo,
       { "signedAttributeCertificateInfo", "x509af.signedAttributeCertificateInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeCertificate/signedAttributeCertificateInfo", HFILL }},
+        "x509af.AttributeCertificateInfo", HFILL }},
     { &hf_x509af_info_subject,
       { "subject", "x509af.subject",
         FT_UINT32, BASE_DEC, VALS(x509af_InfoSubject_vals), 0,
-        "AttributeCertificateInfo/subject", HFILL }},
+        "x509af.InfoSubject", HFILL }},
     { &hf_x509af_baseCertificateID,
       { "baseCertificateID", "x509af.baseCertificateID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.IssuerSerial", HFILL }},
     { &hf_x509af_infoSubjectName,
       { "subjectName", "x509af.subjectName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AttributeCertificateInfo/subject/subjectName", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_x509af_issuerName,
       { "issuer", "x509af.issuer",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_x509af_attCertValidityPeriod,
       { "attCertValidityPeriod", "x509af.attCertValidityPeriod",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeCertificateInfo/attCertValidityPeriod", HFILL }},
+        "x509af.AttCertValidityPeriod", HFILL }},
     { &hf_x509af_attributes,
       { "attributes", "x509af.attributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AttributeCertificateInfo/attributes", HFILL }},
+        "x509af.SEQUENCE_OF_Attribute", HFILL }},
     { &hf_x509af_attributes_item,
       { "Item", "x509af.attributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeCertificateInfo/attributes/_item", HFILL }},
+        "x509if.Attribute", HFILL }},
     { &hf_x509af_issuerUniqueID,
       { "issuerUniqueID", "x509af.issuerUniqueID",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AttributeCertificateInfo/issuerUniqueID", HFILL }},
+        "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_serial,
       { "serial", "x509af.serial",
         FT_INT32, BASE_DEC, NULL, 0,
-        "IssuerSerial/serial", HFILL }},
+        "x509af.CertificateSerialNumber", HFILL }},
     { &hf_x509af_issuerUID,
       { "issuerUID", "x509af.issuerUID",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "IssuerSerial/issuerUID", HFILL }},
+        "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_notBeforeTime,
       { "notBeforeTime", "x509af.notBeforeTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "AttCertValidityPeriod/notBeforeTime", HFILL }},
+        "x509af.GeneralizedTime", HFILL }},
     { &hf_x509af_notAfterTime,
       { "notAfterTime", "x509af.notAfterTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "AttCertValidityPeriod/notAfterTime", HFILL }},
+        "x509af.GeneralizedTime", HFILL }},
     { &hf_x509af_assertion_subject,
       { "subject", "x509af.subject",
         FT_UINT32, BASE_DEC, VALS(x509af_AssertionSubject_vals), 0,
-        "AttributeCertificateAssertion/subject", HFILL }},
+        "x509af.AssertionSubject", HFILL }},
     { &hf_x509af_assertionSubjectName,
       { "subjectName", "x509af.subjectName",
         FT_UINT32, BASE_DEC, VALS(x509af_SubjectName_vals), 0,
-        "AttributeCertificateAssertion/subject/subjectName", HFILL }},
+        "x509af.SubjectName", HFILL }},
     { &hf_x509af_assertionIssuer,
       { "issuer", "x509af.issuer",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "AttributeCertificateAssertion/issuer", HFILL }},
+        "x509if.Name", HFILL }},
     { &hf_x509af_attCertValidity,
       { "attCertValidity", "x509af.attCertValidity",
         FT_STRING, BASE_NONE, NULL, 0,
-        "AttributeCertificateAssertion/attCertValidity", HFILL }},
+        "x509af.GeneralizedTime", HFILL }},
     { &hf_x509af_attType,
       { "attType", "x509af.attType",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AttributeCertificateAssertion/attType", HFILL }},
+        "x509af.SET_OF_AttributeType", HFILL }},
     { &hf_x509af_attType_item,
       { "Item", "x509af.attType_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "AttributeCertificateAssertion/attType/_item", HFILL }},
+        "x509if.AttributeType", HFILL }},
     { &hf_x509af_p,
       { "p", "x509af.p",
         FT_INT32, BASE_DEC, NULL, 0,
-        "DSS-Params/p", HFILL }},
+        "x509af.INTEGER", HFILL }},
     { &hf_x509af_q,
       { "q", "x509af.q",
         FT_INT32, BASE_DEC, NULL, 0,
-        "DSS-Params/q", HFILL }},
+        "x509af.INTEGER", HFILL }},
     { &hf_x509af_g,
       { "g", "x509af.g",
         FT_INT32, BASE_DEC, NULL, 0,
-        "DSS-Params/g", HFILL }},
+        "x509af.INTEGER", HFILL }},
 
 /*--- End of included file: packet-x509af-hfarr.c ---*/
 #line 107 "packet-x509af-template.c"