Regenerate a few of the ASN.1 dissectors

svn path=/trunk/; revision=32742

1 files changed, 145 insertions, 145 deletions

diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 6efc4fd8d2..6f16a3df03 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2205,583 +2205,583 @@ void proto_register_dop(void) {
     { &hf_dop_DSEType_PDU,
       { "DSEType", "dop.DSEType",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "dop.DSEType", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_SupplierInformation_PDU,
       { "SupplierInformation", "dop.SupplierInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SupplierInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_ConsumerInformation_PDU,
       { "ConsumerInformation", "dop.ConsumerInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ConsumerInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_SupplierAndConsumers_PDU,
       { "SupplierAndConsumers", "dop.SupplierAndConsumers",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SupplierAndConsumers", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_HierarchicalAgreement_PDU,
       { "HierarchicalAgreement", "dop.HierarchicalAgreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.HierarchicalAgreement", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinate_PDU,
       { "SuperiorToSubordinate", "dop.SuperiorToSubordinate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SuperiorToSubordinate", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_SubordinateToSuperior_PDU,
       { "SubordinateToSuperior", "dop.SubordinateToSuperior",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SubordinateToSuperior", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinateModification_PDU,
       { "SuperiorToSubordinateModification", "dop.SuperiorToSubordinateModification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SuperiorToSubordinateModification", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_NonSpecificHierarchicalAgreement_PDU,
       { "NonSpecificHierarchicalAgreement", "dop.NonSpecificHierarchicalAgreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NonSpecificHierarchicalAgreement", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_NHOBSuperiorToSubordinate_PDU,
       { "NHOBSuperiorToSubordinate", "dop.NHOBSuperiorToSubordinate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NHOBSuperiorToSubordinate", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_NHOBSubordinateToSuperior_PDU,
       { "NHOBSubordinateToSuperior", "dop.NHOBSubordinateToSuperior",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NHOBSubordinateToSuperior", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_ACIItem_PDU,
       { "ACIItem", "dop.ACIItem",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ACIItem", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_ae_title,
       { "ae-title", "dop.ae_title",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "x509if.Name", HFILL }},
+        "Name", HFILL }},
     { &hf_dop_address,
       { "address", "dop.address",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509sat.PresentationAddress", HFILL }},
+        "PresentationAddress", HFILL }},
     { &hf_dop_protocolInformation,
       { "protocolInformation", "dop.protocolInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_ProtocolInformation", HFILL }},
+        "SET_OF_ProtocolInformation", HFILL }},
     { &hf_dop_protocolInformation_item,
       { "ProtocolInformation", "dop.ProtocolInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509sat.ProtocolInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_agreementID,
       { "agreementID", "dop.agreementID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.OperationalBindingID", HFILL }},
+        "OperationalBindingID", HFILL }},
     { &hf_dop_supplier_is_master,
       { "supplier-is-master", "dop.supplier_is_master",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "dop.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_dop_non_supplying_master,
       { "non-supplying-master", "dop.non_supplying_master",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dsp.AccessPoint", HFILL }},
+        "AccessPoint", HFILL }},
     { &hf_dop_consumers,
       { "consumers", "dop.consumers",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_AccessPoint", HFILL }},
+        "SET_OF_AccessPoint", HFILL }},
     { &hf_dop_consumers_item,
       { "AccessPoint", "dop.AccessPoint",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dsp.AccessPoint", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_bindingType,
       { "bindingType", "dop.bindingType",
         FT_OID, BASE_NONE, NULL, 0,
-        "dop.BindingType", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_bindingID,
       { "bindingID", "dop.bindingID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.OperationalBindingID", HFILL }},
+        "OperationalBindingID", HFILL }},
     { &hf_dop_accessPoint,
       { "accessPoint", "dop.accessPoint",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dsp.AccessPoint", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_establishInitiator,
       { "initiator", "dop.initiator",
         FT_UINT32, BASE_DEC, VALS(dop_EstablishArgumentInitiator_vals), 0,
-        "dop.EstablishArgumentInitiator", HFILL }},
+        "EstablishArgumentInitiator", HFILL }},
     { &hf_dop_establishSymmetric,
       { "symmetric", "dop.symmetric",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EstablishSymmetric", HFILL }},
+        "EstablishSymmetric", HFILL }},
     { &hf_dop_establishRoleAInitiates,
       { "roleA-initiates", "dop.roleA_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EstablishRoleAInitiates", HFILL }},
+        "EstablishRoleAInitiates", HFILL }},
     { &hf_dop_establishRoleBInitiates,
       { "roleB-initiates", "dop.roleB_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EstablishRoleBInitiates", HFILL }},
+        "EstablishRoleBInitiates", HFILL }},
     { &hf_dop_agreement,
       { "agreement", "dop.agreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_agreement", HFILL }},
+        "T_agreement", HFILL }},
     { &hf_dop_valid,
       { "valid", "dop.valid",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.Validity", HFILL }},
+        "Validity", HFILL }},
     { &hf_dop_securityParameters,
       { "securityParameters", "dop.securityParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dap.SecurityParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_unsignedEstablishOperationalBindingArgument,
       { "unsignedEstablishOperationalBindingArgument", "dop.unsignedEstablishOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EstablishOperationalBindingArgumentData", HFILL }},
+        "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedEstablishOperationalBindingArgument,
       { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_signedEstablishOperationalBindingArgument", HFILL }},
+        "T_signedEstablishOperationalBindingArgument", HFILL }},
     { &hf_dop_establishOperationalBindingArgument,
       { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EstablishOperationalBindingArgumentData", HFILL }},
+        "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_algorithmIdentifier,
       { "algorithmIdentifier", "dop.algorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_encrypted,
       { "encrypted", "dop.encrypted",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "dop.BIT_STRING", HFILL }},
+        "BIT_STRING", HFILL }},
     { &hf_dop_identifier,
       { "identifier", "dop.identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.T_identifier", HFILL }},
+        "T_identifier", HFILL }},
     { &hf_dop_version,
       { "version", "dop.version",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.T_version", HFILL }},
+        "T_version", HFILL }},
     { &hf_dop_validFrom,
       { "validFrom", "dop.validFrom",
         FT_UINT32, BASE_DEC, VALS(dop_T_validFrom_vals), 0,
-        "dop.T_validFrom", HFILL }},
+        "T_validFrom", HFILL }},
     { &hf_dop_now,
       { "now", "dop.now",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_time,
       { "time", "dop.time",
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
-        "dop.Time", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_validUntil,
       { "validUntil", "dop.validUntil",
         FT_UINT32, BASE_DEC, VALS(dop_T_validUntil_vals), 0,
-        "dop.T_validUntil", HFILL }},
+        "T_validUntil", HFILL }},
     { &hf_dop_explicitTermination,
       { "explicitTermination", "dop.explicitTermination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_utcTime,
       { "utcTime", "dop.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "dop.UTCTime", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_generalizedTime,
       { "generalizedTime", "dop.generalizedTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "dop.GeneralizedTime", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_initiator,
       { "initiator", "dop.initiator",
         FT_UINT32, BASE_DEC, VALS(dop_T_initiator_vals), 0,
-        "dop.T_initiator", HFILL }},
+        "T_initiator", HFILL }},
     { &hf_dop_symmetric,
       { "symmetric", "dop.symmetric",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_symmetric", HFILL }},
+        "T_symmetric", HFILL }},
     { &hf_dop_roleA_replies,
       { "roleA-replies", "dop.roleA_replies",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_roleA_replies", HFILL }},
+        "T_roleA_replies", HFILL }},
     { &hf_dop_roleB_replies,
       { "roleB-replies", "dop.roleB_replies",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_roleB_replies", HFILL }},
+        "T_roleB_replies", HFILL }},
     { &hf_dop_performer,
       { "performer", "dop.performer",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x509if.DistinguishedName", HFILL }},
+        "DistinguishedName", HFILL }},
     { &hf_dop_aliasDereferenced,
       { "aliasDereferenced", "dop.aliasDereferenced",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "dop.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_dop_notification,
       { "notification", "dop.notification",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
+        "SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
     { &hf_dop_notification_item,
       { "Attribute", "dop.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_modifyInitiator,
       { "initiator", "dop.initiator",
         FT_UINT32, BASE_DEC, VALS(dop_ModifyArgumentInitiator_vals), 0,
-        "dop.ModifyArgumentInitiator", HFILL }},
+        "ModifyArgumentInitiator", HFILL }},
     { &hf_dop_modifySymmetric,
       { "symmetric", "dop.symmetric",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifySymmetric", HFILL }},
+        "ModifySymmetric", HFILL }},
     { &hf_dop_modifyRoleAInitiates,
       { "roleA-initiates", "dop.roleA_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifyRoleAInitiates", HFILL }},
+        "ModifyRoleAInitiates", HFILL }},
     { &hf_dop_modifyRoleBInitiates,
       { "roleB-initiates", "dop.roleB_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifyRoleBInitiates", HFILL }},
+        "ModifyRoleBInitiates", HFILL }},
     { &hf_dop_newBindingID,
       { "newBindingID", "dop.newBindingID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.OperationalBindingID", HFILL }},
