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, 86 insertions, 86 deletions

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 2a587c7eda..407a06e714 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-cms.c                                                             */
+/* .\packet-cms.c                                                             */
 /* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
 
 /* Input file: packet-cms-template.c */
@@ -1608,343 +1608,343 @@ void proto_register_cms(void) {
     { &hf_cms_ContentInfo_PDU,
       { "ContentInfo", "cms.ContentInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ContentInfo", HFILL }},
+        "cms.ContentInfo", HFILL }},
     { &hf_cms_ContentType_PDU,
       { "ContentType", "cms.ContentType",
         FT_OID, BASE_NONE, NULL, 0,
-        "ContentType", HFILL }},
+        "cms.ContentType", HFILL }},
     { &hf_cms_SignedData_PDU,
       { "SignedData", "cms.SignedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SignedData", HFILL }},
+        "cms.SignedData", HFILL }},
     { &hf_cms_EnvelopedData_PDU,
       { "EnvelopedData", "cms.EnvelopedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EnvelopedData", HFILL }},
+        "cms.EnvelopedData", HFILL }},
     { &hf_cms_DigestedData_PDU,
       { "DigestedData", "cms.DigestedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DigestedData", HFILL }},
+        "cms.DigestedData", HFILL }},
     { &hf_cms_EncryptedData_PDU,
       { "EncryptedData", "cms.EncryptedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedData", HFILL }},
+        "cms.EncryptedData", HFILL }},
     { &hf_cms_AuthenticatedData_PDU,
       { "AuthenticatedData", "cms.AuthenticatedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AuthenticatedData", HFILL }},
+        "cms.AuthenticatedData", HFILL }},
     { &hf_cms_MessageDigest_PDU,
       { "MessageDigest", "cms.MessageDigest",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "MessageDigest", HFILL }},
+        "cms.MessageDigest", HFILL }},
     { &hf_cms_SigningTime_PDU,
       { "SigningTime", "cms.SigningTime",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
-        "SigningTime", HFILL }},
+        "cms.SigningTime", HFILL }},
     { &hf_cms_Countersignature_PDU,
       { "Countersignature", "cms.Countersignature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Countersignature", HFILL }},
+        "cms.Countersignature", HFILL }},
     { &hf_cms_contentType,
       { "contentType", "cms.contentType",
         FT_OID, BASE_NONE, NULL, 0,
-        "ContentInfo/contentType", HFILL }},
+        "cms.T_contentType", HFILL }},
     { &hf_cms_content,
       { "content", "cms.content",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ContentInfo/content", HFILL }},
+        "cms.T_content", HFILL }},
     { &hf_cms_version,
       { "version", "cms.version",
         FT_INT32, BASE_DEC, VALS(cms_CMSVersion_vals), 0,
-        "", HFILL }},
+        "cms.CMSVersion", HFILL }},
     { &hf_cms_digestAlgorithms,
       { "digestAlgorithms", "cms.digestAlgorithms",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SignedData/digestAlgorithms", HFILL }},
+        "cms.DigestAlgorithmIdentifiers", HFILL }},
     { &hf_cms_encapContentInfo,
       { "encapContentInfo", "cms.encapContentInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.EncapsulatedContentInfo", HFILL }},
     { &hf_cms_certificates,
       { "certificates", "cms.certificates",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SignedData/certificates", HFILL }},
+        "cms.CertificateSet", HFILL }},
     { &hf_cms_crls,
       { "crls", "cms.crls",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "cms.CertificateRevocationLists", HFILL }},
     { &hf_cms_signerInfos,
       { "signerInfos", "cms.signerInfos",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SignedData/signerInfos", HFILL }},
+        "cms.SignerInfos", HFILL }},
     { &hf_cms_DigestAlgorithmIdentifiers_item,
       { "Item", "cms.DigestAlgorithmIdentifiers_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DigestAlgorithmIdentifiers/_item", HFILL }},
+        "cms.DigestAlgorithmIdentifier", HFILL }},
     { &hf_cms_SignerInfos_item,
       { "Item", "cms.SignerInfos_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SignerInfos/_item", HFILL }},
