aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x509ce.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-06-18 21:30:42 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-06-18 21:30:42 +0000
commitc3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch)
tree62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-x509ce.c
parent8210e1b06b7f866f3bc60e22b8fb54a12adba06c (diff)
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
Diffstat (limited to 'epan/dissectors/packet-x509ce.c')
-rw-r--r--epan/dissectors/packet-x509ce.c94
1 files changed, 47 insertions, 47 deletions
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 016d562439..f7ad693eaa 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1845,11 +1845,11 @@ void proto_register_x509ce(void) {
{ &hf_x509ce_id_ce_baseUpdateTime,
{ "baseUpdateTime", "x509ce.id_ce_baseUpdateTime",
FT_STRING, BASE_NONE, NULL, 0,
- "baseUpdateTime", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_id_ce_invalidityDate,
{ "invalidityDate", "x509ce.id_ce_invalidityDate",
FT_STRING, BASE_NONE, NULL, 0,
- "invalidityDate", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_object_identifier_id,
{ "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0,
"Object identifier Id", HFILL }},
@@ -1866,11 +1866,11 @@ void proto_register_x509ce(void) {
"x509ce.AuthorityKeyIdentifier", HFILL }},
{ &hf_x509ce_SubjectKeyIdentifier_PDU,
{ "SubjectKeyIdentifier", "x509ce.SubjectKeyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.SubjectKeyIdentifier", HFILL }},
{ &hf_x509ce_KeyUsage_PDU,
{ "KeyUsage", "x509ce.KeyUsage",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.KeyUsage", HFILL }},
{ &hf_x509ce_KeyPurposeIDs_PDU,
{ "KeyPurposeIDs", "x509ce.KeyPurposeIDs",
@@ -2010,7 +2010,7 @@ void proto_register_x509ce(void) {
"x509ce.EntrustVersionInfo", HFILL }},
{ &hf_x509ce_keyIdentifier,
{ "keyIdentifier", "x509ce.keyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.KeyIdentifier", HFILL }},
{ &hf_x509ce_authorityCertIssuer,
{ "authorityCertIssuer", "x509ce.authorityCertIssuer",
@@ -2102,7 +2102,7 @@ void proto_register_x509ce(void) {
"x509ce.T_uniformResourceIdentifier", HFILL }},
{ &hf_x509ce_iPAddress,
{ "iPAddress", "x509ce.iPAddress",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.T_iPAddress", HFILL }},
{ &hf_x509ce_registeredID,
{ "registeredID", "x509ce.registeredID",
@@ -2130,7 +2130,7 @@ void proto_register_x509ce(void) {
"x509if.Attribute", HFILL }},
{ &hf_x509ce_cA,
{ "cA", "x509ce.cA",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_pathLenConstraint,
{ "pathLenConstraint", "x509ce.pathLenConstraint",
@@ -2182,11 +2182,11 @@ void proto_register_x509ce(void) {
"x509ce.DistributionPointName", HFILL }},
{ &hf_x509ce_onlyContains,
{ "onlyContains", "x509ce.onlyContains",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.OnlyCertificateTypes", HFILL }},
{ &hf_x509ce_onlySomeReasons,
{ "onlySomeReasons", "x509ce.onlySomeReasons",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.ReasonFlags", HFILL }},
{ &hf_x509ce_serialNumberRange,
{ "serialNumberRange", "x509ce.serialNumberRange",
@@ -2278,7 +2278,7 @@ void proto_register_x509ce(void) {
"x509ce.DistributionPoint", HFILL }},
{ &hf_x509ce_reasons,
{ "reasons", "x509ce.reasons",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.ReasonFlags", HFILL }},
{ &hf_x509ce_cRLIssuer,
{ "cRLIssuer", "x509ce.cRLIssuer",
@@ -2294,15 +2294,15 @@ void proto_register_x509ce(void) {
"x509if.RelativeDistinguishedName", HFILL }},
{ &hf_x509ce_onlyContainsUserPublicKeyCerts,
{ "onlyContainsUserPublicKeyCerts", "x509ce.onlyContainsUserPublicKeyCerts",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_onlyContainsCACerts,
{ "onlyContainsCACerts", "x509ce.onlyContainsCACerts",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_indirectCRL,
{ "indirectCRL", "x509ce.indirectCRL",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_ToBeRevokedSyntax_item,
{ "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup",
@@ -2362,15 +2362,15 @@ void proto_register_x509ce(void) {
"x509ce.RevokedCertificateGroup", HFILL }},
{ &hf_x509ce_containsUserAttributeCerts,
{ "containsUserAttributeCerts", "x509ce.containsUserAttributeCerts",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_containsAACerts,
{ "containsAACerts", "x509ce.containsAACerts",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_containsSOAPublicKeyCerts,
{ "containsSOAPublicKeyCerts", "x509ce.containsSOAPublicKeyCerts",
- FT_BOOLEAN, 8, NULL, 0,
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"x509ce.BOOLEAN", HFILL }},
{ &hf_x509ce_serialNumber,
{ "serialNumber", "x509ce.serialNumber",
@@ -2382,7 +2382,7 @@ void proto_register_x509ce(void) {
"x509if.Name", HFILL }},
{ &hf_x509ce_subjectKeyIdentifier,
{ "subjectKeyIdentifier", "x509ce.subjectKeyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.SubjectKeyIdentifier", HFILL }},
{ &hf_x509ce_authorityKeyIdentifier,
{ "authorityKeyIdentifier", "x509ce.authorityKeyIdentifier",
@@ -2402,7 +2402,7 @@ void proto_register_x509ce(void) {
"x509ce.OBJECT_IDENTIFIER", HFILL }},
{ &hf_x509ce_keyUsage,
{ "keyUsage", "x509ce.keyUsage",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.KeyUsage", HFILL }},
{ &hf_x509ce_subjectAltName,
{ "subjectAltName", "x509ce.subjectAltName",
@@ -2466,7 +2466,7 @@ void proto_register_x509ce(void) {
"x509ce.CRLNumber", HFILL }},
{ &hf_x509ce_reasonFlags,
{ "reasonFlags", "x509ce.reasonFlags",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.ReasonFlags", HFILL }},
{ &hf_x509ce_dateAndTime,
{ "dateAndTime", "x509ce.dateAndTime",
@@ -2514,116 +2514,116 @@ void proto_register_x509ce(void) {
"x509ce.GeneralString", HFILL }},
{ &hf_x509ce_entrustVersInfoFlags,
{ "entrustVersInfoFlags", "x509ce.entrustVersInfoFlags",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"x509ce.EntrustInfoFlags", HFILL }},
{ &hf_x509ce_KeyUsage_digitalSignature,
{ "digitalSignature", "x509ce.digitalSignature",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_contentCommitment,
{ "contentCommitment", "x509ce.contentCommitment",
FT_BOOLEAN, 8, NULL, 0x40,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_keyEncipherment,
{ "keyEncipherment", "x509ce.keyEncipherment",
FT_BOOLEAN, 8, NULL, 0x20,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_dataEncipherment,
{ "dataEncipherment", "x509ce.dataEncipherment",
FT_BOOLEAN, 8, NULL, 0x10,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_keyAgreement,
{ "keyAgreement", "x509ce.keyAgreement",
FT_BOOLEAN, 8, NULL, 0x08,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_keyCertSign,
{ "keyCertSign", "x509ce.keyCertSign",
FT_BOOLEAN, 8, NULL, 0x04,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_cRLSign,
{ "cRLSign", "x509ce.cRLSign",
FT_BOOLEAN, 8, NULL, 0x02,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_encipherOnly,
{ "encipherOnly", "x509ce.encipherOnly",
FT_BOOLEAN, 8, NULL, 0x01,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_KeyUsage_decipherOnly,
{ "decipherOnly", "x509ce.decipherOnly",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_OnlyCertificateTypes_user,
{ "user", "x509ce.user",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_OnlyCertificateTypes_authority,
{ "authority", "x509ce.authority",
FT_BOOLEAN, 8, NULL, 0x40,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_OnlyCertificateTypes_attribute,
{ "attribute", "x509ce.attribute",
FT_BOOLEAN, 8, NULL, 0x20,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_unused,
{ "unused", "x509ce.unused",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_keyCompromise,
{ "keyCompromise", "x509ce.keyCompromise",
FT_BOOLEAN, 8, NULL, 0x40,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_cACompromise,
{ "cACompromise", "x509ce.cACompromise",
FT_BOOLEAN, 8, NULL, 0x20,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_affiliationChanged,
{ "affiliationChanged", "x509ce.affiliationChanged",
FT_BOOLEAN, 8, NULL, 0x10,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_superseded,
{ "superseded", "x509ce.superseded",
FT_BOOLEAN, 8, NULL, 0x08,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_cessationOfOperation,
{ "cessationOfOperation", "x509ce.cessationOfOperation",
FT_BOOLEAN, 8, NULL, 0x04,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_certificateHold,
{ "certificateHold", "x509ce.certificateHold",
FT_BOOLEAN, 8, NULL, 0x02,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_privilegeWithdrawn,
{ "privilegeWithdrawn", "x509ce.privilegeWithdrawn",
FT_BOOLEAN, 8, NULL, 0x01,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_ReasonFlags_aACompromise,
{ "aACompromise", "x509ce.aACompromise",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed,
{ "keyUpdateAllowed", "x509ce.keyUpdateAllowed",
FT_BOOLEAN, 8, NULL, 0x80,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_newExtensions,
{ "newExtensions", "x509ce.newExtensions",
FT_BOOLEAN, 8, NULL, 0x40,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_pKIXCertificate,
{ "pKIXCertificate", "x509ce.pKIXCertificate",
FT_BOOLEAN, 8, NULL, 0x20,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_enterpriseCategory,
{ "enterpriseCategory", "x509ce.enterpriseCategory",
FT_BOOLEAN, 8, NULL, 0x10,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_webCategory,
{ "webCategory", "x509ce.webCategory",
FT_BOOLEAN, 8, NULL, 0x08,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_x509ce_EntrustInfoFlags_sETCategory,
{ "sETCategory", "x509ce.sETCategory",
FT_BOOLEAN, 8, NULL, 0x04,
- "", HFILL }},
+ NULL, HFILL }},
/*--- End of included file: packet-x509ce-hfarr.c ---*/
#line 102 "packet-x509ce-template.c"