+        "OperationalBindingID", HFILL }},
     { &hf_dop_argumentNewAgreement,
       { "newAgreement", "dop.newAgreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ArgumentNewAgreement", HFILL }},
+        "ArgumentNewAgreement", HFILL }},
     { &hf_dop_unsignedModifyOperationalBindingArgument,
       { "unsignedModifyOperationalBindingArgument", "dop.unsignedModifyOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifyOperationalBindingArgumentData", HFILL }},
+        "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedModifyOperationalBindingArgument,
       { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_signedModifyOperationalBindingArgument", HFILL }},
+        "T_signedModifyOperationalBindingArgument", HFILL }},
     { &hf_dop_modifyOperationalBindingArgument,
       { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifyOperationalBindingArgumentData", HFILL }},
+        "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_null,
       { "null", "dop.null",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_protectedModifyResult,
       { "protected", "dop.protected",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ProtectedModifyResult", HFILL }},
+        "ProtectedModifyResult", HFILL }},
     { &hf_dop_modifyOperationalBindingResultData,
       { "modifyOperationalBindingResultData", "dop.modifyOperationalBindingResultData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ModifyOperationalBindingResultData", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_resultNewAgreement,
       { "newAgreement", "dop.newAgreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ResultNewAgreement", HFILL }},
+        "ResultNewAgreement", HFILL }},
     { &hf_dop_terminateInitiator,
       { "initiator", "dop.initiator",
         FT_UINT32, BASE_DEC, VALS(dop_TerminateArgumentInitiator_vals), 0,
-        "dop.TerminateArgumentInitiator", HFILL }},
+        "TerminateArgumentInitiator", HFILL }},
     { &hf_dop_terminateSymmetric,
       { "symmetric", "dop.symmetric",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateSymmetric", HFILL }},
+        "TerminateSymmetric", HFILL }},
     { &hf_dop_terminateRoleAInitiates,
       { "roleA-initiates", "dop.roleA_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateRoleAInitiates", HFILL }},
