diff options
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 1f8d5dca86..c6111f240c 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -1198,7 +1198,7 @@ void proto_register_pkcs12(void) { /*--- Included file: packet-pkcs12-hfarr.c ---*/ #line 1 "../../asn1/pkcs12/packet-pkcs12-hfarr.c" { &hf_pkcs12_PFX_PDU, - { "PFX", "pkcs12.PFX", + { "PFX", "pkcs12.PFX_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_AuthenticatedSafe_PDU, @@ -1210,47 +1210,47 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_KeyBag_PDU, - { "KeyBag", "pkcs12.KeyBag", + { "KeyBag", "pkcs12.KeyBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PKCS8ShroudedKeyBag_PDU, - { "PKCS8ShroudedKeyBag", "pkcs12.PKCS8ShroudedKeyBag", + { "PKCS8ShroudedKeyBag", "pkcs12.PKCS8ShroudedKeyBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_CertBag_PDU, - { "CertBag", "pkcs12.CertBag", + { "CertBag", "pkcs12.CertBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_CRLBag_PDU, - { "CRLBag", "pkcs12.CRLBag", + { "CRLBag", "pkcs12.CRLBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_SecretBag_PDU, - { "SecretBag", "pkcs12.SecretBag", + { "SecretBag", "pkcs12.SecretBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PrivateKeyInfo_PDU, - { "PrivateKeyInfo", "pkcs12.PrivateKeyInfo", + { "PrivateKeyInfo", "pkcs12.PrivateKeyInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_EncryptedPrivateKeyInfo_PDU, - { "EncryptedPrivateKeyInfo", "pkcs12.EncryptedPrivateKeyInfo", + { "EncryptedPrivateKeyInfo", "pkcs12.EncryptedPrivateKeyInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PBEParameter_PDU, - { "PBEParameter", "pkcs12.PBEParameter", + { "PBEParameter", "pkcs12.PBEParameter_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PBKDF2Params_PDU, - { "PBKDF2Params", "pkcs12.PBKDF2Params", + { "PBKDF2Params", "pkcs12.PBKDF2Params_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PBES2Params_PDU, - { "PBES2Params", "pkcs12.PBES2Params", + { "PBES2Params", "pkcs12.PBES2Params_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_PBMAC1Params_PDU, - { "PBMAC1Params", "pkcs12.PBMAC1Params", + { "PBMAC1Params", "pkcs12.PBMAC1Params_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_version, @@ -1258,15 +1258,15 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, VALS(pkcs12_T_version_vals), 0, NULL, HFILL }}, { &hf_pkcs12_authSafe, - { "authSafe", "pkcs12.authSafe", + { "authSafe", "pkcs12.authSafe_element", FT_NONE, BASE_NONE, NULL, 0, "ContentInfo", HFILL }}, { &hf_pkcs12_macData, - { "macData", "pkcs12.macData", + { "macData", "pkcs12.macData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_mac, - { "mac", "pkcs12.mac", + { "mac", "pkcs12.mac_element", FT_NONE, BASE_NONE, NULL, 0, "DigestInfo", HFILL }}, { &hf_pkcs12_macSalt, @@ -1278,7 +1278,7 @@ void proto_register_pkcs12(void) { FT_INT32, BASE_DEC, NULL, 0, "INTEGER", HFILL }}, { &hf_pkcs12_digestAlgorithm, - { "digestAlgorithm", "pkcs12.digestAlgorithm", + { "digestAlgorithm", "pkcs12.digestAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "DigestAlgorithmIdentifier", HFILL }}, { &hf_pkcs12_digest, @@ -1286,11 +1286,11 @@ void proto_register_pkcs12(void) { FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_AuthenticatedSafe_item, - { "ContentInfo", "pkcs12.ContentInfo", + { "ContentInfo", "pkcs12.ContentInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_SafeContents_item, - { "SafeBag", "pkcs12.SafeBag", + { "SafeBag", "pkcs12.SafeBag_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_bagId, @@ -1298,7 +1298,7 @@ void proto_register_pkcs12(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_bagValue, - { "bagValue", "pkcs12.bagValue", + { "bagValue", "pkcs12.bagValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_bagAttributes, @@ -1306,7 +1306,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, "SET_OF_PKCS12Attribute", HFILL }}, { &hf_pkcs12_bagAttributes_item, - { "PKCS12Attribute", "pkcs12.PKCS12Attribute", + { "PKCS12Attribute", "pkcs12.PKCS12Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_certId, @@ -1314,7 +1314,7 @@ void proto_register_pkcs12(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_certValue, - { "certValue", "pkcs12.certValue", + { "certValue", "pkcs12.certValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_crlId, @@ -1322,7 +1322,7 @@ void proto_register_pkcs12(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_crlValue, - { "crlValue", "pkcs12.crlValue", + { "crlValue", "pkcs12.crlValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_secretTypeId, @@ -1330,7 +1330,7 @@ void proto_register_pkcs12(void) { FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_secretValue, - { "secretValue", "pkcs12.secretValue", + { "secretValue", "pkcs12.secretValue_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_attrId, @@ -1342,7 +1342,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_attrValues_item, - { "attrValues item", "pkcs12.attrValues_item", + { "attrValues item", "pkcs12.attrValues_item_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_privateKeyVersion, @@ -1350,7 +1350,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0, NULL, HFILL }}, { &hf_pkcs12_privateKeyAlgorithm, - { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm", + { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_privateKey, @@ -1362,11 +1362,11 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_Attributes_item, - { "Attribute", "pkcs12.Attribute", + { "Attribute", "pkcs12.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pkcs12_encryptionAlgorithm, - { "encryptionAlgorithm", "pkcs12.encryptionAlgorithm", + { "encryptionAlgorithm", "pkcs12.encryptionAlgorithm_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_encryptedData, @@ -1390,7 +1390,7 @@ void proto_register_pkcs12(void) { FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, { &hf_pkcs12_otherSource, - { "otherSource", "pkcs12.otherSource", + { "otherSource", "pkcs12.otherSource_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_keyLength, @@ -1398,19 +1398,19 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_MAX", HFILL }}, { &hf_pkcs12_prf, - { "prf", "pkcs12.prf", + { "prf", "pkcs12.prf_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_keyDerivationFunc, - { "keyDerivationFunc", "pkcs12.keyDerivationFunc", + { "keyDerivationFunc", "pkcs12.keyDerivationFunc_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_encryptionScheme, - { "encryptionScheme", "pkcs12.encryptionScheme", + { "encryptionScheme", "pkcs12.encryptionScheme_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_messageAuthScheme, - { "messageAuthScheme", "pkcs12.messageAuthScheme", + { "messageAuthScheme", "pkcs12.messageAuthScheme_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, |