+        "cms.SignerInfo", HFILL }},
     { &hf_cms_eContentType,
       { "eContentType", "cms.eContentType",
         FT_OID, BASE_NONE, NULL, 0,
-        "EncapsulatedContentInfo/eContentType", HFILL }},
+        "cms.T_eContentType", HFILL }},
     { &hf_cms_eContent,
       { "eContent", "cms.eContent",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EncapsulatedContentInfo/eContent", HFILL }},
+        "cms.T_eContent", HFILL }},
     { &hf_cms_sid,
       { "sid", "cms.sid",
         FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0,
-        "SignerInfo/sid", HFILL }},
+        "cms.SignerIdentifier", HFILL }},
     { &hf_cms_digestAlgorithm,
       { "digestAlgorithm", "cms.digestAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.DigestAlgorithmIdentifier", HFILL }},
     { &hf_cms_signedAttrs,
       { "signedAttrs", "cms.signedAttrs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SignerInfo/signedAttrs", HFILL }},
+        "cms.SignedAttributes", HFILL }},
     { &hf_cms_signatureAlgorithm,
       { "signatureAlgorithm", "cms.signatureAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.SignatureAlgorithmIdentifier", HFILL }},
     { &hf_cms_signatureValue,
       { "signature", "cms.signature",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "SignerInfo/signature", HFILL }},
+        "cms.SignatureValue", HFILL }},
     { &hf_cms_unsignedAttrs,
       { "unsignedAttrs", "cms.unsignedAttrs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SignerInfo/unsignedAttrs", HFILL }},
+        "cms.UnsignedAttributes", HFILL }},
     { &hf_cms_issuerAndSerialNumber,
       { "issuerAndSerialNumber", "cms.issuerAndSerialNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_cms_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "cms.subjectKeyIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_SignedAttributes_item,
       { "Item", "cms.SignedAttributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SignedAttributes/_item", HFILL }},
+        "cms.Attribute", HFILL }},
     { &hf_cms_UnsignedAttributes_item,
       { "Item", "cms.UnsignedAttributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "UnsignedAttributes/_item", HFILL }},
+        "cms.Attribute", HFILL }},
     { &hf_cms_attrType,
       { "attrType", "cms.attrType",
         FT_OID, BASE_NONE, NULL, 0,
-        "Attribute/attrType", HFILL }},
+        "cms.T_attrType", HFILL }},
     { &hf_cms_attrValues,
       { "attrValues", "cms.attrValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Attribute/attrValues", HFILL }},
+        "cms.SET_OF_AttributeValue", HFILL }},
     { &hf_cms_attrValues_item,
       { "Item", "cms.attrValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Attribute/attrValues/_item", HFILL }},
+        "cms.AttributeValue", HFILL }},
     { &hf_cms_originatorInfo,
       { "originatorInfo", "cms.originatorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.OriginatorInfo", HFILL }},
     { &hf_cms_recipientInfos,
       { "recipientInfos", "cms.recipientInfos",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "cms.RecipientInfos", HFILL }},
     { &hf_cms_encryptedContentInfo,
       { "encryptedContentInfo", "cms.encryptedContentInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.EncryptedContentInfo", HFILL }},
     { &hf_cms_unprotectedAttrs,
       { "unprotectedAttrs", "cms.unprotectedAttrs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "cms.UnprotectedAttributes", HFILL }},
     { &hf_cms_certs,
       { "certs", "cms.certs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "OriginatorInfo/certs", HFILL }},
+        "cms.CertificateSet", HFILL }},
     { &hf_cms_RecipientInfos_item,
       { "Item", "cms.RecipientInfos_item",
         FT_UINT32, BASE_DEC, VALS(cms_RecipientInfo_vals), 0,
-        "RecipientInfos/_item", HFILL }},
+        "cms.RecipientInfo", HFILL }},
     { &hf_cms_encryptedContentType,
       { "contentType", "cms.contentType",
         FT_OID, BASE_NONE, NULL, 0,
-        "EncryptedContentInfo/contentType", HFILL }},
+        "cms.ContentType", HFILL }},
     { &hf_cms_contentEncryptionAlgorithm,
       { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedContentInfo/contentEncryptionAlgorithm", HFILL }},
+        "cms.ContentEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedContent,
       { "encryptedContent", "cms.encryptedContent",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EncryptedContentInfo/encryptedContent", HFILL }},
+        "cms.EncryptedContent", HFILL }},
     { &hf_cms_UnprotectedAttributes_item,
       { "Item", "cms.UnprotectedAttributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "UnprotectedAttributes/_item", HFILL }},
+        "cms.Attribute", HFILL }},
     { &hf_cms_ktri,
       { "ktri", "cms.ktri",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RecipientInfo/ktri", HFILL }},
+        "cms.KeyTransRecipientInfo", HFILL }},
     { &hf_cms_kari,
       { "kari", "cms.kari",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RecipientInfo/kari", HFILL }},
+        "cms.KeyAgreeRecipientInfo", HFILL }},
     { &hf_cms_kekri,
       { "kekri", "cms.kekri",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RecipientInfo/kekri", HFILL }},
+        "cms.KEKRecipientInfo", HFILL }},
     { &hf_cms_rid,
       { "rid", "cms.rid",
         FT_UINT32, BASE_DEC, VALS(cms_RecipientIdentifier_vals), 0,
-        "KeyTransRecipientInfo/rid", HFILL }},
+        "cms.RecipientIdentifier", HFILL }},
     { &hf_cms_keyEncryptionAlgorithm,
       { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.KeyEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedKey,
       { "encryptedKey", "cms.encryptedKey",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "cms.EncryptedKey", HFILL }},
     { &hf_cms_originator,
       { "originator", "cms.originator",
         FT_UINT32, BASE_DEC, VALS(cms_OriginatorIdentifierOrKey_vals), 0,
-        "KeyAgreeRecipientInfo/originator", HFILL }},
+        "cms.OriginatorIdentifierOrKey", HFILL }},
     { &hf_cms_ukm,
       { "ukm", "cms.ukm",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "KeyAgreeRecipientInfo/ukm", HFILL }},
