From c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 Mon Sep 17 00:00:00 2001
From: stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Thu, 18 Jun 2009 21:30:42 +0000
Subject: From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading
 spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced
 with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL,
 0x0 are used for 'display', 'strings' and 'bitmask' fields     for FT_NONE,
 FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,    
 FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero
 value for 'display' if 'bitmask' is non-zero

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
---
 epan/dissectors/packet-x509if.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'epan/dissectors/packet-x509if.c')

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 1dedf068c5..7894f9a24b 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -2125,7 +2125,7 @@ void proto_register_x509if(void) {
       { "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0,
 	"Object identifier Id", HFILL }},
     { &hf_x509if_any_string, 
-      { "AnyString", "x509if.any.String", FT_BYTES, BASE_HEX,
+      { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE,
 	    NULL, 0, "This is any String", HFILL }},
 			 
 
@@ -2145,7 +2145,7 @@ void proto_register_x509if(void) {
         "x509if.HierarchyLevel", HFILL }},
     { &hf_x509if_HierarchyBelow_PDU,
       { "HierarchyBelow", "x509if.HierarchyBelow",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.HierarchyBelow", HFILL }},
     { &hf_x509if_type,
       { "type", "x509if.type",
@@ -2193,7 +2193,7 @@ void proto_register_x509if(void) {
         "x509if.T_contextValues_item", HFILL }},
     { &hf_x509if_fallback,
       { "fallback", "x509if.fallback",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_type_01,
       { "type", "x509if.type",
@@ -2265,7 +2265,7 @@ void proto_register_x509if(void) {
         "x509if.T_atadv_value", HFILL }},
     { &hf_x509if_primaryDistinguished,
       { "primaryDistinguished", "x509if.primaryDistinguished",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_valueswithContext,
       { "valuesWithContext", "x509if.valuesWithContext",
@@ -2413,7 +2413,7 @@ void proto_register_x509if(void) {
         "x509if.T_attributeType", HFILL }},
     { &hf_x509if_includeSubtypes,
       { "includeSubtypes", "x509if.includeSubtypes",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_ra_selectedValues,
       { "selectedValues", "x509if.selectedValues",
@@ -2713,7 +2713,7 @@ void proto_register_x509if(void) {
         "x509if.AttributeType", HFILL }},
     { &hf_x509if_allowedSubset,
       { "allowedSubset", "x509if.allowedSubset",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509if.AllowedSubset", HFILL }},
     { &hf_x509if_imposedSubset,
       { "imposedSubset", "x509if.imposedSubset",
@@ -2738,15 +2738,15 @@ void proto_register_x509if(void) {
     { &hf_x509if_AllowedSubset_baseObject,
       { "baseObject", "x509if.baseObject",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_AllowedSubset_oneLevel,
       { "oneLevel", "x509if.oneLevel",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_AllowedSubset_wholeSubtree,
       { "wholeSubtree", "x509if.wholeSubtree",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/
 #line 124 "packet-x509if-template.c"
-- 
cgit v1.2.3