Regenerate all asn2wrs generated dissectors.

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

1 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 5719964d20..9d6951f9a1 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-cms.c                                                               */
-/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
+/* ../../tools/asn2wrs.py -b -e -p cms -c ./cms.cnf -s ./packet-cms-template -D . CryptographicMessageSyntax.asn */
 
 /* Input file: packet-cms-template.c */
 
@@ -1687,11 +1687,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "cms.SignerInfos", HFILL }},
     { &hf_cms_DigestAlgorithmIdentifiers_item,
-      { "DigestAlgorithmIdentifiers", "cms.DigestAlgorithmIdentifiers_item",
+      { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.DigestAlgorithmIdentifier", HFILL }},
     { &hf_cms_SignerInfos_item,
-      { "SignerInfos", "cms.SignerInfos_item",
+      { "SignerInfo", "cms.SignerInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.SignerInfo", HFILL }},
     { &hf_cms_eContentType,
@@ -1735,11 +1735,11 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_SignedAttributes_item,
-      { "SignedAttributes", "cms.SignedAttributes_item",
+      { "Attribute", "cms.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.Attribute", HFILL }},
     { &hf_cms_UnsignedAttributes_item,
-      { "UnsignedAttributes", "cms.UnsignedAttributes_item",
+      { "Attribute", "cms.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.Attribute", HFILL }},
     { &hf_cms_attrType,
@@ -1751,7 +1751,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "cms.SET_OF_AttributeValue", HFILL }},
     { &hf_cms_attrValues_item,
-      { "attrValues", "cms.attrValues_item",
+      { "AttributeValue", "cms.AttributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.AttributeValue", HFILL }},
     { &hf_cms_originatorInfo,
@@ -1775,7 +1775,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "cms.CertificateSet", HFILL }},
     { &hf_cms_RecipientInfos_item,
-      { "RecipientInfos", "cms.RecipientInfos_item",
+      { "RecipientInfo", "cms.RecipientInfo",
         FT_UINT32, BASE_DEC, VALS(cms_RecipientInfo_vals), 0,
         "cms.RecipientInfo", HFILL }},
     { &hf_cms_encryptedContentType,
@@ -1791,7 +1791,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "cms.EncryptedContent", HFILL }},
     { &hf_cms_UnprotectedAttributes_item,
-      { "UnprotectedAttributes", "cms.UnprotectedAttributes_item",
+      { "Attribute", "cms.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.Attribute", HFILL }},
     { &hf_cms_ktri,
@@ -1843,7 +1843,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "cms.BIT_STRING", HFILL }},
     { &hf_cms_RecipientEncryptedKeys_item,
-      { "RecipientEncryptedKeys", "cms.RecipientEncryptedKeys_item",
+      { "RecipientEncryptedKey", "cms.RecipientEncryptedKey",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.RecipientEncryptedKey", HFILL }},
     { &hf_cms_rekRid,
@@ -1891,15 +1891,15 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "cms.UnauthAttributes", HFILL }},
     { &hf_cms_AuthAttributes_item,
-      { "AuthAttributes", "cms.AuthAttributes_item",
+      { "Attribute", "cms.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.Attribute", HFILL }},
     { &hf_cms_UnauthAttributes_item,
-      { "UnauthAttributes", "cms.UnauthAttributes_item",
+      { "Attribute", "cms.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.Attribute", HFILL }},
     { &hf_cms_CertificateRevocationLists_item,
-      { "CertificateRevocationLists", "cms.CertificateRevocationLists_item",
+      { "CertificateList", "cms.CertificateList",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509af.CertificateList", HFILL }},
     { &hf_cms_certificate,
@@ -1915,7 +1915,7 @@ void proto_register_cms(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x509af.AttributeCertificate", HFILL }},
     { &hf_cms_CertificateSet_item,
-      { "CertificateSet", "cms.CertificateSet_item",
+      { "CertificateChoices", "cms.CertificateChoices",
         FT_UINT32, BASE_DEC, VALS(cms_CertificateChoices_vals), 0,
         "cms.CertificateChoices", HFILL }},
     { &hf_cms_issuer,
@@ -1963,7 +1963,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "cms.UnauthAttributes", HFILL }},
     { &hf_cms_SMIMECapabilities_item,
-      { "SMIMECapabilities", "cms.SMIMECapabilities_item",
+      { "SMIMECapability", "cms.SMIMECapability",
         FT_NONE, BASE_NONE, NULL, 0,
         "cms.SMIMECapability", HFILL }},
     { &hf_cms_capability,