Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index db46a61b6d..38c259e574 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1255,7 +1255,7 @@ void proto_register_pkcs12(void) {
     { &hf_pkcs12_version,
       { "version", "pkcs12.version",
         FT_UINT32, BASE_DEC, VALS(pkcs12_T_version_vals), 0,
-        "T_version", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_authSafe,
       { "authSafe", "pkcs12.authSafe",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1295,11 +1295,11 @@ void proto_register_pkcs12(void) {
     { &hf_pkcs12_bagId,
       { "bagId", "pkcs12.bagId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_bagId", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_bagValue,
       { "bagValue", "pkcs12.bagValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_bagValue", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_bagAttributes,
       { "bagAttributes", "pkcs12.bagAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -1311,39 +1311,39 @@ void proto_register_pkcs12(void) {
     { &hf_pkcs12_certId,
       { "certId", "pkcs12.certId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_certId", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_certValue,
       { "certValue", "pkcs12.certValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_certValue", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_crlId,
       { "crlId", "pkcs12.crlId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_crlId", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_crlValue,
       { "crlValue", "pkcs12.crlValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_crlValue", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_secretTypeId,
       { "secretTypeId", "pkcs12.secretTypeId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_secretTypeId", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_secretValue,
       { "secretValue", "pkcs12.secretValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_secretValue", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_attrId,
       { "attrId", "pkcs12.attrId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_attrId", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_attrValues,
       { "attrValues", "pkcs12.attrValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_attrValues", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_attrValues_item,
       { "attrValues item", "pkcs12.attrValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_attrValues_item", HFILL }},
+        NULL, HFILL }},
     { &hf_pkcs12_privateKeyVersion,
       { "version", "pkcs12.version",
         FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0,