diff options
Diffstat (limited to 'epan/dissectors/packet-x509if.c')
| -rw-r--r-- | epan/dissectors/packet-x509if.c | 859 |
1 files changed, 402 insertions, 457 deletions
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 6f57ff6178..b55d489182 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -1,11 +1,8 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509if.c */ -/* asn2wrs.py -b -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . -O ../.. InformationFramework.asn ServiceAdministration.asn */ +/* asn2wrs.py -b -L -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . -O ../.. InformationFramework.asn ServiceAdministration.asn */ -/* Input file: packet-x509if-template.c */ - -#line 1 "./asn1/x509if/packet-x509if-template.c" /* packet-x509if.c * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 @@ -22,6 +19,7 @@ #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> +#include <epan/proto_data.h> #include <epan/strutil.h> #include "packet-ber.h" @@ -38,251 +36,239 @@ void proto_register_x509if(void); void proto_reg_handoff_x509if(void); /* Initialize the protocol and registered fields */ -static int proto_x509if = -1; -static int hf_x509if_object_identifier_id = -1; -static int hf_x509if_any_string = -1; - -/*--- Included file: packet-x509if-hf.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-hf.c" -static int hf_x509if_DistinguishedName_PDU = -1; /* DistinguishedName */ -static int hf_x509if_SubtreeSpecification_PDU = -1; /* SubtreeSpecification */ -static int hf_x509if_HierarchyLevel_PDU = -1; /* HierarchyLevel */ -static int hf_x509if_HierarchyBelow_PDU = -1; /* HierarchyBelow */ -static int hf_x509if_type = -1; /* T_type */ -static int hf_x509if_values = -1; /* T_values */ -static int hf_x509if_values_item = -1; /* T_values_item */ -static int hf_x509if_valuesWithContext = -1; /* T_valuesWithContext */ -static int hf_x509if_valuesWithContext_item = -1; /* T_valuesWithContext_item */ -static int hf_x509if_value = -1; /* T_value */ -static int hf_x509if_contextList = -1; /* SET_SIZE_1_MAX_OF_Context */ -static int hf_x509if_contextList_item = -1; /* Context */ -static int hf_x509if_contextType = -1; /* T_contextType */ -static int hf_x509if_contextValues = -1; /* T_contextValues */ -static int hf_x509if_contextValues_item = -1; /* T_contextValues_item */ -static int hf_x509if_fallback = -1; /* BOOLEAN */ -static int hf_x509if_type_01 = -1; /* T_type_01 */ -static int hf_x509if_assertion = -1; /* T_assertion */ -static int hf_x509if_assertedContexts = -1; /* T_assertedContexts */ -static int hf_x509if_allContexts = -1; /* NULL */ -static int hf_x509if_selectedContexts = -1; /* SET_SIZE_1_MAX_OF_ContextAssertion */ -static int hf_x509if_selectedContexts_item = -1; /* ContextAssertion */ -static int hf_x509if_ca_contextType = -1; /* T_ca_contextType */ -static int hf_x509if_ca_contextValues = -1; /* T_ca_contextValues */ -static int hf_x509if_ca_contextValues_item = -1; /* T_ca_contextValues_item */ -static int hf_x509if_type_02 = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_ata_assertedContexts = -1; /* SEQUENCE_SIZE_1_MAX_OF_ContextAssertion */ -static int hf_x509if_ata_assertedContexts_item = -1; /* ContextAssertion */ -static int hf_x509if_rdnSequence = -1; /* RDNSequence */ -static int hf_x509if_RDNSequence_item = -1; /* RDNSequence_item */ -static int hf_x509if_RelativeDistinguishedName_item = -1; /* RelativeDistinguishedName_item */ -static int hf_x509if_type_03 = -1; /* T_type_02 */ -static int hf_x509if_atadv_value = -1; /* T_atadv_value */ -static int hf_x509if_primaryDistinguished = -1; /* BOOLEAN */ -static int hf_x509if_valueswithContext = -1; /* T_valWithContext */ -static int hf_x509if_valueswithContext_item = -1; /* T_valWithContext_item */ -static int hf_x509if_distingAttrValue = -1; /* T_distingAttrValue */ -static int hf_x509if_chopSpecificExclusions = -1; /* T_chopSpecificExclusions */ -static int hf_x509if_chopSpecificExclusions_item = -1; /* T_chopSpecificExclusions_item */ -static int hf_x509if_chopBefore = -1; /* LocalName */ -static int hf_x509if_chopAfter = -1; /* LocalName */ -static int hf_x509if_minimum = -1; /* BaseDistance */ -static int hf_x509if_maximum = -1; /* BaseDistance */ -static int hf_x509if_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_refinement_and = -1; /* SET_OF_Refinement */ -static int hf_x509if_refinement_and_item = -1; /* Refinement */ -static int hf_x509if_refinement_or = -1; /* SET_OF_Refinement */ -static int hf_x509if_refinement_or_item = -1; /* Refinement */ -static int hf_x509if_refinement_not = -1; /* Refinement */ -static int hf_x509if_ruleIdentifier = -1; /* RuleIdentifier */ -static int hf_x509if_nameForm = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_superiorStructureRules = -1; /* SET_SIZE_1_MAX_OF_RuleIdentifier */ -static int hf_x509if_superiorStructureRules_item = -1; /* RuleIdentifier */ -static int hf_x509if_structuralObjectClass = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_auxiliaries = -1; /* T_auxiliaries */ -static int hf_x509if_auxiliaries_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_mandatory = -1; /* T_mandatory */ -static int hf_x509if_mandatory_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_optional = -1; /* T_optional */ -static int hf_x509if_optional_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_precluded = -1; /* T_precluded */ -static int hf_x509if_precluded_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_attributeType = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_mandatoryContexts = -1; /* T_mandatoryContexts */ -static int hf_x509if_mandatoryContexts_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_optionalContexts = -1; /* T_optionalContexts */ -static int hf_x509if_optionalContexts_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_id = -1; /* INTEGER */ -static int hf_x509if_dmdId = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_attributeType_01 = -1; /* T_attributeType */ -static int hf_x509if_includeSubtypes = -1; /* BOOLEAN */ -static int hf_x509if_ra_selectedValues = -1; /* T_ra_selectedValues */ -static int hf_x509if_ra_selectedValues_item = -1; /* T_ra_selectedValues_item */ -static int hf_x509if_defaultValues = -1; /* T_defaultValues */ -static int hf_x509if_defaultValues_item = -1; /* T_defaultValues_item */ -static int hf_x509if_entryType = -1; /* T_entryType */ -static int hf_x509if_ra_values = -1; /* T_ra_values */ -static int hf_x509if_ra_values_item = -1; /* T_ra_values_item */ -static int hf_x509if_contexts = -1; /* SEQUENCE_SIZE_0_MAX_OF_ContextProfile */ -static int hf_x509if_contexts_item = -1; /* ContextProfile */ -static int hf_x509if_contextCombination = -1; /* ContextCombination */ -static int hf_x509if_matchingUse = -1; /* SEQUENCE_SIZE_1_MAX_OF_MatchingUse */ -static int hf_x509if_matchingUse_item = -1; /* MatchingUse */ -static int hf_x509if_contextType_01 = -1; /* T_contextType_01 */ -static int hf_x509if_contextValue = -1; /* T_contextValue */ -static int hf_x509if_contextValue_item = -1; /* T_contextValue_item */ -static int hf_x509if_context = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_contextcombination_and = -1; /* SEQUENCE_OF_ContextCombination */ -static int hf_x509if_contextcombination_and_item = -1; /* ContextCombination */ -static int hf_x509if_contextcombination_or = -1; /* SEQUENCE_OF_ContextCombination */ -static int hf_x509if_contextcombination_or_item = -1; /* ContextCombination */ -static int hf_x509if_contextcombination_not = -1; /* ContextCombination */ -static int hf_x509if_restrictionType = -1; /* T_restrictionType */ -static int hf_x509if_restrictionValue = -1; /* T_restrictionValue */ -static int hf_x509if_attribute = -1; /* AttributeType */ -static int hf_x509if_and = -1; /* SEQUENCE_OF_AttributeCombination */ -static int hf_x509if_and_item = -1; /* AttributeCombination */ -static int hf_x509if_or = -1; /* SEQUENCE_OF_AttributeCombination */ -static int hf_x509if_or_item = -1; /* AttributeCombination */ -static int hf_x509if_not = -1; /* AttributeCombination */ -static int hf_x509if_attributeType_02 = -1; /* T_attributeType_01 */ -static int hf_x509if_outputValues = -1; /* T_outputValues */ -static int hf_x509if_selectedValues = -1; /* T_selectedValues */ -static int hf_x509if_selectedValues_item = -1; /* T_selectedValues_item */ -static int hf_x509if_matchedValuesOnly = -1; /* NULL */ -static int hf_x509if_contexts_01 = -1; /* SEQUENCE_SIZE_1_MAX_OF_ContextProfile */ -static int hf_x509if_serviceControls = -1; /* ServiceControlOptions */ -static int hf_x509if_searchOptions = -1; /* SearchControlOptions */ -static int hf_x509if_hierarchyOptions = -1; /* HierarchySelections */ -static int hf_x509if_default = -1; /* INTEGER */ -static int hf_x509if_max = -1; /* INTEGER */ -static int hf_x509if_basic = -1; /* MRMapping */ -static int hf_x509if_tightenings = -1; /* SEQUENCE_SIZE_1_MAX_OF_MRMapping */ -static int hf_x509if_tightenings_item = -1; /* MRMapping */ -static int hf_x509if_relaxations = -1; /* SEQUENCE_SIZE_1_MAX_OF_MRMapping */ -static int hf_x509if_relaxations_item = -1; /* MRMapping */ -static int hf_x509if_maximum_relaxation = -1; /* INTEGER */ -static int hf_x509if_minimum_relaxation = -1; /* INTEGER */ -static int hf_x509if_mapping = -1; /* SEQUENCE_SIZE_1_MAX_OF_Mapping */ -static int hf_x509if_mapping_item = -1; /* Mapping */ -static int hf_x509if_substitution = -1; /* SEQUENCE_SIZE_1_MAX_OF_MRSubstitution */ -static int hf_x509if_substitution_item = -1; /* MRSubstitution */ -static int hf_x509if_mappingFunction = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_level = -1; /* INTEGER */ -static int hf_x509if_oldMatchingRule = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_newMatchingRule = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_base = -1; /* LocalName */ -static int hf_x509if_specificExclusions = -1; /* T_specificExclusions */ -static int hf_x509if_specificExclusions_item = -1; /* T_specificExclusions_item */ -static int hf_x509if_specificationFilter = -1; /* Refinement */ -static int hf_x509if_serviceType = -1; /* OBJECT_IDENTIFIER */ -static int hf_x509if_userClass = -1; /* INTEGER */ -static int hf_x509if_inputAttributeTypes = -1; /* SEQUENCE_SIZE_0_MAX_OF_RequestAttribute */ -static int hf_x509if_inputAttributeTypes_item = -1; /* RequestAttribute */ -static int hf_x509if_attributeCombination = -1; /* AttributeCombination */ -static int hf_x509if_outputAttributeTypes = -1; /* SEQUENCE_SIZE_1_MAX_OF_ResultAttribute */ -static int hf_x509if_outputAttributeTypes_item = -1; /* ResultAttribute */ -static int hf_x509if_defaultControls = -1; /* ControlOptions */ -static int hf_x509if_mandatoryControls = -1; /* ControlOptions */ -static int hf_x509if_searchRuleControls = -1; /* ControlOptions */ -static int hf_x509if_familyGrouping = -1; /* FamilyGrouping */ -static int hf_x509if_familyReturn = -1; /* FamilyReturn */ -static int hf_x509if_relaxation = -1; /* RelaxationPolicy */ -static int hf_x509if_additionalControl = -1; /* SEQUENCE_SIZE_1_MAX_OF_AttributeType */ -static int hf_x509if_additionalControl_item = -1; /* AttributeType */ -static int hf_x509if_allowedSubset = -1; /* AllowedSubset */ -static int hf_x509if_imposedSubset = -1; /* ImposedSubset */ -static int hf_x509if_entryLimit = -1; /* EntryLimit */ -static int hf_x509if_name = -1; /* SET_SIZE_1_MAX_OF_DirectoryString */ -static int hf_x509if_name_item = -1; /* DirectoryString */ -static int hf_x509if_description = -1; /* DirectoryString */ +static int proto_x509if; +static int hf_x509if_object_identifier_id; +static int hf_x509if_any_string; +static int hf_x509if_DistinguishedName_PDU; /* DistinguishedName */ +static int hf_x509if_SubtreeSpecification_PDU; /* SubtreeSpecification */ +static int hf_x509if_HierarchyLevel_PDU; /* HierarchyLevel */ +static int hf_x509if_HierarchyBelow_PDU; /* HierarchyBelow */ +static int hf_x509if_type; /* T_type */ +static int hf_x509if_values; /* T_values */ +static int hf_x509if_values_item; /* T_values_item */ +static int hf_x509if_valuesWithContext; /* T_valuesWithContext */ +static int hf_x509if_valuesWithContext_item; /* T_valuesWithContext_item */ +static int hf_x509if_value; /* T_value */ +static int hf_x509if_contextList; /* SET_SIZE_1_MAX_OF_Context */ +static int hf_x509if_contextList_item; /* Context */ +static int hf_x509if_contextType; /* T_contextType */ +static int hf_x509if_contextValues; /* T_contextValues */ +static int hf_x509if_contextValues_item; /* T_contextValues_item */ +static int hf_x509if_fallback; /* BOOLEAN */ +static int hf_x509if_type_01; /* T_type_01 */ +static int hf_x509if_assertion; /* T_assertion */ +static int hf_x509if_assertedContexts; /* T_assertedContexts */ +static int hf_x509if_allContexts; /* NULL */ +static int hf_x509if_selectedContexts; /* SET_SIZE_1_MAX_OF_ContextAssertion */ +static int hf_x509if_selectedContexts_item; /* ContextAssertion */ +static int hf_x509if_ca_contextType; /* T_ca_contextType */ +static int hf_x509if_ca_contextValues; /* T_ca_contextValues */ +static int hf_x509if_ca_contextValues_item; /* T_ca_contextValues_item */ +static int hf_x509if_type_02; /* OBJECT_IDENTIFIER */ +static int hf_x509if_ata_assertedContexts; /* SEQUENCE_SIZE_1_MAX_OF_ContextAssertion */ +static int hf_x509if_ata_assertedContexts_item; /* ContextAssertion */ +static int hf_x509if_rdnSequence; /* RDNSequence */ +static int hf_x509if_RDNSequence_item; /* RDNSequence_item */ +static int hf_x509if_RelativeDistinguishedName_item; /* RelativeDistinguishedName_item */ +static int hf_x509if_type_03; /* T_type_02 */ +static int hf_x509if_atadv_value; /* T_atadv_value */ +static int hf_x509if_primaryDistinguished; /* BOOLEAN */ +static int hf_x509if_valueswithContext; /* T_valWithContext */ +static int hf_x509if_valueswithContext_item; /* T_valWithContext_item */ +static int hf_x509if_distingAttrValue; /* T_distingAttrValue */ +static int hf_x509if_chopSpecificExclusions; /* T_chopSpecificExclusions */ +static int hf_x509if_chopSpecificExclusions_item; /* T_chopSpecificExclusions_item */ +static int hf_x509if_chopBefore; /* LocalName */ +static int hf_x509if_chopAfter; /* LocalName */ +static int hf_x509if_minimum; /* BaseDistance */ +static int hf_x509if_maximum; /* BaseDistance */ +static int hf_x509if_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_refinement_and; /* SET_OF_Refinement */ +static int hf_x509if_refinement_and_item; /* Refinement */ +static int hf_x509if_refinement_or; /* SET_OF_Refinement */ +static int hf_x509if_refinement_or_item; /* Refinement */ +static int hf_x509if_refinement_not; /* Refinement */ +static int hf_x509if_ruleIdentifier; /* RuleIdentifier */ +static int hf_x509if_nameForm; /* OBJECT_IDENTIFIER */ +static int hf_x509if_superiorStructureRules; /* SET_SIZE_1_MAX_OF_RuleIdentifier */ +static int hf_x509if_superiorStructureRules_item; /* RuleIdentifier */ +static int hf_x509if_structuralObjectClass; /* OBJECT_IDENTIFIER */ +static int hf_x509if_auxiliaries; /* T_auxiliaries */ +static int hf_x509if_auxiliaries_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_mandatory; /* T_mandatory */ +static int hf_x509if_mandatory_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_optional; /* T_optional */ +static int hf_x509if_optional_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_precluded; /* T_precluded */ +static int hf_x509if_precluded_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_attributeType; /* OBJECT_IDENTIFIER */ +static int hf_x509if_mandatoryContexts; /* T_mandatoryContexts */ +static int hf_x509if_mandatoryContexts_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_optionalContexts; /* T_optionalContexts */ +static int hf_x509if_optionalContexts_item; /* OBJECT_IDENTIFIER */ +static int hf_x509if_id; /* INTEGER */ +static int hf_x509if_dmdId; /* OBJECT_IDENTIFIER */ +static int hf_x509if_attributeType_01; /* T_attributeType */ +static int hf_x509if_includeSubtypes; /* BOOLEAN */ +static int hf_x509if_ra_selectedValues; /* T_ra_selectedValues */ +static int hf_x509if_ra_selectedValues_item; /* T_ra_selectedValues_item */ +static int hf_x509if_defaultValues; /* T_defaultValues */ +static int hf_x509if_defaultValues_item; /* T_defaultValues_item */ +static int hf_x509if_entryType; /* T_entryType */ +static int hf_x509if_ra_values; /* T_ra_values */ +static int hf_x509if_ra_values_item; /* T_ra_values_item */ +static int hf_x509if_contexts; /* SEQUENCE_SIZE_0_MAX_OF_ContextProfile */ +static int hf_x509if_contexts_item; /* ContextProfile */ +static int hf_x509if_contextCombination; /* ContextCombination */ +static int hf_x509if_matchingUse; /* SEQUENCE_SIZE_1_MAX_OF_MatchingUse */ +static int hf_x509if_matchingUse_item; /* MatchingUse */ +static int hf_x509if_contextType_01; /* T_contextType_01 */ +static int hf_x509if_contextValue; /* T_contextValue */ +static int hf_x509if_contextValue_item; /* T_contextValue_item */ +static int hf_x509if_context; /* OBJECT_IDENTIFIER */ +static int hf_x509if_contextcombination_and; /* SEQUENCE_OF_ContextCombination */ +static int hf_x509if_contextcombination_and_item; /* ContextCombination */ +static int hf_x509if_contextcombination_or; /* SEQUENCE_OF_ContextCombination */ +static int hf_x509if_contextcombination_or_item; /* ContextCombination */ +static int hf_x509if_contextcombination_not; /* ContextCombination */ +static int hf_x509if_restrictionType; /* T_restrictionType */ +static int hf_x509if_restrictionValue; /* T_restrictionValue */ +static int hf_x509if_attribute; /* AttributeType */ +static int hf_x509if_and; /* SEQUENCE_OF_AttributeCombination */ +static int hf_x509if_and_item; /* AttributeCombination */ +static int hf_x509if_or; /* SEQUENCE_OF_AttributeCombination */ +static int hf_x509if_or_item; /* AttributeCombination */ +static int hf_x509if_not; /* AttributeCombination */ +static int hf_x509if_attributeType_02; /* T_attributeType_01 */ +static int hf_x509if_outputValues; /* T_outputValues */ +static int hf_x509if_selectedValues; /* T_selectedValues */ +static int hf_x509if_selectedValues_item; /* T_selectedValues_item */ +static int hf_x509if_matchedValuesOnly; /* NULL */ +static int hf_x509if_contexts_01; /* SEQUENCE_SIZE_1_MAX_OF_ContextProfile */ +static int hf_x509if_serviceControls; /* ServiceControlOptions */ +static int hf_x509if_searchOptions; /* SearchControlOptions */ +static int hf_x509if_hierarchyOptions; /* HierarchySelections */ +static int hf_x509if_default; /* INTEGER */ +static int hf_x509if_max; /* INTEGER */ +static int hf_x509if_basic; /* MRMapping */ +static int hf_x509if_tightenings; /* SEQUENCE_SIZE_1_MAX_OF_MRMapping */ +static int hf_x509if_tightenings_item; /* MRMapping */ +static int hf_x509if_relaxations; /* SEQUENCE_SIZE_1_MAX_OF_MRMapping */ +static int hf_x509if_relaxations_item; /* MRMapping */ +static int hf_x509if_maximum_relaxation; /* INTEGER */ +static int hf_x509if_minimum_relaxation; /* INTEGER */ +static int hf_x509if_mapping; /* SEQUENCE_SIZE_1_MAX_OF_Mapping */ +static int hf_x509if_mapping_item; /* Mapping */ +static int hf_x509if_substitution; /* SEQUENCE_SIZE_1_MAX_OF_MRSubstitution */ +static int hf_x509if_substitution_item; /* MRSubstitution */ +static int hf_x509if_mappingFunction; /* OBJECT_IDENTIFIER */ +static int hf_x509if_level; /* INTEGER */ +static int hf_x509if_oldMatchingRule; /* OBJECT_IDENTIFIER */ +static int hf_x509if_newMatchingRule; /* OBJECT_IDENTIFIER */ +static int hf_x509if_base; /* LocalName */ +static int hf_x509if_specificExclusions; /* T_specificExclusions */ +static int hf_x509if_specificExclusions_item; /* T_specificExclusions_item */ +static int hf_x509if_specificationFilter; /* Refinement */ +static int hf_x509if_serviceType; /* OBJECT_IDENTIFIER */ +static int hf_x509if_userClass; /* INTEGER */ +static int hf_x509if_inputAttributeTypes; /* SEQUENCE_SIZE_0_MAX_OF_RequestAttribute */ +static int hf_x509if_inputAttributeTypes_item; /* RequestAttribute */ +static int hf_x509if_attributeCombination; /* AttributeCombination */ +static int hf_x509if_outputAttributeTypes; /* SEQUENCE_SIZE_1_MAX_OF_ResultAttribute */ +static int hf_x509if_outputAttributeTypes_item; /* ResultAttribute */ +static int hf_x509if_defaultControls; /* ControlOptions */ +static int hf_x509if_mandatoryControls; /* ControlOptions */ +static int hf_x509if_searchRuleControls; /* ControlOptions */ +static int hf_x509if_familyGrouping; /* FamilyGrouping */ +static int hf_x509if_familyReturn; /* FamilyReturn */ +static int hf_x509if_relaxation; /* RelaxationPolicy */ +static int hf_x509if_additionalControl; /* SEQUENCE_SIZE_1_MAX_OF_AttributeType */ +static int hf_x509if_additionalControl_item; /* AttributeType */ +static int hf_x509if_allowedSubset; /* AllowedSubset */ +static int hf_x509if_imposedSubset; /* ImposedSubset */ +static int hf_x509if_entryLimit; /* EntryLimit */ +static int hf_x509if_name; /* SET_SIZE_1_MAX_OF_DirectoryString */ +static int hf_x509if_name_item; /* DirectoryString */ +static int hf_x509if_description; /* DirectoryString */ /* named bits */ -static int hf_x509if_AllowedSubset_baseObject = -1; -static int hf_x509if_AllowedSubset_oneLevel = -1; -static int hf_x509if_AllowedSubset_wholeSubtree = -1; - -/*--- End of included file: packet-x509if-hf.c ---*/ -#line 37 "./asn1/x509if/packet-x509if-template.c" +static int hf_x509if_AllowedSubset_baseObject; +static int hf_x509if_AllowedSubset_oneLevel; +static int hf_x509if_AllowedSubset_wholeSubtree; /* Initialize the subtree pointers */ - -/*--- Included file: packet-x509if-ett.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-ett.c" -static gint ett_x509if_Attribute = -1; -static gint ett_x509if_T_values = -1; -static gint ett_x509if_T_valuesWithContext = -1; -static gint ett_x509if_T_valuesWithContext_item = -1; -static gint ett_x509if_SET_SIZE_1_MAX_OF_Context = -1; -static gint ett_x509if_Context = -1; -static gint ett_x509if_T_contextValues = -1; -static gint ett_x509if_AttributeValueAssertion = -1; -static gint ett_x509if_T_assertedContexts = -1; -static gint ett_x509if_SET_SIZE_1_MAX_OF_ContextAssertion = -1; -static gint ett_x509if_ContextAssertion = -1; -static gint ett_x509if_T_ca_contextValues = -1; -static gint ett_x509if_AttributeTypeAssertion = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextAssertion = -1; -static gint ett_x509if_Name = -1; -static gint ett_x509if_RDNSequence = -1; -static gint ett_x509if_RelativeDistinguishedName = -1; -static gint ett_x509if_AttributeTypeAndDistinguishedValue = -1; -static gint ett_x509if_T_valWithContext = -1; -static gint ett_x509if_T_valWithContext_item = -1; -static gint ett_x509if_SubtreeSpecification = -1; -static gint ett_x509if_ChopSpecification = -1; -static gint ett_x509if_T_chopSpecificExclusions = -1; -static gint ett_x509if_T_chopSpecificExclusions_item = -1; -static gint ett_x509if_Refinement = -1; -static gint ett_x509if_SET_OF_Refinement = -1; -static gint ett_x509if_DITStructureRule = -1; -static gint ett_x509if_SET_SIZE_1_MAX_OF_RuleIdentifier = -1; -static gint ett_x509if_DITContentRule = -1; -static gint ett_x509if_T_auxiliaries = -1; -static gint ett_x509if_T_mandatory = -1; -static gint ett_x509if_T_optional = -1; -static gint ett_x509if_T_precluded = -1; -static gint ett_x509if_DITContextUse = -1; -static gint ett_x509if_T_mandatoryContexts = -1; -static gint ett_x509if_T_optionalContexts = -1; -static gint ett_x509if_SearchRuleDescription = -1; -static gint ett_x509if_SearchRule = -1; -static gint ett_x509if_SearchRuleId = -1; -static gint ett_x509if_AllowedSubset = -1; -static gint ett_x509if_RequestAttribute = -1; -static gint ett_x509if_T_ra_selectedValues = -1; -static gint ett_x509if_T_defaultValues = -1; -static gint ett_x509if_T_defaultValues_item = -1; -static gint ett_x509if_T_ra_values = -1; -static gint ett_x509if_SEQUENCE_SIZE_0_MAX_OF_ContextProfile = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MatchingUse = -1; -static gint ett_x509if_ContextProfile = -1; -static gint ett_x509if_T_contextValue = -1; -static gint ett_x509if_ContextCombination = -1; -static gint ett_x509if_SEQUENCE_OF_ContextCombination = -1; -static gint ett_x509if_MatchingUse = -1; -static gint ett_x509if_AttributeCombination = -1; -static gint ett_x509if_SEQUENCE_OF_AttributeCombination = -1; -static gint ett_x509if_ResultAttribute = -1; -static gint ett_x509if_T_outputValues = -1; -static gint ett_x509if_T_selectedValues = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextProfile = -1; -static gint ett_x509if_ControlOptions = -1; -static gint ett_x509if_EntryLimit = -1; -static gint ett_x509if_RelaxationPolicy = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRMapping = -1; -static gint ett_x509if_MRMapping = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_Mapping = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRSubstitution = -1; -static gint ett_x509if_Mapping = -1; -static gint ett_x509if_MRSubstitution = -1; -static gint ett_x509if_T_specificExclusions = -1; -static gint ett_x509if_T_specificExclusions_item = -1; -static gint ett_x509if_SEQUENCE_SIZE_0_MAX_OF_RequestAttribute = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute = -1; -static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; -static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; - -/*--- End of included file: packet-x509if-ett.c ---*/ -#line 40 "./asn1/x509if/packet-x509if-template.c" +static gint ett_x509if_Attribute; +static gint ett_x509if_T_values; +static gint ett_x509if_T_valuesWithContext; +static gint ett_x509if_T_valuesWithContext_item; +static gint ett_x509if_SET_SIZE_1_MAX_OF_Context; +static gint ett_x509if_Context; +static gint ett_x509if_T_contextValues; +static gint ett_x509if_AttributeValueAssertion; +static gint ett_x509if_T_assertedContexts; +static gint ett_x509if_SET_SIZE_1_MAX_OF_ContextAssertion; +static gint ett_x509if_ContextAssertion; +static gint ett_x509if_T_ca_contextValues; +static gint ett_x509if_AttributeTypeAssertion; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextAssertion; +static gint ett_x509if_Name; +static gint ett_x509if_RDNSequence; +static gint ett_x509if_RelativeDistinguishedName; +static gint ett_x509if_AttributeTypeAndDistinguishedValue; +static gint ett_x509if_T_valWithContext; +static gint ett_x509if_T_valWithContext_item; +static gint ett_x509if_SubtreeSpecification; +static gint ett_x509if_ChopSpecification; +static gint ett_x509if_T_chopSpecificExclusions; +static gint ett_x509if_T_chopSpecificExclusions_item; +static gint ett_x509if_Refinement; +static gint ett_x509if_SET_OF_Refinement; +static gint ett_x509if_DITStructureRule; +static gint ett_x509if_SET_SIZE_1_MAX_OF_RuleIdentifier; +static gint ett_x509if_DITContentRule; +static gint ett_x509if_T_auxiliaries; +static gint ett_x509if_T_mandatory; +static gint ett_x509if_T_optional; +static gint ett_x509if_T_precluded; +static gint ett_x509if_DITContextUse; +static gint ett_x509if_T_mandatoryContexts; +static gint ett_x509if_T_optionalContexts; +static gint ett_x509if_SearchRuleDescription; +static gint ett_x509if_SearchRule; +static gint ett_x509if_SearchRuleId; +static gint ett_x509if_AllowedSubset; +static gint ett_x509if_RequestAttribute; +static gint ett_x509if_T_ra_selectedValues; +static gint ett_x509if_T_defaultValues; +static gint ett_x509if_T_defaultValues_item; +static gint ett_x509if_T_ra_values; +static gint ett_x509if_SEQUENCE_SIZE_0_MAX_OF_ContextProfile; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MatchingUse; +static gint ett_x509if_ContextProfile; +static gint ett_x509if_T_contextValue; +static gint ett_x509if_ContextCombination; +static gint ett_x509if_SEQUENCE_OF_ContextCombination; +static gint ett_x509if_MatchingUse; +static gint ett_x509if_AttributeCombination; +static gint ett_x509if_SEQUENCE_OF_AttributeCombination; +static gint ett_x509if_ResultAttribute; +static gint ett_x509if_T_outputValues; +static gint ett_x509if_T_selectedValues; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextProfile; +static gint ett_x509if_ControlOptions; +static gint ett_x509if_EntryLimit; +static gint ett_x509if_RelaxationPolicy; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRMapping; +static gint ett_x509if_MRMapping; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_Mapping; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRSubstitution; +static gint ett_x509if_Mapping; +static gint ett_x509if_MRSubstitution; +static gint ett_x509if_T_specificExclusions; +static gint ett_x509if_T_specificExclusions_item; +static gint ett_x509if_SEQUENCE_SIZE_0_MAX_OF_RequestAttribute; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute; +static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType; +static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString; static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; @@ -291,11 +277,8 @@ static gboolean rdn_one_value = FALSE; /* have we seen one value in an RDN yet * static gboolean dn_one_rdn = FALSE; /* have we seen one RDN in a DN yet */ static gboolean doing_attr = FALSE; -#define MAX_RDN_STR_LEN 64 -#define MAX_DN_STR_LEN (20 * MAX_RDN_STR_LEN) - -static char *last_dn = NULL; -static char *last_rdn = NULL; +static wmem_strbuf_t *last_dn_buf = NULL; +static wmem_strbuf_t *last_rdn_buf = NULL; static int ava_hf_index; #define MAX_FMT_VALS 32 @@ -313,33 +296,31 @@ x509if_frame_end(void) dn_one_rdn = FALSE; doing_attr = FALSE; - last_dn = NULL; - last_rdn = NULL; + last_dn_buf = NULL; + last_rdn_buf = NULL; last_ava = NULL; } - -/*--- Included file: packet-x509if-fn.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-fn.c" /*--- Cyclic dependencies ---*/ /* Refinement -> Refinement/and -> Refinement */ /* Refinement -> Refinement */ -/*int dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ +/*int dissect_x509if_Refinement(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ /* ContextCombination -> ContextCombination/and -> ContextCombination */ /* ContextCombination -> ContextCombination */ -/*int dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ +/*int dissect_x509if_ContextCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ /* AttributeCombination -> AttributeCombination/and -> AttributeCombination */ /* AttributeCombination -> AttributeCombination */ -/*int dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ +/*int dissect_x509if_AttributeCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);*/ +#define MAX_RECURSION_DEPTH 100 // Arbitrarily chosen. static int -dissect_x509if_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_type(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -348,12 +329,10 @@ dissect_x509if_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int -dissect_x509if_T_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 313 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_values_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -363,7 +342,7 @@ static const ber_sequence_t T_values_set_of[1] = { }; static int -dissect_x509if_T_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_values(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_values_set_of, hf_index, ett_x509if_T_values); @@ -373,19 +352,17 @@ dissect_x509if_T_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int -dissect_x509if_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 283 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_value(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback("unknown", tvb, offset, actx->pinfo, tree, NULL); - return offset; } static int -dissect_x509if_T_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_contextType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -394,12 +371,10 @@ dissect_x509if_T_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int -dissect_x509if_T_contextValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_contextValues_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -409,7 +384,7 @@ static const ber_sequence_t T_contextValues_set_of[1] = { }; static int -dissect_x509if_T_contextValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_contextValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_contextValues_set_of, hf_index, ett_x509if_T_contextValues); @@ -419,7 +394,7 @@ dissect_x509if_T_contextValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int -dissect_x509if_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_BOOLEAN(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; @@ -434,7 +409,7 @@ static const ber_sequence_t Context_sequence[] = { }; int -dissect_x509if_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_Context(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Context_sequence, hf_index, ett_x509if_Context); @@ -447,7 +422,7 @@ static const ber_sequence_t SET_SIZE_1_MAX_OF_Context_set_of[1] = { }; static int -dissect_x509if_SET_SIZE_1_MAX_OF_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SET_SIZE_1_MAX_OF_Context(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, SET_SIZE_1_MAX_OF_Context_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_Context); @@ -462,7 +437,7 @@ static const ber_sequence_t T_valuesWithContext_item_sequence[] = { }; static int -dissect_x509if_T_valuesWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_valuesWithContext_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item); @@ -475,7 +450,7 @@ static const ber_sequence_t T_valuesWithContext_set_of[1] = { }; static int -dissect_x509if_T_valuesWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_valuesWithContext(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext); @@ -491,8 +466,7 @@ static const ber_sequence_t Attribute_sequence[] = { }; int -dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 414 "./asn1/x509if/x509if.cnf" +dissect_x509if_Attribute(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { doing_attr = TRUE; register_frame_end_routine (actx->pinfo, x509if_frame_end); @@ -500,14 +474,13 @@ dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse Attribute_sequence, hf_index, ett_x509if_Attribute); - return offset; } int -dissect_x509if_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AttributeType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -516,19 +489,17 @@ dissect_x509if_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int -dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 301 "./asn1/x509if/x509if.cnf" +dissect_x509if_AttributeValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } static int -dissect_x509if_T_type_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_type_01(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -537,19 +508,17 @@ dissect_x509if_T_type_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int -dissect_x509if_T_assertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 307 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_assertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } static int -dissect_x509if_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_NULL(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index); return offset; @@ -558,7 +527,7 @@ dissect_x509if_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int -dissect_x509if_T_ca_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_ca_contextType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -567,12 +536,10 @@ dissect_x509if_T_ca_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int -dissect_x509if_T_ca_contextValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 184 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_ca_contextValues_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -582,7 +549,7 @@ static const ber_sequence_t T_ca_contextValues_set_of[1] = { }; static int -dissect_x509if_T_ca_contextValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_ca_contextValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_ca_contextValues_set_of, hf_index, ett_x509if_T_ca_contextValues); @@ -597,7 +564,7 @@ static const ber_sequence_t ContextAssertion_sequence[] = { }; int -dissect_x509if_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ContextAssertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion); @@ -610,7 +577,7 @@ static const ber_sequence_t SET_SIZE_1_MAX_OF_ContextAssertion_set_of[1] = { }; static int -dissect_x509if_SET_SIZE_1_MAX_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SET_SIZE_1_MAX_OF_ContextAssertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, SET_SIZE_1_MAX_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_ContextAssertion); @@ -631,7 +598,7 @@ static const ber_choice_t T_assertedContexts_choice[] = { }; static int -dissect_x509if_T_assertedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_assertedContexts(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_choice(actx, tree, tvb, offset, T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, NULL); @@ -648,8 +615,7 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = { }; int -dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 404 "./asn1/x509if/x509if.cnf" +dissect_x509if_AttributeValueAssertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { ava_hf_index = hf_index; last_ava = (char *)wmem_alloc(actx->pinfo->pool, MAX_AVA_STR_LEN); *last_ava = '\0'; @@ -662,14 +628,13 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb ava_hf_index=-1; - return offset; } static int -dissect_x509if_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_OBJECT_IDENTIFIER(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; @@ -681,7 +646,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_ContextAssertion_sequence_of[ }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextAssertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextAssertion); @@ -696,7 +661,7 @@ static const ber_sequence_t AttributeTypeAssertion_sequence[] = { }; int -dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AttributeTypeAssertion(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion); @@ -706,8 +671,7 @@ dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int -dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 190 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_type_02(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { const char *fmt; const char *name; @@ -719,9 +683,9 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse name = oid_resolved_from_string(actx->pinfo->pool, actx->external.direct_reference); if(!name) name = actx->external.direct_reference; - if(last_rdn) { /* append it to the RDN */ - (void) g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); - (void) g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); + if(last_rdn_buf) { /* append it to the RDN */ + wmem_strbuf_append(last_rdn_buf, name); + wmem_strbuf_append_c(last_rdn_buf, '='); /* append it to the tree */ proto_item_append_text(tree, " (%s=", name); @@ -735,7 +699,7 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse last_ava = (char *)wmem_alloc(actx->pinfo->pool, MAX_AVA_STR_LEN); *last_ava = '\0'; register_frame_end_routine (actx->pinfo, x509if_frame_end); - g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s", name, fmt); + snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s", name, fmt); proto_item_append_text(tree, " %s", last_ava); @@ -743,15 +707,13 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } - return offset; } static int -dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 224 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_atadv_value(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; @@ -775,8 +737,8 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o /* it was a string - format it */ value = tvb_format_text(actx->pinfo->pool, out_tvb, 0, tvb_reported_length(out_tvb)); - if(last_rdn) { - (void) g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); + if(last_rdn_buf) { + wmem_strbuf_append(last_rdn_buf, value); /* append it to the tree*/ proto_item_append_text(tree, "%s)", value); @@ -791,7 +753,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if(!(name = oid_resolved_from_string(actx->pinfo->pool, actx->external.direct_reference))) name = actx->external.direct_reference; - g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); + snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); proto_item_append_text(tree, " %s", last_ava); @@ -799,19 +761,16 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } - return offset; } static int -dissect_x509if_T_distingAttrValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 328 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_distingAttrValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -823,7 +782,7 @@ static const ber_sequence_t T_valWithContext_item_sequence[] = { }; static int -dissect_x509if_T_valWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_valWithContext_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item); @@ -836,7 +795,7 @@ static const ber_sequence_t T_valWithContext_set_of[1] = { }; static int -dissect_x509if_T_valWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_valWithContext(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext); @@ -853,7 +812,7 @@ static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { }; int -dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AttributeTypeAndDistinguishedValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue); @@ -863,16 +822,15 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvb static int -dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 357 "./asn1/x509if/x509if.cnf" +dissect_x509if_RelativeDistinguishedName_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { if(!rdn_one_value) { top_of_rdn = tree; } else { - if(last_rdn) + if(last_rdn_buf) /* this is an additional value - delimit */ - (void) g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); + wmem_strbuf_append_c(last_rdn_buf, '+'); } offset = dissect_x509if_AttributeTypeAndDistinguishedValue(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -881,7 +839,6 @@ dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_ rdn_one_value = TRUE; - return offset; } @@ -891,13 +848,10 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { }; int -dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 331 "./asn1/x509if/x509if.cnf" - char *temp_dn; - +dissect_x509if_RelativeDistinguishedName(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { rdn_one_value = FALSE; top_of_rdn = tree; - last_rdn = (char *)wmem_alloc(actx->pinfo->pool, MAX_DN_STR_LEN); *last_rdn = '\0'; + last_rdn_buf = wmem_strbuf_new(actx->pinfo->pool, ""); register_frame_end_routine (actx->pinfo, x509if_frame_end); offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, @@ -905,21 +859,23 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv /* we've finished - close the bracket */ - proto_item_append_text(top_of_rdn, " (%s)", last_rdn); + proto_item_append_text(top_of_rdn, " (%s)", wmem_strbuf_get_str(last_rdn_buf)); /* now append this to the DN */ - if (last_dn) { - if(*last_dn) { - temp_dn = (char *)wmem_strdup_printf(actx->pinfo->pool, "%s,%s", last_rdn, last_dn); - last_dn[0] = '\0'; - (void) g_strlcat(last_dn, temp_dn, MAX_DN_STR_LEN); + if (last_dn_buf) { + if(wmem_strbuf_get_len(last_dn_buf) > 0) { + wmem_strbuf_t *temp_dn_buf = wmem_strbuf_new_sized(actx->pinfo->pool, wmem_strbuf_get_len(last_rdn_buf) + wmem_strbuf_get_len(last_dn_buf) + 1); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); + wmem_strbuf_append_c(temp_dn_buf, ','); + wmem_strbuf_append(temp_dn_buf, wmem_strbuf_get_str(last_dn_buf)); + wmem_strbuf_destroy(last_dn_buf); + last_dn_buf = temp_dn_buf; } else { - (void) g_strlcat(last_dn, last_rdn, MAX_DN_STR_LEN); + wmem_strbuf_append(last_dn_buf, wmem_strbuf_get_str(last_rdn_buf)); } } - last_rdn = NULL; /* it will get freed when the next packet is dissected */ - + last_rdn_buf = NULL; /* it will get freed when the next packet is dissected */ return offset; @@ -928,8 +884,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv static int -dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 393 "./asn1/x509if/x509if.cnf" +dissect_x509if_RDNSequence_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { if(!dn_one_rdn) { /* this is the first element - record the top */ @@ -942,7 +897,6 @@ dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in dn_one_rdn = TRUE; - return offset; } @@ -952,12 +906,11 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { }; int -dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 372 "./asn1/x509if/x509if.cnf" +dissect_x509if_RDNSequence(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { const char *fmt; dn_one_rdn = FALSE; /* reset */ - last_dn = (char *)wmem_alloc(actx->pinfo->pool, MAX_DN_STR_LEN); *last_dn = '\0'; + last_dn_buf = wmem_strbuf_new(actx->pinfo->pool, ""); top_of_dn = NULL; register_frame_end_routine (actx->pinfo, x509if_frame_end); @@ -967,17 +920,16 @@ dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off /* we've finished - append the dn */ - proto_item_append_text(top_of_dn, " (%s)", last_dn); + proto_item_append_text(top_of_dn, " (%s)", wmem_strbuf_get_str(last_dn_buf)); /* see if we should append this to the col info */ if((fmt = val_to_str_const(hf_index, fmt_vals, "")) && *fmt) { - /* we have a format */ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s%s", fmt, last_dn); + /* we have a format */ + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s%s", fmt, wmem_strbuf_get_str(last_dn_buf)); } - return offset; } @@ -993,7 +945,7 @@ static const ber_choice_t Name_choice[] = { }; int -dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_Name(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_choice(actx, tree, tvb, offset, Name_choice, hf_index, ett_x509if_Name, NULL); @@ -1004,7 +956,7 @@ dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ int -dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_DistinguishedName(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; @@ -1013,7 +965,7 @@ dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i int -dissect_x509if_LocalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_LocalName(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; @@ -1033,7 +985,7 @@ static const ber_choice_t T_specificExclusions_item_choice[] = { }; static int -dissect_x509if_T_specificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_specificExclusions_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_choice(actx, tree, tvb, offset, T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, NULL); @@ -1047,7 +999,7 @@ static const ber_sequence_t T_specificExclusions_set_of[1] = { }; static int -dissect_x509if_T_specificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_specificExclusions(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions); @@ -1057,7 +1009,7 @@ dissect_x509if_T_specificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int -dissect_x509if_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_BaseDistance(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer64(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -1070,7 +1022,7 @@ static const ber_sequence_t SET_OF_Refinement_set_of[1] = { }; static int -dissect_x509if_SET_OF_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SET_OF_Refinement(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement); @@ -1095,11 +1047,19 @@ static const ber_choice_t Refinement_choice[] = { }; int -dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_Refinement(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + const int proto_id = GPOINTER_TO_INT(wmem_list_frame_data(wmem_list_tail(actx->pinfo->layers))); + const unsigned cycle_size = 3; + unsigned recursion_depth = p_get_proto_depth(actx->pinfo, proto_id); + + DISSECTOR_ASSERT(recursion_depth <= MAX_RECURSION_DEPTH); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth + cycle_size); + offset = dissect_ber_choice(actx, tree, tvb, offset, Refinement_choice, hf_index, ett_x509if_Refinement, NULL); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth); return offset; } @@ -1114,7 +1074,7 @@ static const ber_sequence_t SubtreeSpecification_sequence[] = { }; int -dissect_x509if_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SubtreeSpecification(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification); @@ -1135,7 +1095,7 @@ static const ber_choice_t T_chopSpecificExclusions_item_choice[] = { }; static int -dissect_x509if_T_chopSpecificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_chopSpecificExclusions_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_choice(actx, tree, tvb, offset, T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, NULL); @@ -1149,7 +1109,7 @@ static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = { }; static int -dissect_x509if_T_chopSpecificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_chopSpecificExclusions(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions); @@ -1165,7 +1125,7 @@ static const ber_sequence_t ChopSpecification_sequence[] = { }; int -dissect_x509if_ChopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ChopSpecification(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification); @@ -1183,7 +1143,7 @@ const value_string x509if_AttributeUsage_vals[] = { int -dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AttributeUsage(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -1193,7 +1153,7 @@ dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int -dissect_x509if_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_RuleIdentifier(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -1206,7 +1166,7 @@ static const ber_sequence_t SET_SIZE_1_MAX_OF_RuleIdentifier_set_of[1] = { }; static int -dissect_x509if_SET_SIZE_1_MAX_OF_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SET_SIZE_1_MAX_OF_RuleIdentifier(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, SET_SIZE_1_MAX_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_RuleIdentifier); @@ -1222,7 +1182,7 @@ static const ber_sequence_t DITStructureRule_sequence[] = { }; int -dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_DITStructureRule(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule); @@ -1235,7 +1195,7 @@ static const ber_sequence_t T_auxiliaries_set_of[1] = { }; static int -dissect_x509if_T_auxiliaries(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_auxiliaries(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries); @@ -1248,7 +1208,7 @@ static const ber_sequence_t T_mandatory_set_of[1] = { }; static int -dissect_x509if_T_mandatory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_mandatory(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_mandatory_set_of, hf_index, ett_x509if_T_mandatory); @@ -1261,7 +1221,7 @@ static const ber_sequence_t T_optional_set_of[1] = { }; static int -dissect_x509if_T_optional(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_optional(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_optional_set_of, hf_index, ett_x509if_T_optional); @@ -1274,7 +1234,7 @@ static const ber_sequence_t T_precluded_set_of[1] = { }; static int -dissect_x509if_T_precluded(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_precluded(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_precluded_set_of, hf_index, ett_x509if_T_precluded); @@ -1292,7 +1252,7 @@ static const ber_sequence_t DITContentRule_sequence[] = { }; int -dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_DITContentRule(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, DITContentRule_sequence, hf_index, ett_x509if_DITContentRule); @@ -1305,7 +1265,7 @@ static const ber_sequence_t T_mandatoryContexts_set_of[1] = { }; static int -dissect_x509if_T_mandatoryContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_mandatoryContexts(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts); @@ -1318,7 +1278,7 @@ static const ber_sequence_t T_optionalContexts_set_of[1] = { }; static int -dissect_x509if_T_optionalContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_optionalContexts(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts); @@ -1334,7 +1294,7 @@ static const ber_sequence_t DITContextUse_sequence[] = { }; int -dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_DITContextUse(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, DITContextUse_sequence, hf_index, ett_x509if_DITContextUse); @@ -1344,7 +1304,7 @@ dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int -dissect_x509if_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_INTEGER(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -1354,7 +1314,7 @@ dissect_x509if_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int -dissect_x509if_T_attributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_attributeType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -1363,12 +1323,10 @@ dissect_x509if_T_attributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int -dissect_x509if_T_ra_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 274 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_ra_selectedValues_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -1378,7 +1336,7 @@ static const ber_sequence_t T_ra_selectedValues_sequence_of[1] = { }; static int -dissect_x509if_T_ra_selectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_ra_selectedValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, T_ra_selectedValues_sequence_of, hf_index, ett_x509if_T_ra_selectedValues); @@ -1388,7 +1346,7 @@ dissect_x509if_T_ra_selectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x509if_T_entryType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_entryType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -1397,12 +1355,10 @@ dissect_x509if_T_entryType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int -dissect_x509if_T_ra_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 280 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_ra_values_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -1412,7 +1368,7 @@ static const ber_sequence_t T_ra_values_sequence_of[1] = { }; static int -dissect_x509if_T_ra_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_ra_values(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, T_ra_values_sequence_of, hf_index, ett_x509if_T_ra_values); @@ -1427,7 +1383,7 @@ static const ber_sequence_t T_defaultValues_item_sequence[] = { }; static int -dissect_x509if_T_defaultValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_defaultValues_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item); @@ -1440,7 +1396,7 @@ static const ber_sequence_t T_defaultValues_sequence_of[1] = { }; static int -dissect_x509if_T_defaultValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_defaultValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues); @@ -1450,7 +1406,7 @@ dissect_x509if_T_defaultValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int -dissect_x509if_T_contextType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_contextType_01(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -1459,12 +1415,10 @@ dissect_x509if_T_contextType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int -dissect_x509if_T_contextValue_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 319 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_contextValue_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -1474,7 +1428,7 @@ static const ber_sequence_t T_contextValue_sequence_of[1] = { }; static int -dissect_x509if_T_contextValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_contextValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, T_contextValue_sequence_of, hf_index, ett_x509if_T_contextValue); @@ -1489,7 +1443,7 @@ static const ber_sequence_t ContextProfile_sequence[] = { }; int -dissect_x509if_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ContextProfile(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ContextProfile_sequence, hf_index, ett_x509if_ContextProfile); @@ -1502,7 +1456,7 @@ static const ber_sequence_t SEQUENCE_SIZE_0_MAX_OF_ContextProfile_sequence_of[1] }; static int -dissect_x509if_SEQUENCE_SIZE_0_MAX_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_0_MAX_OF_ContextProfile(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_0_MAX_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_0_MAX_OF_ContextProfile); @@ -1515,7 +1469,7 @@ static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = { }; static int -dissect_x509if_SEQUENCE_OF_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_OF_ContextCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination); @@ -1540,18 +1494,26 @@ static const ber_choice_t ContextCombination_choice[] = { }; int -dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ContextCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + const int proto_id = GPOINTER_TO_INT(wmem_list_frame_data(wmem_list_tail(actx->pinfo->layers))); + const unsigned cycle_size = 3; + unsigned recursion_depth = p_get_proto_depth(actx->pinfo, proto_id); + + DISSECTOR_ASSERT(recursion_depth <= MAX_RECURSION_DEPTH); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth + cycle_size); + offset = dissect_ber_choice(actx, tree, tvb, offset, ContextCombination_choice, hf_index, ett_x509if_ContextCombination, NULL); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth); return offset; } static int -dissect_x509if_T_restrictionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_restrictionType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -1560,12 +1522,10 @@ dissect_x509if_T_restrictionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int -dissect_x509if_T_restrictionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 325 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_restrictionValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -1577,7 +1537,7 @@ static const ber_sequence_t MatchingUse_sequence[] = { }; int -dissect_x509if_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_MatchingUse(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MatchingUse_sequence, hf_index, ett_x509if_MatchingUse); @@ -1590,7 +1550,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_MatchingUse_sequence_of[1] = }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MatchingUse(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MatchingUse); @@ -1610,7 +1570,7 @@ static const ber_sequence_t RequestAttribute_sequence[] = { }; int -dissect_x509if_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_RequestAttribute(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute); @@ -1623,7 +1583,7 @@ static const ber_sequence_t SEQUENCE_SIZE_0_MAX_OF_RequestAttribute_sequence_of[ }; static int -dissect_x509if_SEQUENCE_SIZE_0_MAX_OF_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_0_MAX_OF_RequestAttribute(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_0_MAX_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_0_MAX_OF_RequestAttribute); @@ -1636,7 +1596,7 @@ static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = { }; static int -dissect_x509if_SEQUENCE_OF_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_OF_AttributeCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination); @@ -1661,18 +1621,26 @@ static const ber_choice_t AttributeCombination_choice[] = { }; int -dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AttributeCombination(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + const int proto_id = GPOINTER_TO_INT(wmem_list_frame_data(wmem_list_tail(actx->pinfo->layers))); + const unsigned cycle_size = 3; + unsigned recursion_depth = p_get_proto_depth(actx->pinfo, proto_id); + + DISSECTOR_ASSERT(recursion_depth <= MAX_RECURSION_DEPTH); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth + cycle_size); + offset = dissect_ber_choice(actx, tree, tvb, offset, AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, NULL); + p_set_proto_depth(actx->pinfo, proto_id, recursion_depth); return offset; } static int -dissect_x509if_T_attributeType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_attributeType_01(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); return offset; @@ -1681,12 +1649,10 @@ dissect_x509if_T_attributeType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x509if_T_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 289 "./asn1/x509if/x509if.cnf" +dissect_x509if_T_selectedValues_item(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); - return offset; } @@ -1696,7 +1662,7 @@ static const ber_sequence_t T_selectedValues_sequence_of[1] = { }; static int -dissect_x509if_T_selectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_selectedValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, T_selectedValues_sequence_of, hf_index, ett_x509if_T_selectedValues); @@ -1717,7 +1683,7 @@ static const ber_choice_t T_outputValues_choice[] = { }; static int -dissect_x509if_T_outputValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_T_outputValues(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_choice(actx, tree, tvb, offset, T_outputValues_choice, hf_index, ett_x509if_T_outputValues, NULL); @@ -1731,7 +1697,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_ContextProfile_sequence_of[1] }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextProfile(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ContextProfile); @@ -1747,7 +1713,7 @@ static const ber_sequence_t ResultAttribute_sequence[] = { }; int -dissect_x509if_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ResultAttribute(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute); @@ -1760,7 +1726,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_ResultAttribute_sequence_of[1 }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute); @@ -1776,7 +1742,7 @@ static const ber_sequence_t ControlOptions_sequence[] = { }; int -dissect_x509if_ControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ControlOptions(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ControlOptions_sequence, hf_index, ett_x509if_ControlOptions); @@ -1791,7 +1757,7 @@ static const ber_sequence_t Mapping_sequence[] = { }; int -dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_Mapping(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Mapping_sequence, hf_index, ett_x509if_Mapping); @@ -1804,7 +1770,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Mapping_sequence_of[1] = { }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_Mapping(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_Mapping); @@ -1820,7 +1786,7 @@ static const ber_sequence_t MRSubstitution_sequence[] = { }; int -dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_MRSubstitution(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution); @@ -1833,7 +1799,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_MRSubstitution_sequence_of[1] }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MRSubstitution(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRSubstitution); @@ -1848,7 +1814,7 @@ static const ber_sequence_t MRMapping_sequence[] = { }; int -dissect_x509if_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_MRMapping(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MRMapping_sequence, hf_index, ett_x509if_MRMapping); @@ -1861,7 +1827,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_MRMapping_sequence_of[1] = { }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_MRMapping(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_MRMapping); @@ -1879,7 +1845,7 @@ static const ber_sequence_t RelaxationPolicy_sequence[] = { }; int -dissect_x509if_RelaxationPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_RelaxationPolicy(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy); @@ -1892,7 +1858,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeType_sequence_of[1] }; static int -dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SEQUENCE_SIZE_1_MAX_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType); @@ -1908,7 +1874,7 @@ static int * const AllowedSubset_bits[] = { }; int -dissect_x509if_AllowedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_AllowedSubset(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, AllowedSubset_bits, 3, hf_index, ett_x509if_AllowedSubset, NULL); @@ -1926,7 +1892,7 @@ const value_string x509if_ImposedSubset_vals[] = { int -dissect_x509if_ImposedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_ImposedSubset(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -1941,7 +1907,7 @@ static const ber_sequence_t EntryLimit_sequence[] = { }; int -dissect_x509if_EntryLimit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_EntryLimit(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, EntryLimit_sequence, hf_index, ett_x509if_EntryLimit); @@ -1954,7 +1920,7 @@ static const ber_sequence_t SET_SIZE_1_MAX_OF_DirectoryString_set_of[1] = { }; static int -dissect_x509if_SET_SIZE_1_MAX_OF_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SET_SIZE_1_MAX_OF_DirectoryString(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, SET_SIZE_1_MAX_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString); @@ -1986,7 +1952,7 @@ static const ber_sequence_t SearchRuleDescription_sequence[] = { }; int -dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SearchRuleDescription(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription); @@ -1996,7 +1962,7 @@ dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int -dissect_x509if_HierarchyLevel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_HierarchyLevel(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -2006,7 +1972,7 @@ dissect_x509if_HierarchyLevel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int -dissect_x509if_HierarchyBelow(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_HierarchyBelow(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; @@ -2035,7 +2001,7 @@ static const ber_sequence_t SearchRule_sequence[] = { }; int -dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SearchRule(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SearchRule_sequence, hf_index, ett_x509if_SearchRule); @@ -2050,7 +2016,7 @@ static const ber_sequence_t SearchRuleId_sequence[] = { }; int -dissect_x509if_SearchRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x509if_SearchRuleId(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId); @@ -2089,12 +2055,9 @@ static int dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-x509if-fn.c ---*/ -#line 76 "./asn1/x509if/packet-x509if-template.c" - const char * x509if_get_last_dn(void) { - return last_dn; + return last_dn_buf ? wmem_strbuf_get_str(last_dn_buf) : NULL; } gboolean x509if_register_fmt(int hf_index, const gchar *fmt) @@ -2129,15 +2092,12 @@ void proto_register_x509if(void) { /* List of fields */ static hf_register_info hf[] = { { &hf_x509if_object_identifier_id, - { "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0, + { "Object Id", "x509if.oid", FT_OID, BASE_NONE, NULL, 0, "Object identifier Id", HFILL }}, { &hf_x509if_any_string, { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE, NULL, 0, "This is any String", HFILL }}, - -/*--- Included file: packet-x509if-hfarr.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-hfarr.c" { &hf_x509if_DistinguishedName_PDU, { "DistinguishedName", "x509if.DistinguishedName", FT_UINT32, BASE_DEC, NULL, 0, @@ -2754,16 +2714,10 @@ void proto_register_x509if(void) { { "wholeSubtree", "x509if.AllowedSubset.wholeSubtree", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 121 "./asn1/x509if/packet-x509if-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-x509if-ettarr.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-ettarr.c" &ett_x509if_Attribute, &ett_x509if_T_values, &ett_x509if_T_valuesWithContext, @@ -2837,9 +2791,6 @@ void proto_register_x509if(void) { &ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute, &ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType, &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, - -/*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 126 "./asn1/x509if/packet-x509if-template.c" }; /* Register protocol */ @@ -2858,9 +2809,6 @@ void proto_register_x509if(void) { /*--- proto_reg_handoff_x509if -------------------------------------------*/ void proto_reg_handoff_x509if(void) { - -/*--- Included file: packet-x509if-dis-tab.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-dis-tab.c" register_ber_oid_dissector("2.5.4.1", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aliasedEntryName"); register_ber_oid_dissector("2.5.4.31", dissect_DistinguishedName_PDU, proto_x509if, "id-at-member"); register_ber_oid_dissector("2.5.4.32", dissect_DistinguishedName_PDU, proto_x509if, "id-at-owner"); @@ -2895,8 +2843,5 @@ void proto_reg_handoff_x509if(void) { register_ber_oid_dissector("2.16.840.1.101.2.2.1.184", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aCPDutyOfficer"); register_ber_oid_dissector("2.16.840.1.101.2.2.1.188", dissect_DistinguishedName_PDU, proto_x509if, "id-at-primaryMember"); - -/*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 145 "./asn1/x509if/packet-x509if-template.c" } |