Regenerate a few more of the ASN.1 dissectors

svn path=/trunk/; revision=32745

1 files changed, 54 insertions, 54 deletions

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index cec43d6b80..db46a61b6d 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1199,219 +1199,219 @@ void proto_register_pkcs12(void) {
     { &hf_pkcs12_PFX_PDU,
       { "PFX", "pkcs12.PFX",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PFX", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_AuthenticatedSafe_PDU,
       { "AuthenticatedSafe", "pkcs12.AuthenticatedSafe",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.AuthenticatedSafe", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_SafeContents_PDU,
       { "SafeContents", "pkcs12.SafeContents",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.SafeContents", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_KeyBag_PDU,
       { "KeyBag", "pkcs12.KeyBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.KeyBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PKCS8ShroudedKeyBag_PDU,
       { "PKCS8ShroudedKeyBag", "pkcs12.PKCS8ShroudedKeyBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PKCS8ShroudedKeyBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_CertBag_PDU,
       { "CertBag", "pkcs12.CertBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.CertBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_CRLBag_PDU,
       { "CRLBag", "pkcs12.CRLBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.CRLBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_SecretBag_PDU,
       { "SecretBag", "pkcs12.SecretBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.SecretBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PrivateKeyInfo_PDU,
       { "PrivateKeyInfo", "pkcs12.PrivateKeyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PrivateKeyInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_EncryptedPrivateKeyInfo_PDU,
       { "EncryptedPrivateKeyInfo", "pkcs12.EncryptedPrivateKeyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.EncryptedPrivateKeyInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PBEParameter_PDU,
       { "PBEParameter", "pkcs12.PBEParameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PBEParameter", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PBKDF2Params_PDU,
       { "PBKDF2Params", "pkcs12.PBKDF2Params",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PBKDF2Params", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PBES2Params_PDU,
       { "PBES2Params", "pkcs12.PBES2Params",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PBES2Params", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_PBMAC1Params_PDU,
       { "PBMAC1Params", "pkcs12.PBMAC1Params",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PBMAC1Params", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_version,
       { "version", "pkcs12.version",
         FT_UINT32, BASE_DEC, VALS(pkcs12_T_version_vals), 0,
-        "pkcs12.T_version", HFILL }},
+        "T_version", HFILL }},
     { &hf_pkcs12_authSafe,
       { "authSafe", "pkcs12.authSafe",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cms.ContentInfo", HFILL }},
+        "ContentInfo", HFILL }},
     { &hf_pkcs12_macData,
       { "macData", "pkcs12.macData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.MacData", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_mac,
       { "mac", "pkcs12.mac",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.DigestInfo", HFILL }},
+        "DigestInfo", HFILL }},
     { &hf_pkcs12_macSalt,
       { "macSalt", "pkcs12.macSalt",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkcs12.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_pkcs12_iterations,
       { "iterations", "pkcs12.iterations",
         FT_INT32, BASE_DEC, NULL, 0,
-        "pkcs12.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_pkcs12_digestAlgorithm,
       { "digestAlgorithm", "pkcs12.digestAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cms.DigestAlgorithmIdentifier", HFILL }},
+        "DigestAlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_digest,
       { "digest", "pkcs12.digest",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "cms.Digest", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_AuthenticatedSafe_item,
       { "ContentInfo", "pkcs12.ContentInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cms.ContentInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_SafeContents_item,
       { "SafeBag", "pkcs12.SafeBag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.SafeBag", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_bagId,
       { "bagId", "pkcs12.bagId",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkcs12.T_bagId", HFILL }},
+        "T_bagId", HFILL }},
     { &hf_pkcs12_bagValue,
       { "bagValue", "pkcs12.bagValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.T_bagValue", HFILL }},
+        "T_bagValue", HFILL }},
     { &hf_pkcs12_bagAttributes,
       { "bagAttributes", "pkcs12.bagAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.SET_OF_PKCS12Attribute", HFILL }},
+        "SET_OF_PKCS12Attribute", HFILL }},
     { &hf_pkcs12_bagAttributes_item,
       { "PKCS12Attribute", "pkcs12.PKCS12Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.PKCS12Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_certId,
       { "certId", "pkcs12.certId",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkcs12.T_certId", HFILL }},
+        "T_certId", HFILL }},
     { &hf_pkcs12_certValue,
       { "certValue", "pkcs12.certValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.T_certValue", HFILL }},
+        "T_certValue", HFILL }},
     { &hf_pkcs12_crlId,
       { "crlId", "pkcs12.crlId",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkcs12.T_crlId", HFILL }},
+        "T_crlId", HFILL }},
     { &hf_pkcs12_crlValue,
       { "crlValue", "pkcs12.crlValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.T_crlValue", HFILL }},
+        "T_crlValue", HFILL }},
     { &hf_pkcs12_secretTypeId,
       { "secretTypeId", "pkcs12.secretTypeId",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkcs12.T_secretTypeId", HFILL }},
+        "T_secretTypeId", HFILL }},
     { &hf_pkcs12_secretValue,
       { "secretValue", "pkcs12.secretValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.T_secretValue", HFILL }},
+        "T_secretValue", HFILL }},
     { &hf_pkcs12_attrId,
       { "attrId", "pkcs12.attrId",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkcs12.T_attrId", HFILL }},
+        "T_attrId", HFILL }},
     { &hf_pkcs12_attrValues,
       { "attrValues", "pkcs12.attrValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.T_attrValues", HFILL }},
+        "T_attrValues", HFILL }},
     { &hf_pkcs12_attrValues_item,
       { "attrValues item", "pkcs12.attrValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkcs12.T_attrValues_item", HFILL }},
+        "T_attrValues_item", HFILL }},
     { &hf_pkcs12_privateKeyVersion,
       { "version", "pkcs12.version",
         FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0,
-        "pkcs12.Version", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_privateKeyAlgorithm,
       { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_privateKey,
       { "privateKey", "pkcs12.privateKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkcs12.PrivateKey", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_attributes,
       { "attributes", "pkcs12.attributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.Attributes", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_Attributes_item,
       { "Attribute", "pkcs12.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_encryptionAlgorithm,
       { "encryptionAlgorithm", "pkcs12.encryptionAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_encryptedData,
       { "encryptedData", "pkcs12.encryptedData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkcs12.EncryptedData", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_salt,
       { "salt", "pkcs12.salt",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkcs12.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_pkcs12_iterationCount,
       { "iterationCount", "pkcs12.iterationCount",
         FT_INT32, BASE_DEC, NULL, 0,
-        "pkcs12.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_pkcs12_saltChoice,
       { "salt", "pkcs12.salt",
         FT_UINT32, BASE_DEC, VALS(pkcs12_T_saltChoice_vals), 0,
-        "pkcs12.T_saltChoice", HFILL }},
+        "T_saltChoice", HFILL }},
     { &hf_pkcs12_specified,
       { "specified", "pkcs12.specified",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkcs12.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_pkcs12_otherSource,
       { "otherSource", "pkcs12.otherSource",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_keyLength,
       { "keyLength", "pkcs12.keyLength",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkcs12.INTEGER_1_MAX", HFILL }},
+        "INTEGER_1_MAX", HFILL }},
     { &hf_pkcs12_prf,
       { "prf", "pkcs12.prf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_keyDerivationFunc,
       { "keyDerivationFunc", "pkcs12.keyDerivationFunc",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_encryptionScheme,
       { "encryptionScheme", "pkcs12.encryptionScheme",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_messageAuthScheme,
       { "messageAuthScheme", "pkcs12.messageAuthScheme",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
 
 /*--- End of included file: packet-pkcs12-hfarr.c ---*/
 #line 450 "packet-pkcs12-template.c"