+        "TerminateRoleAInitiates", HFILL }},
     { &hf_dop_terminateRoleBInitiates,
       { "roleB-initiates", "dop.roleB_initiates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateRoleBInitiates", HFILL }},
+        "TerminateRoleBInitiates", HFILL }},
     { &hf_dop_terminateAtTime,
       { "terminateAt", "dop.terminateAt",
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
-        "dop.Time", HFILL }},
+        "Time", HFILL }},
     { &hf_dop_unsignedTerminateOperationalBindingArgument,
       { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateOperationalBindingArgumentData", HFILL }},
+        "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedTerminateOperationalBindingArgument,
       { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_signedTerminateOperationalBindingArgument", HFILL }},
+        "T_signedTerminateOperationalBindingArgument", HFILL }},
     { &hf_dop_terminateOperationalBindingArgument,
       { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateOperationalBindingArgumentData", HFILL }},
+        "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_protectedTerminateResult,
       { "protected", "dop.protected",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ProtectedTerminateResult", HFILL }},
+        "ProtectedTerminateResult", HFILL }},
     { &hf_dop_terminateOperationalBindingResultData,
       { "terminateOperationalBindingResultData", "dop.terminateOperationalBindingResultData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.TerminateOperationalBindingResultData", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_terminateAtGeneralizedTime,
       { "terminateAt", "dop.terminateAt",
         FT_STRING, BASE_NONE, NULL, 0,
-        "dop.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_dop_problem,
       { "problem", "dop.problem",
         FT_UINT32, BASE_DEC, VALS(dop_T_problem_vals), 0,
-        "dop.T_problem", HFILL }},
+        "T_problem", HFILL }},
     { &hf_dop_agreementProposal,
       { "agreementProposal", "dop.agreementProposal",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_agreementProposal", HFILL }},
+        "T_agreementProposal", HFILL }},
     { &hf_dop_retryAt,
       { "retryAt", "dop.retryAt",
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
-        "dop.Time", HFILL }},
+        "Time", HFILL }},
     { &hf_dop_rdn,
       { "rdn", "dop.rdn",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x509if.RelativeDistinguishedName", HFILL }},
+        "RelativeDistinguishedName", HFILL }},
     { &hf_dop_immediateSuperior,
       { "immediateSuperior", "dop.immediateSuperior",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x509if.DistinguishedName", HFILL }},
+        "DistinguishedName", HFILL }},
     { &hf_dop_contextPrefixInfo,
       { "contextPrefixInfo", "dop.contextPrefixInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.DITcontext", HFILL }},
