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

diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 7e8edfa135..3cdc6bda21 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -260,8 +260,8 @@ static const value_string ess_ReceiptsFrom_vals[] = {
 };
 
 static const ber_choice_t ReceiptsFrom_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_allOrFirstTier_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_receiptList_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_allOrFirstTier_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receiptList_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -774,9 +774,9 @@ static const value_string ess_MLReceiptPolicy_vals[] = {
 };
 
 static const ber_choice_t MLReceiptPolicy_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_none_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_insteadOf_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_inAdditionTo_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_none_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insteadOf_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inAdditionTo_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -984,251 +984,251 @@ void proto_register_ess(void) {
     { &hf_ess_ReceiptRequest_PDU,
       { "ReceiptRequest", "ess.ReceiptRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ReceiptRequest", HFILL }},
+        "ess.ReceiptRequest", HFILL }},
     { &hf_ess_ContentIdentifier_PDU,
       { "ContentIdentifier", "ess.ContentIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "ContentIdentifier", HFILL }},
+        "ess.ContentIdentifier", HFILL }},
     { &hf_ess_Receipt_PDU,
       { "Receipt", "ess.Receipt",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Receipt", HFILL }},
+        "ess.Receipt", HFILL }},
     { &hf_ess_ContentHints_PDU,
       { "ContentHints", "ess.ContentHints",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ContentHints", HFILL }},
+        "ess.ContentHints", HFILL }},
     { &hf_ess_MsgSigDigest_PDU,
       { "MsgSigDigest", "ess.MsgSigDigest",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "MsgSigDigest", HFILL }},
+        "ess.MsgSigDigest", HFILL }},
     { &hf_ess_ContentReference_PDU,
       { "ContentReference", "ess.ContentReference",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ContentReference", HFILL }},
+        "ess.ContentReference", HFILL }},
     { &hf_ess_ESSSecurityLabel_PDU,
       { "ESSSecurityLabel", "ess.ESSSecurityLabel",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ESSSecurityLabel", HFILL }},
+        "ess.ESSSecurityLabel", HFILL }},
     { &hf_ess_RestrictiveTag_PDU,
       { "RestrictiveTag", "ess.RestrictiveTag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RestrictiveTag", HFILL }},
+        "ess.RestrictiveTag", HFILL }},
     { &hf_ess_EnumeratedTag_PDU,
       { "EnumeratedTag", "ess.EnumeratedTag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EnumeratedTag", HFILL }},
+        "ess.EnumeratedTag", HFILL }},
     { &hf_ess_PermissiveTag_PDU,
       { "PermissiveTag", "ess.PermissiveTag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PermissiveTag", HFILL }},
+        "ess.PermissiveTag", HFILL }},
     { &hf_ess_InformativeTag_PDU,
       { "InformativeTag", "ess.InformativeTag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InformativeTag", HFILL }},
+        "ess.InformativeTag", HFILL }},
     { &hf_ess_EquivalentLabels_PDU,
       { "EquivalentLabels", "ess.EquivalentLabels",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "EquivalentLabels", HFILL }},
+        "ess.EquivalentLabels", HFILL }},
     { &hf_ess_MLExpansionHistory_PDU,
       { "MLExpansionHistory", "ess.MLExpansionHistory",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLExpansionHistory", HFILL }},
+        "ess.MLExpansionHistory", HFILL }},
     { &hf_ess_SigningCertificate_PDU,
       { "SigningCertificate", "ess.SigningCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SigningCertificate", HFILL }},
+        "ess.SigningCertificate", HFILL }},
     { &hf_ess_signedContentIdentifier,
       { "signedContentIdentifier", "ess.signedContentIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "ess.ContentIdentifier", HFILL }},
     { &hf_ess_receiptsFrom,
       { "receiptsFrom", "ess.receiptsFrom",
         FT_UINT32, BASE_DEC, VALS(ess_ReceiptsFrom_vals), 0,
-        "ReceiptRequest/receiptsFrom", HFILL }},
+        "ess.ReceiptsFrom", HFILL }},
     { &hf_ess_receiptsTo,
       { "receiptsTo", "ess.receiptsTo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ReceiptRequest/receiptsTo", HFILL }},