+        "cms.UserKeyingMaterial", HFILL }},
     { &hf_cms_recipientEncryptedKeys,
       { "recipientEncryptedKeys", "cms.recipientEncryptedKeys",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "KeyAgreeRecipientInfo/recipientEncryptedKeys", HFILL }},
+        "cms.RecipientEncryptedKeys", HFILL }},
     { &hf_cms_originatorKey,
       { "originatorKey", "cms.originatorKey",
         FT_NONE, BASE_NONE, NULL, 0,
-        "OriginatorIdentifierOrKey/originatorKey", HFILL }},
+        "cms.OriginatorPublicKey", HFILL }},
     { &hf_cms_algorithm,
       { "algorithm", "cms.algorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "OriginatorPublicKey/algorithm", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_cms_publicKey,
       { "publicKey", "cms.publicKey",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "OriginatorPublicKey/publicKey", HFILL }},
+        "cms.BIT_STRING", HFILL }},
     { &hf_cms_RecipientEncryptedKeys_item,
       { "Item", "cms.RecipientEncryptedKeys_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RecipientEncryptedKeys/_item", HFILL }},
+        "cms.RecipientEncryptedKey", HFILL }},
     { &hf_cms_rekRid,
       { "rid", "cms.rid",
         FT_UINT32, BASE_DEC, VALS(cms_KeyAgreeRecipientIdentifier_vals), 0,
-        "RecipientEncryptedKey/rid", HFILL }},
+        "cms.KeyAgreeRecipientIdentifier", HFILL }},
     { &hf_cms_rKeyId,
       { "rKeyId", "cms.rKeyId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "KeyAgreeRecipientIdentifier/rKeyId", HFILL }},
+        "cms.RecipientKeyIdentifier", HFILL }},
     { &hf_cms_date,
       { "date", "cms.date",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.GeneralizedTime", HFILL }},
     { &hf_cms_other,
       { "other", "cms.other",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.OtherKeyAttribute", HFILL }},
     { &hf_cms_kekid,
       { "kekid", "cms.kekid",
         FT_NONE, BASE_NONE, NULL, 0,
-        "KEKRecipientInfo/kekid", HFILL }},
+        "cms.KEKIdentifier", HFILL }},
     { &hf_cms_keyIdentifier,
       { "keyIdentifier", "cms.keyIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "KEKIdentifier/keyIdentifier", HFILL }},
+        "cms.OCTET_STRING", HFILL }},
     { &hf_cms_digest,
       { "digest", "cms.digest",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "DigestedData/digest", HFILL }},
+        "cms.Digest", HFILL }},
     { &hf_cms_macAlgorithm,
       { "macAlgorithm", "cms.macAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AuthenticatedData/macAlgorithm", HFILL }},
