aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pkcs12.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-05-16 22:07:03 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-05-16 22:07:03 +0000
commit7bd379edb4db9b4cda4981f3c81c8f7028ba5054 (patch)
treeb1055286b24404aea8078ca2430dda80e1440964 /epan/dissectors/packet-pkcs12.c
parentf4fba39033c57bb27e8c3bb202abd030c2f7aedd (diff)
Regenerate all asn2wrs generated dissectors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28379 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
-rw-r--r--epan/dissectors/packet-pkcs12.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index e46ec0f0e7..5e5e0e9ccc 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-pkcs12.c */
-/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */
+/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c ./pkcs12.cnf -s ./packet-pkcs12-template -D . pkcs12.asn */
/* Input file: packet-pkcs12-template.c */
@@ -1288,11 +1288,11 @@ void proto_register_pkcs12(void) {
FT_BYTES, BASE_HEX, NULL, 0,
"cms.Digest", HFILL }},
{ &hf_pkcs12_AuthenticatedSafe_item,
- { "AuthenticatedSafe", "pkcs12.AuthenticatedSafe_item",
+ { "ContentInfo", "pkcs12.ContentInfo",
FT_NONE, BASE_NONE, NULL, 0,
"cms.ContentInfo", HFILL }},
{ &hf_pkcs12_SafeContents_item,
- { "SafeContents", "pkcs12.SafeContents_item",
+ { "SafeBag", "pkcs12.SafeBag",
FT_NONE, BASE_NONE, NULL, 0,
"pkcs12.SafeBag", HFILL }},
{ &hf_pkcs12_bagId,
@@ -1308,7 +1308,7 @@ void proto_register_pkcs12(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"pkcs12.SET_OF_PKCS12Attribute", HFILL }},
{ &hf_pkcs12_bagAttributes_item,
- { "bagAttributes", "pkcs12.bagAttributes_item",
+ { "PKCS12Attribute", "pkcs12.PKCS12Attribute",
FT_NONE, BASE_NONE, NULL, 0,
"pkcs12.PKCS12Attribute", HFILL }},
{ &hf_pkcs12_certId,
@@ -1344,7 +1344,7 @@ void proto_register_pkcs12(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"pkcs12.T_attrValues", HFILL }},
{ &hf_pkcs12_attrValues_item,
- { "attrValues", "pkcs12.attrValues_item",
+ { "attrValues item", "pkcs12.attrValues_item",
FT_NONE, BASE_NONE, NULL, 0,
"pkcs12.T_attrValues_item", HFILL }},
{ &hf_pkcs12_privateKeyVersion,
@@ -1364,7 +1364,7 @@ void proto_register_pkcs12(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"pkcs12.Attributes", HFILL }},
{ &hf_pkcs12_Attributes_item,
- { "Attributes", "pkcs12.Attributes_item",
+ { "Attribute", "pkcs12.Attribute",
FT_NONE, BASE_NONE, NULL, 0,
"x509if.Attribute", HFILL }},
{ &hf_pkcs12_encryptionAlgorithm,