+        "ess.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_ess_receiptsTo_item,
       { "Item", "ess.receiptsTo_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ReceiptRequest/receiptsTo/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_ess_allOrFirstTier,
       { "allOrFirstTier", "ess.allOrFirstTier",
         FT_INT32, BASE_DEC, VALS(ess_AllOrFirstTier_vals), 0,
-        "ReceiptsFrom/allOrFirstTier", HFILL }},
+        "ess.AllOrFirstTier", HFILL }},
     { &hf_ess_receiptList,
       { "receiptList", "ess.receiptList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ReceiptsFrom/receiptList", HFILL }},
+        "ess.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_ess_receiptList_item,
       { "Item", "ess.receiptList_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ReceiptsFrom/receiptList/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_ess_version,
       { "version", "ess.version",
         FT_INT32, BASE_DEC, VALS(ess_ESSVersion_vals), 0,
-        "Receipt/version", HFILL }},
+        "ess.ESSVersion", HFILL }},
     { &hf_ess_contentType,
       { "contentType", "ess.contentType",
         FT_OID, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cms.ContentType", HFILL }},
     { &hf_ess_originatorSignatureValue,
       { "originatorSignatureValue", "ess.originatorSignatureValue",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "ess.OCTET_STRING", HFILL }},
     { &hf_ess_contentDescription,
       { "contentDescription", "ess.contentDescription",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ContentHints/contentDescription", HFILL }},
+        "ess.UTF8String", HFILL }},
     { &hf_ess_security_policy_identifier,
       { "security-policy-identifier", "ess.security_policy_identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "ESSSecurityLabel/security-policy-identifier", HFILL }},
+        "ess.SecurityPolicyIdentifier", HFILL }},
     { &hf_ess_security_classification,
       { "security-classification", "ess.security_classification",
         FT_INT32, BASE_DEC, VALS(ess_SecurityClassification_vals), 0,
-        "ESSSecurityLabel/security-classification", HFILL }},
+        "ess.SecurityClassification", HFILL }},
     { &hf_ess_privacy_mark,
       { "privacy-mark", "ess.privacy_mark",
         FT_UINT32, BASE_DEC, VALS(ess_ESSPrivacyMark_vals), 0,
-        "ESSSecurityLabel/privacy-mark", HFILL }},
+        "ess.ESSPrivacyMark", HFILL }},
     { &hf_ess_security_categories,
       { "security-categories", "ess.security_categories",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ESSSecurityLabel/security-categories", HFILL }},
+        "ess.SecurityCategories", HFILL }},
     { &hf_ess_pString,
       { "pString", "ess.pString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ESSPrivacyMark/pString", HFILL }},
+        "ess.PrintableString", HFILL }},
     { &hf_ess_utf8String,
       { "utf8String", "ess.utf8String",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ESSPrivacyMark/utf8String", HFILL }},
+        "ess.UTF8String", HFILL }},
     { &hf_ess_SecurityCategories_item,
       { "Item", "ess.SecurityCategories_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityCategories/_item", HFILL }},
+        "ess.SecurityCategory", HFILL }},
     { &hf_ess_type,
       { "type", "ess.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "SecurityCategory/type", HFILL }},
+        "ess.T_type", HFILL }},
     { &hf_ess_value,
       { "value", "ess.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityCategory/value", HFILL }},
+        "ess.T_value", HFILL }},
     { &hf_ess_tagName,
       { "tagName", "ess.tagName",
         FT_OID, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "ess.OBJECT_IDENTIFIER", HFILL }},
     { &hf_ess_attributeFlags,
       { "attributeFlags", "ess.attributeFlags",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "ess.BIT_STRING", HFILL }},
     { &hf_ess_attributeList,
       { "attributeList", "ess.attributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "EnumeratedTag/attributeList", HFILL }},
+        "ess.SET_OF_SecurityAttribute", HFILL }},
     { &hf_ess_attributeList_item,
       { "Item", "ess.attributeList_item",
         FT_INT32, BASE_DEC, NULL, 0,
-        "EnumeratedTag/attributeList/_item", HFILL }},
+        "ess.SecurityAttribute", HFILL }},
     { &hf_ess_attributes,
       { "attributes", "ess.attributes",
         FT_UINT32, BASE_DEC, VALS(ess_FreeFormField_vals), 0,
-        "InformativeTag/attributes", HFILL }},
+        "ess.FreeFormField", HFILL }},
     { &hf_ess_bitSetAttributes,
       { "bitSetAttributes", "ess.bitSetAttributes",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "FreeFormField/bitSetAttributes", HFILL }},
