diff options
Diffstat (limited to 'epan/dissectors/packet-x509if.c')
| -rw-r--r-- | epan/dissectors/packet-x509if.c | 426 |
1 files changed, 213 insertions, 213 deletions
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 32727e5106..7ecba42d90 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -523,14 +523,14 @@ static int dissect_distingAttrValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = { +static const ber_old_sequence_t SET_OF_AttributeValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item }, }; static int dissect_x509if_SET_OF_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue); return offset; } @@ -563,7 +563,7 @@ static int dissect_includeSubtypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t Context_sequence[] = { +static const ber_old_sequence_t Context_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fallback }, @@ -572,8 +572,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - Context_sequence, hf_index, ett_x509if_Context); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + Context_sequence, hf_index, ett_x509if_Context); return offset; } @@ -582,14 +582,14 @@ static int dissect_contextList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t SET_OF_Context_set_of[1] = { +static const ber_old_sequence_t SET_OF_Context_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextList_item }, }; static int dissect_x509if_SET_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context); return offset; } @@ -598,7 +598,7 @@ static int dissect_contextList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t T_valuesWithContext_item_sequence[] = { +static const ber_old_sequence_t T_valuesWithContext_item_sequence[] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, { 0, 0, 0, NULL } @@ -606,8 +606,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item); return offset; } @@ -616,14 +616,14 @@ static int dissect_valuesWithContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U } -static const ber_sequence_t T_valuesWithContext_set_of[1] = { +static const ber_old_sequence_t T_valuesWithContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext); return offset; } @@ -632,7 +632,7 @@ static int dissect_valuesWithContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, in } -static const ber_sequence_t Attribute_sequence[] = { +static const ber_old_sequence_t Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_valuesWithContext }, @@ -641,8 +641,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - Attribute_sequence, hf_index, ett_x509if_Attribute); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + Attribute_sequence, hf_index, ett_x509if_Attribute); return offset; } @@ -705,14 +705,14 @@ static int dissect_ca_contextValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_ } -static const ber_sequence_t SET_OF_ContextValue_set_of[1] = { +static const ber_old_sequence_t SET_OF_ContextValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues_item }, }; static int dissect_x509if_SET_OF_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue); return offset; } @@ -721,7 +721,7 @@ static int dissect_ca_contextValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t ContextAssertion_sequence[] = { +static const ber_old_sequence_t ContextAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ca_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues }, { 0, 0, 0, NULL } @@ -729,8 +729,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion); return offset; } @@ -742,14 +742,14 @@ static int dissect_ata_assertedContexts_item(proto_tree *tree _U_, tvbuff_t *tvb } -static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = { +static const ber_old_sequence_t SET_OF_ContextAssertion_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item }, }; static int dissect_x509if_SET_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion); return offset; } @@ -764,7 +764,7 @@ static const value_string x509if_T_assertedContexts_vals[] = { { 0, NULL } }; -static const ber_choice_t T_assertedContexts_choice[] = { +static const ber_old_choice_t T_assertedContexts_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_allContexts }, { 1, BER_CLASS_CON, 1, 0, dissect_selectedContexts }, { 0, 0, 0, 0, NULL } @@ -772,9 +772,9 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, + NULL); return offset; } @@ -783,7 +783,7 @@ static int dissect_assertedContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t AttributeValueAssertion_sequence[] = { +static const ber_old_sequence_t AttributeValueAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts }, @@ -797,8 +797,8 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); ava_hf_index=-1; @@ -809,14 +809,14 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb } -static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion); return offset; } @@ -825,7 +825,7 @@ static int dissect_ata_assertedContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, } -static const ber_sequence_t AttributeTypeAssertion_sequence[] = { +static const ber_old_sequence_t AttributeTypeAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts }, { 0, 0, 0, NULL } @@ -833,14 +833,14 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion); return offset; } -static const ber_sequence_t T_valWithContext_item_sequence[] = { +static const ber_old_sequence_t T_valWithContext_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, { 0, 0, 0, NULL } @@ -848,8 +848,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item); return offset; } @@ -858,14 +858,14 @@ static int dissect_valueswithContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U } -static const ber_sequence_t T_valWithContext_set_of[1] = { +static const ber_old_sequence_t T_valWithContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valueswithContext_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext); return offset; } @@ -874,7 +874,7 @@ static int dissect_valueswithContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, in } -static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { +static const ber_old_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_atadv_value }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_primaryDistinguished }, @@ -884,8 +884,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue); return offset; } @@ -919,7 +919,7 @@ static int dissect_RelativeDistinguishedName_item(proto_tree *tree _U_, tvbuff_t } -static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { +static const ber_old_sequence_t RelativeDistinguishedName_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item }, }; @@ -933,8 +933,8 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv last_rdn = ep_alloc(MAX_DN_STR_LEN); *last_rdn = '\0'; doing_dn = TRUE; - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); /* we've finished - close the bracket */ @@ -985,7 +985,7 @@ static int dissect_RDNSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t RDNSequence_sequence_of[1] = { +static const ber_old_sequence_t RDNSequence_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item }, }; @@ -998,8 +998,8 @@ dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off last_dn = ep_alloc(MAX_DN_STR_LEN); *last_dn = '\0'; top_of_dn = NULL; - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); /* we've finished - append the dn */ @@ -1027,16 +1027,16 @@ const value_string x509if_Name_vals[] = { { 0, NULL } }; -static const ber_choice_t Name_choice[] = { +static const ber_old_choice_t Name_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence }, { 0, 0, 0, 0, NULL } }; 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - Name_choice, hf_index, ett_x509if_Name, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + Name_choice, hf_index, ett_x509if_Name, + NULL); return offset; } @@ -1075,7 +1075,7 @@ static const value_string x509if_T_specificExclusions_item_vals[] = { { 0, NULL } }; -static const ber_choice_t T_specificExclusions_item_choice[] = { +static const ber_old_choice_t T_specificExclusions_item_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_chopBefore }, { 1, BER_CLASS_CON, 1, 0, dissect_chopAfter }, { 0, 0, 0, 0, NULL } @@ -1083,9 +1083,9 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, + NULL); return offset; } @@ -1094,14 +1094,14 @@ static int dissect_specificExclusions_item(proto_tree *tree _U_, tvbuff_t *tvb _ } -static const ber_sequence_t T_specificExclusions_set_of[1] = { +static const ber_old_sequence_t T_specificExclusions_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions); return offset; } @@ -1171,14 +1171,14 @@ static int dissect_newMatchingRule(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t SET_OF_Refinement_set_of[1] = { +static const ber_old_sequence_t SET_OF_Refinement_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement); return offset; } @@ -1198,7 +1198,7 @@ const value_string x509if_Refinement_vals[] = { { 0, NULL } }; -static const ber_choice_t Refinement_choice[] = { +static const ber_old_choice_t Refinement_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_item }, { 1, BER_CLASS_CON, 1, 0, dissect_refinement_and }, { 2, BER_CLASS_CON, 2, 0, dissect_refinement_or }, @@ -1208,15 +1208,15 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - Refinement_choice, hf_index, ett_x509if_Refinement, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + Refinement_choice, hf_index, ett_x509if_Refinement, + NULL); return offset; } -static const ber_sequence_t SubtreeSpecification_sequence[] = { +static const ber_old_sequence_t SubtreeSpecification_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum }, @@ -1227,8 +1227,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification); return offset; } @@ -1240,7 +1240,7 @@ static const value_string x509if_T_chopSpecificExclusions_item_vals[] = { { 0, NULL } }; -static const ber_choice_t T_chopSpecificExclusions_item_choice[] = { +static const ber_old_choice_t T_chopSpecificExclusions_item_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_chopBefore }, { 1, BER_CLASS_CON, 1, 0, dissect_chopAfter }, { 0, 0, 0, 0, NULL } @@ -1248,9 +1248,9 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, + NULL); return offset; } @@ -1259,14 +1259,14 @@ static int dissect_chopSpecificExclusions_item(proto_tree *tree _U_, tvbuff_t *t } -static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = { +static const ber_old_sequence_t T_chopSpecificExclusions_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions); return offset; } @@ -1275,7 +1275,7 @@ static int dissect_chopSpecificExclusions(proto_tree *tree _U_, tvbuff_t *tvb _U } -static const ber_sequence_t ChopSpecification_sequence[] = { +static const ber_old_sequence_t ChopSpecification_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_chopSpecificExclusions }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_maximum }, @@ -1284,8 +1284,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification); return offset; } @@ -1342,14 +1342,14 @@ static int dissect_superiorStructureRules_item(proto_tree *tree _U_, tvbuff_t *t } -static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = { +static const ber_old_sequence_t SET_OF_RuleIdentifier_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules_item }, }; static int dissect_x509if_SET_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier); return offset; } @@ -1358,7 +1358,7 @@ static int dissect_superiorStructureRules(proto_tree *tree _U_, tvbuff_t *tvb _U } -static const ber_sequence_t DITStructureRule_sequence[] = { +static const ber_old_sequence_t DITStructureRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules }, @@ -1367,21 +1367,21 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule); return offset; } -static const ber_sequence_t T_auxiliaries_set_of[1] = { +static const ber_old_sequence_t T_auxiliaries_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries); return offset; } @@ -1390,14 +1390,14 @@ static int dissect_auxiliaries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = { +static const ber_old_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item }, }; static int dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(gboolean 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_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId); return offset; } @@ -1412,7 +1412,7 @@ static int dissect_precluded(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset } -static const ber_sequence_t DITContentRule_sequence[] = { +static const ber_old_sequence_t DITContentRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatory }, @@ -1423,21 +1423,21 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - DITContentRule_sequence, hf_index, ett_x509if_DITContentRule); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + DITContentRule_sequence, hf_index, ett_x509if_DITContentRule); return offset; } -static const ber_sequence_t T_mandatoryContexts_set_of[1] = { +static const ber_old_sequence_t T_mandatoryContexts_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatoryContexts_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts); return offset; } @@ -1446,14 +1446,14 @@ static int dissect_mandatoryContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, in } -static const ber_sequence_t T_optionalContexts_set_of[1] = { +static const ber_old_sequence_t T_optionalContexts_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_optionalContexts_item }, }; 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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts); return offset; } @@ -1462,7 +1462,7 @@ static int dissect_optionalContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t DITContextUse_sequence[] = { +static const ber_old_sequence_t DITContextUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_optionalContexts }, @@ -1471,8 +1471,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - DITContextUse_sequence, hf_index, ett_x509if_DITContextUse); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + DITContextUse_sequence, hf_index, ett_x509if_DITContextUse); return offset; } @@ -1524,14 +1524,14 @@ static int dissect_ra_selectedValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U } -static const ber_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_selectedValues_item }, }; static int dissect_x509if_SEQUENCE_OF_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues); return offset; } @@ -1567,14 +1567,14 @@ static int dissect_ra_values_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o } -static const ber_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_values_item }, }; static int dissect_x509if_SEQUENCE_OF_DefaultValueValues(gboolean 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_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues); return offset; } @@ -1583,7 +1583,7 @@ static int dissect_ra_values(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset } -static const ber_sequence_t T_defaultValues_item_sequence[] = { +static const ber_old_sequence_t T_defaultValues_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ra_values }, { 0, 0, 0, NULL } @@ -1591,8 +1591,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item); return offset; } @@ -1601,14 +1601,14 @@ static int dissect_defaultValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i } -static const ber_sequence_t T_defaultValues_sequence_of[1] = { +static const ber_old_sequence_t T_defaultValues_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_defaultValues_item }, }; 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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues); return offset; } @@ -1617,14 +1617,14 @@ static int dissect_defaultValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item }, }; static int dissect_x509if_SEQUENCE_OF_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue); return offset; } @@ -1636,7 +1636,7 @@ static int dissect_selectedValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o } -static const ber_sequence_t ContextProfile_sequence[] = { +static const ber_old_sequence_t ContextProfile_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue }, { 0, 0, 0, NULL } @@ -1644,8 +1644,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ContextProfile_sequence, hf_index, ett_x509if_ContextProfile); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ContextProfile_sequence, hf_index, ett_x509if_ContextProfile); return offset; } @@ -1654,14 +1654,14 @@ static int dissect_contexts_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile); return offset; } @@ -1670,14 +1670,14 @@ static int dissect_contexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset } -static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item }, }; 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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination); return offset; } @@ -1697,7 +1697,7 @@ const value_string x509if_ContextCombination_vals[] = { { 0, NULL } }; -static const ber_choice_t ContextCombination_choice[] = { +static const ber_old_choice_t ContextCombination_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_context }, { 1, BER_CLASS_CON, 1, 0, dissect_contextcombination_and }, { 2, BER_CLASS_CON, 2, 0, dissect_contextcombination_or }, @@ -1707,15 +1707,15 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - ContextCombination_choice, hf_index, ett_x509if_ContextCombination, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + ContextCombination_choice, hf_index, ett_x509if_ContextCombination, + NULL); return offset; } -static const ber_sequence_t MatchingUse_sequence[] = { +static const ber_old_sequence_t MatchingUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue }, { 0, 0, 0, NULL } @@ -1723,8 +1723,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - MatchingUse_sequence, hf_index, ett_x509if_MatchingUse); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + MatchingUse_sequence, hf_index, ett_x509if_MatchingUse); return offset; } @@ -1733,14 +1733,14 @@ static int dissect_matchingUse_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse); return offset; } @@ -1749,7 +1749,7 @@ static int dissect_matchingUse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t RequestAttribute_sequence[] = { +static const ber_old_sequence_t RequestAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ra_selectedValues }, @@ -1762,8 +1762,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute); return offset; } @@ -1772,14 +1772,14 @@ static int dissect_inputAttributeTypes_item(proto_tree *tree _U_, tvbuff_t *tvb } -static const ber_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute); return offset; } @@ -1788,14 +1788,14 @@ static int dissect_inputAttributeTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, } -static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; 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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination); return offset; } @@ -1815,7 +1815,7 @@ const value_string x509if_AttributeCombination_vals[] = { { 0, NULL } }; -static const ber_choice_t AttributeCombination_choice[] = { +static const ber_old_choice_t AttributeCombination_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_attribute }, { 1, BER_CLASS_CON, 1, 0, dissect_and }, { 2, BER_CLASS_CON, 2, 0, dissect_or }, @@ -1825,9 +1825,9 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, + NULL); return offset; } @@ -1839,7 +1839,7 @@ static const value_string x509if_T_outputValues_vals[] = { { 0, NULL } }; -static const ber_choice_t T_outputValues_choice[] = { +static const ber_old_choice_t T_outputValues_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly }, { 0, 0, 0, 0, NULL } @@ -1847,9 +1847,9 @@ 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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - T_outputValues_choice, hf_index, ett_x509if_T_outputValues, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_outputValues_choice, hf_index, ett_x509if_T_outputValues, + NULL); return offset; } @@ -1858,7 +1858,7 @@ static int dissect_outputValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off } -static const ber_sequence_t ResultAttribute_sequence[] = { +static const ber_old_sequence_t ResultAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts }, @@ -1867,8 +1867,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute); return offset; } @@ -1877,14 +1877,14 @@ static int dissect_outputAttributeTypes_item(proto_tree *tree _U_, tvbuff_t *tvb } -static const ber_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute); return offset; } @@ -1893,14 +1893,14 @@ static int dissect_outputAttributeTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, } -static const ber_sequence_t ControlOptions_sequence[] = { +static const ber_old_sequence_t ControlOptions_sequence[] = { { 0, 0, 0, NULL } }; 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ControlOptions_sequence, hf_index, ett_x509if_ControlOptions); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ControlOptions_sequence, hf_index, ett_x509if_ControlOptions); return offset; } @@ -1915,7 +1915,7 @@ static int dissect_searchRuleControls(proto_tree *tree _U_, tvbuff_t *tvb _U_, i } -static const ber_sequence_t Mapping_sequence[] = { +static const ber_old_sequence_t Mapping_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level }, { 0, 0, 0, NULL } @@ -1923,8 +1923,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - Mapping_sequence, hf_index, ett_x509if_Mapping); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + Mapping_sequence, hf_index, ett_x509if_Mapping); return offset; } @@ -1933,14 +1933,14 @@ static int dissect_mapping_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off } -static const ber_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping); return offset; } @@ -1949,7 +1949,7 @@ static int dissect_mapping(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _ } -static const ber_sequence_t MRSubstitution_sequence[] = { +static const ber_old_sequence_t MRSubstitution_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_newMatchingRule }, @@ -1958,8 +1958,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution); return offset; } @@ -1968,14 +1968,14 @@ static int dissect_substitution_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in } -static const ber_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution); return offset; } @@ -1984,7 +1984,7 @@ static int dissect_substitution(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off } -static const ber_sequence_t MRMapping_sequence[] = { +static const ber_old_sequence_t MRMapping_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution }, { 0, 0, 0, NULL } @@ -1992,8 +1992,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - MRMapping_sequence, hf_index, ett_x509if_MRMapping); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + MRMapping_sequence, hf_index, ett_x509if_MRMapping); return offset; } @@ -2008,14 +2008,14 @@ static int dissect_relaxations_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping); return offset; } @@ -2027,7 +2027,7 @@ static int dissect_relaxations(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t RelaxationPolicy_sequence[] = { +static const ber_old_sequence_t RelaxationPolicy_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_relaxations }, @@ -2038,8 +2038,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy); return offset; } @@ -2048,14 +2048,14 @@ static int dissect_relaxation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse } -static const ber_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = { +static const ber_old_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item }, }; static int dissect_x509if_SEQUENCE_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_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType); + offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType); return offset; } @@ -2104,7 +2104,7 @@ static int dissect_imposedSubset(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t EntryLimit_sequence[] = { +static const ber_old_sequence_t EntryLimit_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max }, { 0, 0, 0, NULL } @@ -2112,8 +2112,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - EntryLimit_sequence, hf_index, ett_x509if_EntryLimit); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + EntryLimit_sequence, hf_index, ett_x509if_EntryLimit); return offset; } @@ -2122,14 +2122,14 @@ static int dissect_entryLimit(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse } -static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = { +static const ber_old_sequence_t SET_OF_DirectoryString_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_name_item }, }; static int dissect_x509if_SET_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_) { - offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, - SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString); + offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset, + SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString); return offset; } @@ -2138,7 +2138,7 @@ static int dissect_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const ber_sequence_t SearchRuleDescription_sequence[] = { +static const ber_old_sequence_t SearchRuleDescription_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType }, @@ -2162,14 +2162,14 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription); return offset; } -static const ber_sequence_t SearchRule_sequence[] = { +static const ber_old_sequence_t SearchRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType }, @@ -2190,14 +2190,14 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - SearchRule_sequence, hf_index, ett_x509if_SearchRule); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + SearchRule_sequence, hf_index, ett_x509if_SearchRule); return offset; } -static const ber_sequence_t SearchRuleId_sequence[] = { +static const ber_old_sequence_t SearchRuleId_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { 0, 0, 0, NULL } @@ -2205,8 +2205,8 @@ 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_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId); return offset; } @@ -2218,7 +2218,7 @@ const value_string x509if_OutputValues_vals[] = { { 0, NULL } }; -static const ber_choice_t OutputValues_choice[] = { +static const ber_old_choice_t OutputValues_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly }, { 0, 0, 0, 0, NULL } @@ -2226,9 +2226,9 @@ static const ber_choice_t OutputValues_choice[] = { int dissect_x509if_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_) { - offset = dissect_ber_choice(actx, tree, tvb, offset, - OutputValues_choice, hf_index, ett_x509if_OutputValues, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + OutputValues_choice, hf_index, ett_x509if_OutputValues, + NULL); return offset; } |