+        "cms.MessageAuthenticationCodeAlgorithm", HFILL }},
     { &hf_cms_authenticatedAttributes,
       { "authenticatedAttributes", "cms.authenticatedAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AuthenticatedData/authenticatedAttributes", HFILL }},
+        "cms.AuthAttributes", HFILL }},
     { &hf_cms_mac,
       { "mac", "cms.mac",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AuthenticatedData/mac", HFILL }},
+        "cms.MessageAuthenticationCode", HFILL }},
     { &hf_cms_unauthenticatedAttributes,
       { "unauthenticatedAttributes", "cms.unauthenticatedAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AuthenticatedData/unauthenticatedAttributes", HFILL }},
+        "cms.UnauthAttributes", HFILL }},
     { &hf_cms_AuthAttributes_item,
       { "Item", "cms.AuthAttributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AuthAttributes/_item", HFILL }},
+        "cms.Attribute", HFILL }},
     { &hf_cms_UnauthAttributes_item,
       { "Item", "cms.UnauthAttributes_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "UnauthAttributes/_item", HFILL }},
+        "cms.Attribute", HFILL }},
     { &hf_cms_CertificateRevocationLists_item,
       { "Item", "cms.CertificateRevocationLists_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateRevocationLists/_item", HFILL }},
+        "x509af.CertificateList", HFILL }},
     { &hf_cms_certificate,
       { "certificate", "cms.certificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.Certificate", HFILL }},
     { &hf_cms_extendedCertificate,
       { "extendedCertificate", "cms.extendedCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateChoices/extendedCertificate", HFILL }},
+        "cms.ExtendedCertificate", HFILL }},
     { &hf_cms_attrCert,
       { "attrCert", "cms.attrCert",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertificateChoices/attrCert", HFILL }},
+        "x509af.AttributeCertificate", HFILL }},
     { &hf_cms_CertificateSet_item,
       { "Item", "cms.CertificateSet_item",
         FT_UINT32, BASE_DEC, VALS(cms_CertificateChoices_vals), 0,
-        "CertificateSet/_item", HFILL }},
+        "cms.CertificateChoices", HFILL }},
     { &hf_cms_issuer,
       { "issuer", "cms.issuer",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "IssuerAndSerialNumber/issuer", HFILL }},
+        "x509if.Name", HFILL }},
     { &hf_cms_serialNumber,
       { "serialNumber", "cms.serialNumber",
         FT_INT32, BASE_DEC, NULL, 0,
-        "IssuerAndSerialNumber/serialNumber", HFILL }},
+        "x509af.CertificateSerialNumber", HFILL }},
     { &hf_cms_keyAttrId,
       { "keyAttrId", "cms.keyAttrId",
         FT_OID, BASE_NONE, NULL, 0,
-        "OtherKeyAttribute/keyAttrId", HFILL }},
+        "cms.T_keyAttrId", HFILL }},
     { &hf_cms_keyAttr,
       { "keyAttr", "cms.keyAttr",
         FT_NONE, BASE_NONE, NULL, 0,
-        "OtherKeyAttribute/keyAttr", HFILL }},
+        "cms.T_keyAttr", HFILL }},
     { &hf_cms_utcTime,
       { "utcTime", "cms.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/utcTime", HFILL }},
+        "cms.UTCTime", HFILL }},
     { &hf_cms_generalTime,
       { "generalTime", "cms.generalTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/generalTime", HFILL }},
+        "cms.GeneralizedTime", HFILL }},
     { &hf_cms_extendedCertificateInfo,
       { "extendedCertificateInfo", "cms.extendedCertificateInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ExtendedCertificate/extendedCertificateInfo", HFILL }},
+        "cms.ExtendedCertificateInfo", HFILL }},
     { &hf_cms_signature,
       { "signature", "cms.signature",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "ExtendedCertificate/signature", HFILL }},
+        "cms.Signature", HFILL }},
     { &hf_cms_attributes,
       { "attributes", "cms.attributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ExtendedCertificateInfo/attributes", HFILL }},
+        "cms.UnauthAttributes", HFILL }},
 
 /*--- End of included file: packet-cms-hfarr.c ---*/
 #line 145 "packet-cms-template.c"