+        "DITcontext", HFILL }},
     { &hf_dop_entryInfo,
       { "entryInfo", "dop.entryInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_dop_entryInfo_item,
       { "Attribute", "dop.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_immediateSuperiorInfo,
       { "immediateSuperiorInfo", "dop.immediateSuperiorInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_dop_immediateSuperiorInfo_item,
       { "Attribute", "dop.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DITcontext_item,
       { "Vertex", "dop.Vertex",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.Vertex", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_admPointInfo,
       { "admPointInfo", "dop.admPointInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_dop_admPointInfo_item,
       { "Attribute", "dop.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_subentries,
       { "subentries", "dop.subentries",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_SubentryInfo", HFILL }},
+        "SET_OF_SubentryInfo", HFILL }},
     { &hf_dop_subentries_item,
       { "SubentryInfo", "dop.SubentryInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.SubentryInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_accessPoints,
       { "accessPoints", "dop.accessPoints",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dsp.MasterAndShadowAccessPoints", HFILL }},
+        "MasterAndShadowAccessPoints", HFILL }},
     { &hf_dop_info,
       { "info", "dop.info",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_dop_info_item,
       { "Attribute", "dop.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_alias,
       { "alias", "dop.alias",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "dop.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_dop_identificationTag,
       { "identificationTag", "dop.identificationTag",
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
-        "x509sat.DirectoryString", HFILL }},
+        "DirectoryString", HFILL }},
     { &hf_dop_precedence,
       { "precedence", "dop.precedence",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.Precedence", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_authenticationLevel,
       { "authenticationLevel", "dop.authenticationLevel",
         FT_UINT32, BASE_DEC, VALS(dop_AuthenticationLevel_vals), 0,
-        "dop.AuthenticationLevel", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_itemOrUserFirst,
       { "itemOrUserFirst", "dop.itemOrUserFirst",
         FT_UINT32, BASE_DEC, VALS(dop_T_itemOrUserFirst_vals), 0,
-        "dop.T_itemOrUserFirst", HFILL }},
+        "T_itemOrUserFirst", HFILL }},
     { &hf_dop_itemFirst,
       { "itemFirst", "dop.itemFirst",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_itemFirst", HFILL }},
+        "T_itemFirst", HFILL }},
     { &hf_dop_protectedItems,
       { "protectedItems", "dop.protectedItems",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ProtectedItems", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_itemPermissions,
       { "itemPermissions", "dop.itemPermissions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_ItemPermission", HFILL }},
+        "SET_OF_ItemPermission", HFILL }},
     { &hf_dop_itemPermissions_item,
       { "ItemPermission", "dop.ItemPermission",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.ItemPermission", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_userFirst,
       { "userFirst", "dop.userFirst",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_userFirst", HFILL }},
+        "T_userFirst", HFILL }},
     { &hf_dop_userClasses,
       { "userClasses", "dop.userClasses",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.UserClasses", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_userPermissions,
       { "userPermissions", "dop.userPermissions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_UserPermission", HFILL }},
+        "SET_OF_UserPermission", HFILL }},
     { &hf_dop_userPermissions_item,
       { "UserPermission", "dop.UserPermission",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.UserPermission", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_entry,
       { "entry", "dop.entry",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_allUserAttributeTypes,
       { "allUserAttributeTypes", "dop.allUserAttributeTypes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_attributeType,
       { "attributeType", "dop.attributeType",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_AttributeType", HFILL }},
+        "SET_OF_AttributeType", HFILL }},
     { &hf_dop_attributeType_item,
       { "AttributeType", "dop.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
-        "x509if.AttributeType", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_allAttributeValues,
       { "allAttributeValues", "dop.allAttributeValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_AttributeType", HFILL }},
+        "SET_OF_AttributeType", HFILL }},
     { &hf_dop_allAttributeValues_item,
       { "AttributeType", "dop.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
-        "x509if.AttributeType", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_allUserAttributeTypesAndValues,
       { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_attributeValue,
       { "attributeValue", "dop.attributeValue",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_AttributeTypeAndValue", HFILL }},
+        "SET_OF_AttributeTypeAndValue", HFILL }},
     { &hf_dop_attributeValue_item,
       { "AttributeTypeAndValue", "dop.AttributeTypeAndValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "crmf.AttributeTypeAndValue", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_selfValue,
       { "selfValue", "dop.selfValue",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_AttributeType", HFILL }},
+        "SET_OF_AttributeType", HFILL }},
     { &hf_dop_selfValue_item,
       { "AttributeType", "dop.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
-        "x509if.AttributeType", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_rangeOfValues,
       { "rangeOfValues", "dop.rangeOfValues",
         FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0,
-        "dap.Filter", HFILL }},
+        "Filter", HFILL }},
     { &hf_dop_maxValueCount,
       { "maxValueCount", "dop.maxValueCount",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_MaxValueCount", HFILL }},
+        "SET_OF_MaxValueCount", HFILL }},
     { &hf_dop_maxValueCount_item,
       { "MaxValueCount", "dop.MaxValueCount",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.MaxValueCount", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_maxImmSub,
       { "maxImmSub", "dop.maxImmSub",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_dop_restrictedBy,
       { "restrictedBy", "dop.restrictedBy",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_RestrictedValue", HFILL }},
+        "SET_OF_RestrictedValue", HFILL }},
     { &hf_dop_restrictedBy_item,
       { "RestrictedValue", "dop.RestrictedValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.RestrictedValue", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_contexts,
       { "contexts", "dop.contexts",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_ContextAssertion", HFILL }},
+        "SET_OF_ContextAssertion", HFILL }},
     { &hf_dop_contexts_item,
       { "ContextAssertion", "dop.ContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.ContextAssertion", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_classes,
       { "classes", "dop.classes",
         FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
-        "x509if.Refinement", HFILL }},
+        "Refinement", HFILL }},
     { &hf_dop_type,
       { "type", "dop.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "x509if.AttributeType", HFILL }},
+        "AttributeType", HFILL }},
     { &hf_dop_maxCount,
       { "maxCount", "dop.maxCount",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_dop_valuesIn,
       { "valuesIn", "dop.valuesIn",
         FT_OID, BASE_NONE, NULL, 0,
-        "x509if.AttributeType", HFILL }},
+        "AttributeType", HFILL }},
     { &hf_dop_allUsers,
       { "allUsers", "dop.allUsers",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_thisEntry,
       { "thisEntry", "dop.thisEntry",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_dop_name,
       { "name", "dop.name",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_NameAndOptionalUID", HFILL }},
+        "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_name_item,
       { "NameAndOptionalUID", "dop.NameAndOptionalUID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509sat.NameAndOptionalUID", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_userGroup,
       { "userGroup", "dop.userGroup",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_NameAndOptionalUID", HFILL }},
+        "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_userGroup_item,
       { "NameAndOptionalUID", "dop.NameAndOptionalUID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509sat.NameAndOptionalUID", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_subtree,
       { "subtree", "dop.subtree",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "dop.SET_OF_SubtreeSpecification", HFILL }},
+        "SET_OF_SubtreeSpecification", HFILL }},
     { &hf_dop_subtree_item,
       { "SubtreeSpecification", "dop.SubtreeSpecification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509if.SubtreeSpecification", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_grantsAndDenials,
       { "grantsAndDenials", "dop.grantsAndDenials",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "dop.GrantsAndDenials", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_basicLevels,
       { "basicLevels", "dop.basicLevels",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.T_basicLevels", HFILL }},
+        "T_basicLevels", HFILL }},
     { &hf_dop_level,
       { "level", "dop.level",
         FT_UINT32, BASE_DEC, VALS(dop_T_level_vals), 0,
-        "dop.T_level", HFILL }},
+        "T_level", HFILL }},
     { &hf_dop_localQualifier,
       { "localQualifier", "dop.localQualifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "dop.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_dop_signed,
       { "signed", "dop.signed",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "dop.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_dop_other,
       { "other", "dop.other",
         FT_NONE, BASE_NONE, NULL, 0,
-        "dop.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_dop_DSEType_root,
       { "root", "dop.root",
         FT_BOOLEAN, 8, NULL, 0x80,