+        "ess.BIT_STRING", HFILL }},
     { &hf_ess_securityAttributes,
       { "securityAttributes", "ess.securityAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "FreeFormField/securityAttributes", HFILL }},
+        "ess.SET_OF_SecurityAttribute", HFILL }},
     { &hf_ess_securityAttributes_item,
       { "Item", "ess.securityAttributes_item",
         FT_INT32, BASE_DEC, NULL, 0,
-        "FreeFormField/securityAttributes/_item", HFILL }},
+        "ess.SecurityAttribute", HFILL }},
     { &hf_ess_EquivalentLabels_item,
       { "Item", "ess.EquivalentLabels_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EquivalentLabels/_item", HFILL }},
+        "ess.ESSSecurityLabel", HFILL }},
     { &hf_ess_MLExpansionHistory_item,
       { "Item", "ess.MLExpansionHistory_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MLExpansionHistory/_item", HFILL }},
+        "ess.MLData", HFILL }},
     { &hf_ess_mailListIdentifier,
       { "mailListIdentifier", "ess.mailListIdentifier",
         FT_UINT32, BASE_DEC, VALS(ess_EntityIdentifier_vals), 0,
-        "MLData/mailListIdentifier", HFILL }},
+        "ess.EntityIdentifier", HFILL }},
     { &hf_ess_expansionTime,
       { "expansionTime", "ess.expansionTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "MLData/expansionTime", HFILL }},
+        "ess.GeneralizedTime", HFILL }},
     { &hf_ess_mlReceiptPolicy,
       { "mlReceiptPolicy", "ess.mlReceiptPolicy",
         FT_UINT32, BASE_DEC, VALS(ess_MLReceiptPolicy_vals), 0,
-        "MLData/mlReceiptPolicy", HFILL }},
+        "ess.MLReceiptPolicy", HFILL }},
     { &hf_ess_issuerAndSerialNumber,
       { "issuerAndSerialNumber", "ess.issuerAndSerialNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EntityIdentifier/issuerAndSerialNumber", HFILL }},
+        "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_ess_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "ess.subjectKeyIdentifier",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EntityIdentifier/subjectKeyIdentifier", HFILL }},
+        "x509ce.SubjectKeyIdentifier", HFILL }},
     { &hf_ess_none,
       { "none", "ess.none",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MLReceiptPolicy/none", HFILL }},
+        "ess.NULL", HFILL }},
     { &hf_ess_insteadOf,
       { "insteadOf", "ess.insteadOf",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/insteadOf", HFILL }},
+        "ess.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_ess_insteadOf_item,
       { "Item", "ess.insteadOf_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/insteadOf/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_ess_inAdditionTo,
       { "inAdditionTo", "ess.inAdditionTo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/inAdditionTo", HFILL }},
+        "ess.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_ess_inAdditionTo_item,
       { "Item", "ess.inAdditionTo_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/inAdditionTo/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_ess_certs,
       { "certs", "ess.certs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SigningCertificate/certs", HFILL }},
+        "ess.SEQUENCE_OF_ESSCertID", HFILL }},
     { &hf_ess_certs_item,
       { "Item", "ess.certs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SigningCertificate/certs/_item", HFILL }},
+        "ess.ESSCertID", HFILL }},
     { &hf_ess_policies,
       { "policies", "ess.policies",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SigningCertificate/policies", HFILL }},
+        "ess.SEQUENCE_OF_PolicyInformation", HFILL }},
     { &hf_ess_policies_item,
       { "Item", "ess.policies_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SigningCertificate/policies/_item", HFILL }},
+        "x509ce.PolicyInformation", HFILL }},
     { &hf_ess_certHash,
       { "certHash", "ess.certHash",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "ESSCertID/certHash", HFILL }},
+        "ess.Hash", HFILL }},
     { &hf_ess_issuerSerial,
       { "issuerSerial", "ess.issuerSerial",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ESSCertID/issuerSerial", HFILL }},
+        "ess.IssuerSerial", HFILL }},
     { &hf_ess_issuer,
       { "issuer", "ess.issuer",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "IssuerSerial/issuer", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_ess_serialNumber,
       { "serialNumber", "ess.serialNumber",
         FT_INT32, BASE_DEC, NULL, 0,
-        "IssuerSerial/serialNumber", HFILL }},
+        "x509af.CertificateSerialNumber", HFILL }},
 
 /*--- End of included file: packet-ess-hfarr.c ---*/
 #line 68 "packet-ess-template.c"