diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-27 20:26:49 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-27 20:26:49 +0000 |
commit | 0ee4d0a00abd69e6479a55c12425c92cdf916d71 (patch) | |
tree | c72f8bc0048460e22297128f141079a1862d98b7 /epan/dissectors/packet-cms.c | |
parent | 38d9a87a49d690db0f3fb8aaa4ca40909713ead4 (diff) |
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402
svn path=/trunk/; revision=49599
Diffstat (limited to 'epan/dissectors/packet-cms.c')
-rw-r--r-- | epan/dissectors/packet-cms.c | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 0b5a4a2cd7..f960e03655 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1838,7 +1838,7 @@ void proto_register_cms(void) { /*--- Included file: packet-cms-hfarr.c ---*/ #line 1 "../../asn1/cms/packet-cms-hfarr.c" { &hf_cms_ContentInfo_PDU, - { "ContentInfo", "cms.ContentInfo", + { "ContentInfo", "cms.ContentInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_ContentType_PDU, @@ -1846,27 +1846,27 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_SignedData_PDU, - { "SignedData", "cms.SignedData", + { "SignedData", "cms.SignedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_EnvelopedData_PDU, - { "EnvelopedData", "cms.EnvelopedData", + { "EnvelopedData", "cms.EnvelopedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_DigestedData_PDU, - { "DigestedData", "cms.DigestedData", + { "DigestedData", "cms.DigestedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_EncryptedData_PDU, - { "EncryptedData", "cms.EncryptedData", + { "EncryptedData", "cms.EncryptedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_AuthenticatedData_PDU, - { "AuthenticatedData", "cms.AuthenticatedData", + { "AuthenticatedData", "cms.AuthenticatedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_IssuerAndSerialNumber_PDU, - { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber", + { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_MessageDigest_PDU, @@ -1878,7 +1878,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_Time_vals), 0, NULL, HFILL }}, { &hf_cms_Countersignature_PDU, - { "Countersignature", "cms.Countersignature", + { "Countersignature", "cms.Countersignature_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_RC2WrapParameter_PDU, @@ -1902,7 +1902,7 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_content, - { "content", "cms.content", + { "content", "cms.content_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_version, @@ -1914,7 +1914,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "DigestAlgorithmIdentifiers", HFILL }}, { &hf_cms_encapContentInfo, - { "encapContentInfo", "cms.encapContentInfo", + { "encapContentInfo", "cms.encapContentInfo_element", FT_NONE, BASE_NONE, NULL, 0, "EncapsulatedContentInfo", HFILL }}, { &hf_cms_certificates, @@ -1930,11 +1930,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cms_DigestAlgorithmIdentifiers_item, - { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier", + { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_SignerInfos_item, - { "SignerInfo", "cms.SignerInfo", + { "SignerInfo", "cms.SignerInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_eContentType, @@ -1950,7 +1950,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0, "SignerIdentifier", HFILL }}, { &hf_cms_digestAlgorithm, - { "digestAlgorithm", "cms.digestAlgorithm", + { "digestAlgorithm", "cms.digestAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "DigestAlgorithmIdentifier", HFILL }}, { &hf_cms_signedAttrs, @@ -1958,7 +1958,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "SignedAttributes", HFILL }}, { &hf_cms_signatureAlgorithm, - { "signatureAlgorithm", "cms.signatureAlgorithm", + { "signatureAlgorithm", "cms.signatureAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "SignatureAlgorithmIdentifier", HFILL }}, { &hf_cms_signatureValue, @@ -1970,7 +1970,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "UnsignedAttributes", HFILL }}, { &hf_cms_issuerAndSerialNumber, - { "issuerAndSerialNumber", "cms.issuerAndSerialNumber", + { "issuerAndSerialNumber", "cms.issuerAndSerialNumber_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_subjectKeyIdentifier, @@ -1978,11 +1978,11 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_SignedAttributes_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_UnsignedAttributes_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_attrType, @@ -1994,11 +1994,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "SET_OF_AttributeValue", HFILL }}, { &hf_cms_attrValues_item, - { "AttributeValue", "cms.AttributeValue", + { "AttributeValue", "cms.AttributeValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_originatorInfo, - { "originatorInfo", "cms.originatorInfo", + { "originatorInfo", "cms.originatorInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_recipientInfos, @@ -2006,7 +2006,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cms_encryptedContentInfo, - { "encryptedContentInfo", "cms.encryptedContentInfo", + { "encryptedContentInfo", "cms.encryptedContentInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_unprotectedAttrs, @@ -2026,7 +2026,7 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_contentEncryptionAlgorithm, - { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm", + { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "ContentEncryptionAlgorithmIdentifier", HFILL }}, { &hf_cms_encryptedContent, @@ -2034,27 +2034,27 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_UnprotectedAttributes_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_ktri, - { "ktri", "cms.ktri", + { "ktri", "cms.ktri_element", FT_NONE, BASE_NONE, NULL, 0, "KeyTransRecipientInfo", HFILL }}, { &hf_cms_kari, - { "kari", "cms.kari", + { "kari", "cms.kari_element", FT_NONE, BASE_NONE, NULL, 0, "KeyAgreeRecipientInfo", HFILL }}, { &hf_cms_kekri, - { "kekri", "cms.kekri", + { "kekri", "cms.kekri_element", FT_NONE, BASE_NONE, NULL, 0, "KEKRecipientInfo", HFILL }}, { &hf_cms_pwri, - { "pwri", "cms.pwri", + { "pwri", "cms.pwri_element", FT_NONE, BASE_NONE, NULL, 0, "PasswordRecipientInfo", HFILL }}, { &hf_cms_ori, - { "ori", "cms.ori", + { "ori", "cms.ori_element", FT_NONE, BASE_NONE, NULL, 0, "OtherRecipientInfo", HFILL }}, { &hf_cms_rid, @@ -2062,7 +2062,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_RecipientIdentifier_vals), 0, "RecipientIdentifier", HFILL }}, { &hf_cms_keyEncryptionAlgorithm, - { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm", + { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "KeyEncryptionAlgorithmIdentifier", HFILL }}, { &hf_cms_encryptedKey, @@ -2082,11 +2082,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cms_originatorKey, - { "originatorKey", "cms.originatorKey", + { "originatorKey", "cms.originatorKey_element", FT_NONE, BASE_NONE, NULL, 0, "OriginatorPublicKey", HFILL }}, { &hf_cms_algorithm, - { "algorithm", "cms.algorithm", + { "algorithm", "cms.algorithm_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_cms_publicKey, @@ -2094,7 +2094,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING", HFILL }}, { &hf_cms_RecipientEncryptedKeys_item, - { "RecipientEncryptedKey", "cms.RecipientEncryptedKey", + { "RecipientEncryptedKey", "cms.RecipientEncryptedKey_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_rekRid, @@ -2102,7 +2102,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_KeyAgreeRecipientIdentifier_vals), 0, "KeyAgreeRecipientIdentifier", HFILL }}, { &hf_cms_rKeyId, - { "rKeyId", "cms.rKeyId", + { "rKeyId", "cms.rKeyId_element", FT_NONE, BASE_NONE, NULL, 0, "RecipientKeyIdentifier", HFILL }}, { &hf_cms_date, @@ -2110,11 +2110,11 @@ void proto_register_cms(void) { FT_STRING, BASE_NONE, NULL, 0, "GeneralizedTime", HFILL }}, { &hf_cms_other, - { "other", "cms.other", + { "other", "cms.other_element", FT_NONE, BASE_NONE, NULL, 0, "OtherKeyAttribute", HFILL }}, { &hf_cms_kekid, - { "kekid", "cms.kekid", + { "kekid", "cms.kekid_element", FT_NONE, BASE_NONE, NULL, 0, "KEKIdentifier", HFILL }}, { &hf_cms_keyIdentifier, @@ -2122,7 +2122,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, { &hf_cms_keyDerivationAlgorithm, - { "keyDerivationAlgorithm", "cms.keyDerivationAlgorithm", + { "keyDerivationAlgorithm", "cms.keyDerivationAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "KeyDerivationAlgorithmIdentifier", HFILL }}, { &hf_cms_oriType, @@ -2130,7 +2130,7 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_oriValue, - { "oriValue", "cms.oriValue", + { "oriValue", "cms.oriValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_digest, @@ -2138,7 +2138,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_macAlgorithm, - { "macAlgorithm", "cms.macAlgorithm", + { "macAlgorithm", "cms.macAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "MessageAuthenticationCodeAlgorithm", HFILL }}, { &hf_cms_authAttrs, @@ -2154,11 +2154,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "UnauthAttributes", HFILL }}, { &hf_cms_AuthAttributes_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_UnauthAttributes_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_RevocationInfoChoices_item, @@ -2166,11 +2166,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_RevocationInfoChoice_vals), 0, NULL, HFILL }}, { &hf_cms_crl, - { "crl", "cms.crl", + { "crl", "cms.crl_element", FT_NONE, BASE_NONE, NULL, 0, "CertificateList", HFILL }}, { &hf_cms_otherRIC, - { "other", "cms.other", + { "other", "cms.other_element", FT_NONE, BASE_NONE, NULL, 0, "OtherRevocationInfoFormat", HFILL }}, { &hf_cms_otherRevInfoFormat, @@ -2178,23 +2178,23 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_otherRevInfo, - { "otherRevInfo", "cms.otherRevInfo", + { "otherRevInfo", "cms.otherRevInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_certificate, - { "certificate", "cms.certificate", + { "certificate", "cms.certificate_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_extendedCertificate, - { "extendedCertificate", "cms.extendedCertificate", + { "extendedCertificate", "cms.extendedCertificate_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_v1AttrCert, - { "v1AttrCert", "cms.v1AttrCert", + { "v1AttrCert", "cms.v1AttrCert_element", FT_NONE, BASE_NONE, NULL, 0, "AttributeCertificateV1", HFILL }}, { &hf_cms_v2AttrCert, - { "v2AttrCert", "cms.v2AttrCert", + { "v2AttrCert", "cms.v2AttrCert_element", FT_NONE, BASE_NONE, NULL, 0, "AttributeCertificateV2", HFILL }}, { &hf_cms_CertificateSet_item, @@ -2214,7 +2214,7 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_keyAttr, - { "keyAttr", "cms.keyAttr", + { "keyAttr", "cms.keyAttr_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_utcTime, @@ -2234,7 +2234,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, { &hf_cms_extendedCertificateInfo, - { "extendedCertificateInfo", "cms.extendedCertificateInfo", + { "extendedCertificateInfo", "cms.extendedCertificateInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_signature, @@ -2246,7 +2246,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "UnauthAttributes", HFILL }}, { &hf_cms_SMIMECapabilities_item, - { "SMIMECapability", "cms.SMIMECapability", + { "SMIMECapability", "cms.SMIMECapability_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_capability, @@ -2254,11 +2254,11 @@ void proto_register_cms(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_parameters, - { "parameters", "cms.parameters", + { "parameters", "cms.parameters_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_recipientKeyId, - { "recipientKeyId", "cms.recipientKeyId", + { "recipientKeyId", "cms.recipientKeyId_element", FT_NONE, BASE_NONE, NULL, 0, "RecipientKeyIdentifier", HFILL }}, { &hf_cms_subjectAltKeyIdentifier, @@ -2270,15 +2270,15 @@ void proto_register_cms(void) { FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cms_rc2CBCParameter, - { "rc2CBCParameter", "cms.rc2CBCParameter", + { "rc2CBCParameter", "cms.rc2CBCParameter_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_acInfo, - { "acInfo", "cms.acInfo", + { "acInfo", "cms.acInfo_element", FT_NONE, BASE_NONE, NULL, 0, "AttributeCertificateInfoV1", HFILL }}, { &hf_cms_signatureAlgorithm_v1, - { "signatureAlgorithm", "cms.signatureAlgorithm", + { "signatureAlgorithm", "cms.signatureAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_cms_signatureValue_v1, @@ -2294,7 +2294,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, VALS(cms_T_subject_vals), 0, NULL, HFILL }}, { &hf_cms_baseCertificateID, - { "baseCertificateID", "cms.baseCertificateID", + { "baseCertificateID", "cms.baseCertificateID_element", FT_NONE, BASE_NONE, NULL, 0, "IssuerSerial", HFILL }}, { &hf_cms_subjectName, @@ -2306,11 +2306,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "GeneralNames", HFILL }}, { &hf_cms_signature_v1, - { "signature", "cms.signature", + { "signature", "cms.signature_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_cms_attCertValidityPeriod, - { "attCertValidityPeriod", "cms.attCertValidityPeriod", + { "attCertValidityPeriod", "cms.attCertValidityPeriod_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_attributes_v1, @@ -2318,7 +2318,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "SEQUENCE_OF_Attribute", HFILL }}, { &hf_cms_attributes_v1_item, - { "Attribute", "cms.Attribute", + { "Attribute", "cms.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_cms_issuerUniqueID, |