osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for the use of the new -X parameter for BER encoded protocols. 

svn path=/trunk/; revision=21889
This commit is contained in:
Anders Broman 2007-05-22 16:17:54 +00:00
parent 5e33afbf50
commit dca634c4de
69 changed files with 10806 additions and 9728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asn1/Makefile.nmake
View File

@ -29,7 +29,6 @@ ber: \
logotype-cert-extn \
MAP_Dialogue \
mms \
mpeg \
ns-cert-exts \
ocsp \
pkcs1 \
@ -52,7 +51,6 @@ ber: \
snmp \
spnego \
tcap \
t38 \
wlancertextn \
x411 \
x420 \
@ -67,6 +65,7 @@ per: \
h245 \
h450 \
nbap \
mpeg \
ranap \
rnsap \
rrlp \

2
asn1/acse/acse.cnf
View File

@ -51,7 +51,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt);
#.FN_PARS Authentication-value-other/other-mechanism-name

32
asn1/ftam/ftam.cnf
View File

@ -200,7 +200,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Contents_Type_List_sequence_of, hf_index, ett_ftam_Contents_Type_List);
@ -266,7 +266,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Access_Context_sequence, hf_index, ett_ftam_Access_Context);
#.FN_BODY Access-Passwords
@ -282,7 +282,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Access_Passwords_sequence, hf_index, ett_ftam_Access_Passwords);
#.FN_BODY Access-Request
@ -363,7 +363,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Change_Attributes_sequence, hf_index, ett_ftam_Change_Attributes);
@ -380,7 +380,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Charging_sequence_of, hf_index, ett_ftam_Charging);
@ -397,7 +397,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Concurrency_Control_sequence, hf_index, ett_ftam_Concurrency_Control);
@ -430,7 +430,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Create_Attributes_sequence, hf_index, ett_ftam_Create_Attributes);
#.FN_BODY Diagnostic
@ -446,7 +446,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic);
@ -481,7 +481,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Read_Attributes_sequence, hf_index, ett_ftam_Read_Attributes);
#.FN_BODY Select-Attributes
@ -497,7 +497,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
Select_Attributes_sequence, hf_index, ett_ftam_Select_Attributes);
#.FN_BODY State-Result
@ -545,7 +545,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Scope_sequence_of, hf_index, ett_ftam_Scope);
#.FN_BODY Objects-Attributes-List
@ -561,7 +561,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Objects_Attributes_List_sequence_of, hf_index, ett_ftam_Objects_Attributes_List);
@ -578,7 +578,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence_of(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence_of(TRUE, actx, tree, tvb, offset,
Path_Access_Passwords_sequence_of, hf_index, ett_ftam_Path_Access_Passwords);
#.FN_BODY Request-Operation-Result
@ -655,7 +655,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Password_choice, hf_index, ett_ftam_Password, NULL);
@ -672,7 +672,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL);
#.FN_BODY Operation-Result
@ -688,7 +688,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL);
#.FN_PARS FTAM-Regime-PDU
VAL_PTR = &branch_taken

39
asn1/gsmmap/GSMMAP.asn
View File

@ -3910,6 +3910,26 @@ BearerServiceCode ::= OCTET STRING (SIZE (1))
-- bits 7654321: group (bits 7654), and rate, if applicable
-- (bits 321)
Ext-BearerServiceCode ::= OCTET STRING (SIZE (1..5))
-- This type is used to represent the code identifying a single
-- bearer service, a group of bearer services, or all bearer
-- services. The services are defined in TS 3GPP TS 22.002 [3].
-- The internal structure is defined as follows:
--
-- OCTET 1:
-- plmn-specific bearer services:
-- bits 87654321: defined by the HPLMN operator
--
-- rest of bearer services:
-- bit 8: 0 (unused)
-- bits 7654321: group (bits 7654), and rate, if applicable
-- (bits 321)
-- OCTETS 2-5: reserved for future use. If received the
-- Ext-TeleserviceCode shall be
-- treated according to the exception handling defined for the
-- operation that uses this type.
-- Ext-BearerServiceCode includes all values defined for BearerServiceCode.
TeleserviceCode ::= OCTET STRING (SIZE (1))
-- This type is used to represent the code identifying a single
-- teleservice, a group of teleservices, or all teleservices. The
@ -4217,25 +4237,6 @@ Ext-BasicServiceCode ::= CHOICE {
ext-BearerService [2] IMPLICIT Ext-BearerServiceCode,
ext-Teleservice [3] IMPLICIT Ext-TeleserviceCode}
Ext-BearerServiceCode ::= OCTET STRING (SIZE (1..5))
-- This type is used to represent the code identifying a single
-- bearer service, a group of bearer services, or all bearer
-- services. The services are defined in TS 3GPP TS 22.002 [3].
-- The internal structure is defined as follows:
--
-- OCTET 1:
-- plmn-specific bearer services:
-- bits 87654321: defined by the HPLMN operator
--
-- rest of bearer services:
-- bit 8: 0 (unused)
-- bits 7654321: group (bits 7654), and rate, if applicable
-- (bits 321)
-- OCTETS 2-5: reserved for future use. If received the
-- Ext-TeleserviceCode shall be
-- treated according to the exception handling defined for the
-- operation that uses this type.
-- Ext-BearerServiceCode includes all values defined for BearerServiceCode.
Ext-TeleserviceCode ::= OCTET STRING (SIZE (1..5))
-- This type is used to represent the code identifying a single

12
asn1/ldap/ldap.cnf
View File

@ -499,7 +499,7 @@ ldap_conv_info_t *ldap_info;
}
#.FN_BODY Filter/and
const ber_sequence_t and_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
const ber_old_sequence_t and_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
proto_tree *tr=NULL;
proto_item *it=NULL;
@ -510,7 +510,7 @@ ldap_conv_info_t *ldap_info;
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "and: ");
tr=proto_item_add_subtree(it, ett_ldap_T_and);
}
offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
and_set_of, -1, ett_ldap_T_and);
proto_item_append_text(it, "%%s", and_filter_string);
@ -526,7 +526,7 @@ ldap_conv_info_t *ldap_info;
#.FN_BODY Filter/or
const ber_sequence_t or_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
const ber_old_sequence_t or_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
};
proto_tree *tr=NULL;
proto_item *it=NULL;
@ -537,7 +537,7 @@ ldap_conv_info_t *ldap_info;
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "or: ");
tr=proto_item_add_subtree(it, ett_ldap_T_or);
}
offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
or_set_of, -1, ett_ldap_T_or);
proto_item_append_text(it, "%%s", or_filter_string);
@ -600,7 +600,7 @@ ldap_conv_info_t *ldap_info;
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "substring: ");
tr=proto_item_add_subtree(it, ett_ldap_SubstringFilter);
}
offset = dissect_ber_sequence(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tr, tvb, offset,
SubstringFilter_sequence, hf_index,
ett_ldap_SubstringFilter);
@ -616,7 +616,7 @@ ldap_conv_info_t *ldap_info;
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Filter: ");
tr=proto_item_add_subtree(it, ett_ldap_Filter);
}
offset = dissect_ber_choice(actx, tr, tvb, offset,
offset = dissect_ber_old_choice(actx, tr, tvb, offset,
Filter_choice, -1, ett_ldap_Filter,
NULL);

6
asn1/mms/mms.cnf
View File

@ -31,12 +31,10 @@ MMSpdu
#.FN_BODY ApplicationReference/ae-invocation-id
offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, actx, tree, hf_mms_ae_invocation_id);
#.FN_BODY MMSpdu
#.FN_BODY MMSpdu VAL_PTR=&branch_taken
gint branch_taken;
offset = dissect_ber_choice(actx, tree, tvb, offset,
MMSpdu_choice, hf_index, ett_mms_MMSpdu,
&branch_taken);
%(DEFAULT_BODY)s
if(check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", val_to_str(branch_taken, mms_MMSpdu_vals, "Unknown"));

2
asn1/rtse/rtse.cnf
View File

@ -108,7 +108,7 @@ EXTERNALt
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt);
#.FN_BODY EXTERNALt/indirect-reference

2
asn1/tcap/packet-tcap-template.c
View File

@ -503,7 +503,7 @@ dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (!next_tvb)
return offset+len;
dissect_ber_choice(actx, tree, next_tvb, 0,
dissect_ber_old_choice(actx, tree, next_tvb, 0,
Component_choice, hf_index, ett_tcap_Component,NULL);

2
asn1/tcap/tcap.cnf
View File

@ -152,7 +152,7 @@ if (! (subdissector_handle = get_ansi_tcap_subdissector(actx->pinfo->match_port)
call_dissector(subdissector_handle, next_tvb, actx->pinfo, tcap_top_tree);
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU,NULL);
#.FN_BODY OrigTransactionID

4
asn1/x411/x411.cnf
View File

@ -284,7 +284,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
if(doing_address)
g_strlcat(oraddress, "/C=", MAX_ORA_STR_LEN);
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CountryName_choice, hf_index, ett_x411_CountryName, NULL);
@ -306,7 +306,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
if(doing_address)
g_strlcat(oraddress, "/A=", MAX_ORA_STR_LEN);
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AdministrationDomainName_choice, hf_index, ett_x411_AdministrationDomainName, NULL);
#.FN_BODY ContentIdentifier

2
epan/asn1.h
View File

@ -54,7 +54,7 @@ typedef struct _asn1_ctx_t {
tvbuff_t *arbitrary;
union {
struct {
int (*ber_callback)(proto_tree *tree, tvbuff_t *tvb, int offset, struct _asn1_ctx_t*);
int (*ber_callback)(gboolean imp_tag, tvbuff_t *tvb, int offset, struct _asn1_ctx_t* ,proto_tree *tree, int hf_index );
tvbuff_t *direct_reference;
gint32 indirect_reference;
guint32 encoding;

52
epan/dissectors/packet-MAP_DialoguePDU.c
View File

@ -108,7 +108,7 @@ static int dissect_extensionContainer(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t MAP_OpenInfo_sequence[] = {
static const ber_old_sequence_t MAP_OpenInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@ -117,8 +117,8 @@ static const ber_sequence_t MAP_OpenInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_OpenInfo(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,
MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
return offset;
}
@ -127,15 +127,15 @@ static int dissect_map_open_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t MAP_AcceptInfo_sequence[] = {
static const ber_old_sequence_t MAP_AcceptInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
};
static int
dissect_MAP_DialoguePDU_MAP_AcceptInfo(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,
MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
return offset;
}
@ -144,15 +144,15 @@ static int dissect_map_accept_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t MAP_CloseInfo_sequence[] = {
static const ber_old_sequence_t MAP_CloseInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
};
static int
dissect_MAP_DialoguePDU_MAP_CloseInfo(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,
MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
return offset;
}
@ -193,7 +193,7 @@ static int dissect_alternativeApplicationContext(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
static const ber_old_sequence_t MAP_RefuseInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alternativeApplicationContext },
@ -202,8 +202,8 @@ static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_RefuseInfo(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,
MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
return offset;
}
@ -278,7 +278,7 @@ static const value_string MAP_DialoguePDU_MAP_UserAbortChoice_vals[] = {
{ 0, NULL }
};
static const ber_choice_t MAP_UserAbortChoice_choice[] = {
static const ber_old_choice_t MAP_UserAbortChoice_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_userSpecificReason_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_userResourceLimitation_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_resourceUnavailable_impl },
@ -288,9 +288,9 @@ static const ber_choice_t MAP_UserAbortChoice_choice[] = {
static int
dissect_MAP_DialoguePDU_MAP_UserAbortChoice(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,
MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice,
NULL);
return offset;
}
@ -299,7 +299,7 @@ static int dissect_map_UserAbortChoice(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
static const ber_old_sequence_t MAP_UserAbortInfo_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
@ -307,8 +307,8 @@ static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_UserAbortInfo(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,
MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
return offset;
}
@ -336,7 +336,7 @@ static int dissect_map_ProviderAbortReason(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
static const ber_old_sequence_t MAP_ProviderAbortInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
@ -344,8 +344,8 @@ static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(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,
MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
return offset;
}
@ -364,7 +364,7 @@ static const value_string MAP_DialoguePDU_MAP_DialoguePDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t MAP_DialoguePDU_choice[] = {
static const ber_old_choice_t MAP_DialoguePDU_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_map_open_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_map_accept_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_map_close_impl },
@ -376,9 +376,9 @@ static const ber_choice_t MAP_DialoguePDU_choice[] = {
static int
dissect_MAP_DialoguePDU_MAP_DialoguePDU(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,
MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU,
NULL);
return offset;
}

114
epan/dissectors/packet-acp133.c
View File

@ -337,14 +337,14 @@ static int dissect_Addressees_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Addressees_sequence_of[1] = {
static const ber_old_sequence_t Addressees_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_Addressees_item },
};
static int
dissect_acp133_Addressees(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,
Addressees_sequence_of, hf_index, ett_acp133_Addressees);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Addressees_sequence_of, hf_index, ett_acp133_Addressees);
return offset;
}
@ -434,7 +434,7 @@ static int dissect_date(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t PairwiseTag_sequence[] = {
static const ber_old_sequence_t PairwiseTag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kmid },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_edition },
{ BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
@ -443,8 +443,8 @@ static const ber_sequence_t PairwiseTag_sequence[] = {
static int
dissect_acp133_PairwiseTag(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,
PairwiseTag_sequence, hf_index, ett_acp133_PairwiseTag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PairwiseTag_sequence, hf_index, ett_acp133_PairwiseTag);
return offset;
}
@ -466,7 +466,7 @@ static int dissect_ukm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t UKMEntry_sequence[] = {
static const ber_old_sequence_t UKMEntry_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tag },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ukm },
{ 0, 0, 0, NULL }
@ -474,8 +474,8 @@ static const ber_sequence_t UKMEntry_sequence[] = {
static int
dissect_acp133_UKMEntry(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,
UKMEntry_sequence, hf_index, ett_acp133_UKMEntry);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UKMEntry_sequence, hf_index, ett_acp133_UKMEntry);
return offset;
}
@ -484,14 +484,14 @@ static int dissect_ukm_entries_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SEQUENCE_OF_UKMEntry_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_UKMEntry_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ukm_entries_item },
};
static int
dissect_acp133_SEQUENCE_OF_UKMEntry(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_UKMEntry_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_UKMEntry);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_UKMEntry_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_UKMEntry);
return offset;
}
@ -514,7 +514,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t MonthlyUKMs_sequence[] = {
static const ber_old_sequence_t MonthlyUKMs_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ukm_entries },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -523,8 +523,8 @@ static const ber_sequence_t MonthlyUKMs_sequence[] = {
static int
dissect_acp133_MonthlyUKMs(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,
MonthlyUKMs_sequence, hf_index, ett_acp133_MonthlyUKMs);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MonthlyUKMs_sequence, hf_index, ett_acp133_MonthlyUKMs);
return offset;
}
@ -550,14 +550,14 @@ static int dissect_sHD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t Remarks_sequence_of[1] = {
static const ber_old_sequence_t Remarks_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_Remarks_item },
};
static int
dissect_acp133_Remarks(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,
Remarks_sequence_of, hf_index, ett_acp133_Remarks);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Remarks_sequence_of, hf_index, ett_acp133_Remarks);
return offset;
}
@ -601,7 +601,7 @@ static int dissect_originator_requested_alternate_recipient_removed(proto_tree *
}
static const ber_sequence_t RIParameters_set[] = {
static const ber_old_sequence_t RIParameters_set[] = {
{ BER_CLASS_CON, 0, 0, dissect_rI },
{ BER_CLASS_CON, 1, 0, dissect_rIType },
{ BER_CLASS_CON, 2, 0, dissect_minimize },
@ -612,8 +612,8 @@ static const ber_sequence_t RIParameters_set[] = {
static int
dissect_acp133_RIParameters(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(implicit_tag, actx, tree, tvb, offset,
RIParameters_set, hf_index, ett_acp133_RIParameters);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
RIParameters_set, hf_index, ett_acp133_RIParameters);
return offset;
}
@ -637,14 +637,14 @@ static int dissect_removed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_insteadOf_item },
};
static int
dissect_acp133_SEQUENCE_OF_GeneralNames(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_GeneralNames_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_GeneralNames);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_GeneralNames);
return offset;
}
@ -663,7 +663,7 @@ static const value_string acp133_MLReceiptPolicy_vals[] = {
{ 0, NULL }
};
static const ber_choice_t MLReceiptPolicy_choice[] = {
static const ber_old_choice_t MLReceiptPolicy_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_none },
{ 1, BER_CLASS_CON, 1, 0, dissect_insteadOf },
{ 2, BER_CLASS_CON, 2, 0, dissect_inAdditionTo },
@ -672,9 +672,9 @@ static const ber_choice_t MLReceiptPolicy_choice[] = {
static int
dissect_acp133_MLReceiptPolicy(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,
MLReceiptPolicy_choice, hf_index, ett_acp133_MLReceiptPolicy,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
MLReceiptPolicy_choice, hf_index, ett_acp133_MLReceiptPolicy,
NULL);
return offset;
}
@ -700,7 +700,7 @@ static const value_string acp133_DLSubmitPermission_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DLSubmitPermission_choice[] = {
static const ber_old_choice_t DLSubmitPermission_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_individual },
{ 1, BER_CLASS_CON, 1, 0, dissect_member_of_dl },
{ 2, BER_CLASS_CON, 2, 0, dissect_pattern_match },
@ -710,9 +710,9 @@ static const ber_choice_t DLSubmitPermission_choice[] = {
static int
dissect_acp133_DLSubmitPermission(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,
DLSubmitPermission_choice, hf_index, ett_acp133_DLSubmitPermission,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DLSubmitPermission_choice, hf_index, ett_acp133_DLSubmitPermission,
NULL);
return offset;
}
@ -928,7 +928,7 @@ static const value_string acp133_T_requested_delivery_method_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_requested_delivery_method_choice[] = {
static const ber_old_choice_t T_requested_delivery_method_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_unchanged },
{ 1, BER_CLASS_CON, 1, 0, dissect_removed },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_replaced },
@ -937,9 +937,9 @@ static const ber_choice_t T_requested_delivery_method_choice[] = {
static int
dissect_acp133_T_requested_delivery_method(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_requested_delivery_method_choice, hf_index, ett_acp133_T_requested_delivery_method,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_requested_delivery_method_choice, hf_index, ett_acp133_T_requested_delivery_method,
NULL);
return offset;
}
@ -948,7 +948,7 @@ static int dissect_requested_delivery_method(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t AlgorithmInformation_sequence[] = {
static const ber_old_sequence_t AlgorithmInformation_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_algorithm_identifier },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_originator_certificate_selector },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_recipient_certificate_selector },
@ -957,8 +957,8 @@ static const ber_sequence_t AlgorithmInformation_sequence[] = {
static int
dissect_acp133_AlgorithmInformation(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,
AlgorithmInformation_sequence, hf_index, ett_acp133_AlgorithmInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AlgorithmInformation_sequence, hf_index, ett_acp133_AlgorithmInformation);
return offset;
}
@ -970,14 +970,14 @@ static int dissect_token_signature_algorithm_preference_item(proto_tree *tree _U
}
static const ber_sequence_t SEQUENCE_OF_AlgorithmInformation_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_AlgorithmInformation_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_token_encryption_algorithm_preference_item },
};
static int
dissect_acp133_SEQUENCE_OF_AlgorithmInformation(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_AlgorithmInformation_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_AlgorithmInformation);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_AlgorithmInformation_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_AlgorithmInformation);
return offset;
}
@ -989,7 +989,7 @@ static int dissect_token_signature_algorithm_preference(proto_tree *tree _U_, tv
}
static const ber_sequence_t DLPolicy_set[] = {
static const ber_old_sequence_t DLPolicy_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_report_propagation },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_report_from_dl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_originating_MTA_report },
@ -1010,8 +1010,8 @@ static const ber_sequence_t DLPolicy_set[] = {
static int
dissect_acp133_DLPolicy(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(implicit_tag, actx, tree, tvb, offset,
DLPolicy_set, hf_index, ett_acp133_DLPolicy);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
DLPolicy_set, hf_index, ett_acp133_DLPolicy);
return offset;
}
@ -1031,14 +1031,14 @@ static int dissect_description(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SET_OF_ExtendedContentType_set_of[1] = {
static const ber_old_sequence_t SET_OF_ExtendedContentType_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_content_types_item },
};
static int
dissect_acp133_SET_OF_ExtendedContentType(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_ExtendedContentType_set_of, hf_index, ett_acp133_SET_OF_ExtendedContentType);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_ExtendedContentType_set_of, hf_index, ett_acp133_SET_OF_ExtendedContentType);
return offset;
}
@ -1047,7 +1047,7 @@ static int dissect_content_types(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t Capability_set[] = {
static const ber_old_sequence_t Capability_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_content_types },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_maximum_content_length },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_encoded_information_types_constraints },
@ -1057,8 +1057,8 @@ static const ber_sequence_t Capability_set[] = {
static int
dissect_acp133_Capability(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(implicit_tag, actx, tree, tvb, offset,
Capability_set, hf_index, ett_acp133_Capability);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
Capability_set, hf_index, ett_acp133_Capability);
return offset;
}
@ -1067,14 +1067,14 @@ static int dissect_capabilities_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t SET_OF_Capability_set_of[1] = {
static const ber_old_sequence_t SET_OF_Capability_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_capabilities_item },
};
static int
dissect_acp133_SET_OF_Capability(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_Capability_set_of, hf_index, ett_acp133_SET_OF_Capability);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Capability_set_of, hf_index, ett_acp133_SET_OF_Capability);
return offset;
}
@ -1083,7 +1083,7 @@ static int dissect_capabilities(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t AddressCapabilities_sequence[] = {
static const ber_old_sequence_t AddressCapabilities_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_description },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_address },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_capabilities },
@ -1092,8 +1092,8 @@ static const ber_sequence_t AddressCapabilities_sequence[] = {
static int
dissect_acp133_AddressCapabilities(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,
AddressCapabilities_sequence, hf_index, ett_acp133_AddressCapabilities);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AddressCapabilities_sequence, hf_index, ett_acp133_AddressCapabilities);
return offset;
}

210
epan/dissectors/packet-acse.c
View File

@ -413,7 +413,7 @@ static const value_string acse_T_encoding_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_encoding_choice[] = {
static const ber_old_choice_t T_encoding_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@ -422,9 +422,9 @@ static const ber_choice_t T_encoding_choice[] = {
static int
dissect_acse_T_encoding(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_encoding_choice, hf_index, ett_acse_T_encoding,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_encoding_choice, hf_index, ett_acse_T_encoding,
NULL);
return offset;
}
@ -433,7 +433,7 @@ static int dissect_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t EXTERNALt_sequence[] = {
static const ber_old_sequence_t EXTERNALt_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
@ -457,7 +457,7 @@ dissect_acse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt);
@ -564,7 +564,7 @@ const value_string acse_AP_title_vals[] = {
{ 0, NULL }
};
static const ber_choice_t AP_title_choice[] = {
static const ber_old_choice_t AP_title_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
@ -575,9 +575,9 @@ static const ber_choice_t AP_title_choice[] = {
int
dissect_acse_AP_title(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,
AP_title_choice, hf_index, ett_acse_AP_title,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AP_title_choice, hf_index, ett_acse_AP_title,
NULL);
return offset;
}
@ -654,7 +654,7 @@ const value_string acse_ASO_qualifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ASO_qualifier_choice[] = {
static const ber_old_choice_t ASO_qualifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form2 },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
@ -668,9 +668,9 @@ static const ber_choice_t ASO_qualifier_choice[] = {
int
dissect_acse_ASO_qualifier(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,
ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier,
NULL);
return offset;
}
@ -815,7 +815,7 @@ static int dissect_other_mechanism_value(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t Authentication_value_other_sequence[] = {
static const ber_old_sequence_t Authentication_value_other_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_name },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_value },
{ 0, 0, 0, NULL }
@ -823,8 +823,8 @@ static const ber_sequence_t Authentication_value_other_sequence[] = {
static int
dissect_acse_Authentication_value_other(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,
Authentication_value_other_sequence, hf_index, ett_acse_Authentication_value_other);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Authentication_value_other_sequence, hf_index, ett_acse_Authentication_value_other);
return offset;
}
@ -841,7 +841,7 @@ static const value_string acse_Authentication_value_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Authentication_value_choice[] = {
static const ber_old_choice_t Authentication_value_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_charstring_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bitstring_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_external_impl },
@ -851,9 +851,9 @@ static const ber_choice_t Authentication_value_choice[] = {
static int
dissect_acse_Authentication_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
Authentication_value_choice, hf_index, ett_acse_Authentication_value,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Authentication_value_choice, hf_index, ett_acse_Authentication_value,
NULL);
return offset;
}
@ -865,14 +865,14 @@ static int dissect_responding_authentication_value(proto_tree *tree _U_, tvbuff_
}
static const ber_sequence_t ASO_context_name_list_sequence_of[1] = {
static const ber_old_sequence_t ASO_context_name_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ASO_context_name_list_item },
};
static int
dissect_acse_ASO_context_name_list(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,
ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list);
return offset;
}
@ -944,14 +944,14 @@ static int dissect_transfer_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes_item },
};
static int
dissect_acse_SEQUENCE_OF_TransferSyntaxName(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_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName);
return offset;
}
@ -960,7 +960,7 @@ static int dissect_transfer_syntaxes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Context_list_item_sequence[] = {
static const ber_old_sequence_t Context_list_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pci },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes },
@ -969,8 +969,8 @@ static const ber_sequence_t Context_list_item_sequence[] = {
static int
dissect_acse_Context_list_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,
Context_list_item_sequence, hf_index, ett_acse_Context_list_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Context_list_item_sequence, hf_index, ett_acse_Context_list_item);
return offset;
}
@ -979,14 +979,14 @@ static int dissect_Context_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Context_list_sequence_of[1] = {
static const ber_old_sequence_t Context_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item },
};
static int
dissect_acse_Context_list(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,
Context_list_sequence_of, hf_index, ett_acse_Context_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Context_list_sequence_of, hf_index, ett_acse_Context_list);
return offset;
}
@ -995,7 +995,7 @@ static int dissect_context_list(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t Default_Context_List_item_sequence[] = {
static const ber_old_sequence_t Default_Context_List_item_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abstract_syntax_name_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
{ 0, 0, 0, NULL }
@ -1003,8 +1003,8 @@ static const ber_sequence_t Default_Context_List_item_sequence[] = {
static int
dissect_acse_Default_Context_List_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,
Default_Context_List_item_sequence, hf_index, ett_acse_Default_Context_List_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Default_Context_List_item_sequence, hf_index, ett_acse_Default_Context_List_item);
return offset;
}
@ -1013,14 +1013,14 @@ static int dissect_Default_Context_List_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t Default_Context_List_sequence_of[1] = {
static const ber_old_sequence_t Default_Context_List_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Default_Context_List_item },
};
static int
dissect_acse_Default_Context_List(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,
Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List);
return offset;
}
@ -1035,7 +1035,7 @@ static const value_string acse_Syntactic_context_list_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Syntactic_context_list_choice[] = {
static const ber_old_choice_t Syntactic_context_list_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_context_list },
{ 1, BER_CLASS_CON, 1, 0, dissect_default_contact_list },
{ 0, 0, 0, 0, NULL }
@ -1043,9 +1043,9 @@ static const ber_choice_t Syntactic_context_list_choice[] = {
static int
dissect_acse_Syntactic_context_list(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,
Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list,
NULL);
return offset;
}
@ -1070,7 +1070,7 @@ static int dissect_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t ASOI_tag_item_sequence[] = {
static const ber_old_sequence_t ASOI_tag_item_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_qualifier },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_identifier },
{ 0, 0, 0, NULL }
@ -1078,8 +1078,8 @@ static const ber_sequence_t ASOI_tag_item_sequence[] = {
static int
dissect_acse_ASOI_tag_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,
ASOI_tag_item_sequence, hf_index, ett_acse_ASOI_tag_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ASOI_tag_item_sequence, hf_index, ett_acse_ASOI_tag_item);
return offset;
}
@ -1088,14 +1088,14 @@ static int dissect_ASOI_tag_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t ASOI_tag_sequence_of[1] = {
static const ber_old_sequence_t ASOI_tag_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ASOI_tag_item },
};
static int
dissect_acse_ASOI_tag(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,
ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag);
return offset;
}
@ -1107,14 +1107,14 @@ static int dissect_calling_asoi_tag_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t Association_data_sequence_of[1] = {
static const ber_old_sequence_t Association_data_sequence_of[1] = {
{ BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_Association_data_item },
};
static int
dissect_acse_Association_data(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,
Association_data_sequence_of, hf_index, ett_acse_Association_data);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Association_data_sequence_of, hf_index, ett_acse_Association_data);
return offset;
}
@ -1135,7 +1135,7 @@ static int dissect_aBRT_user_information_impl(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t AARQ_apdu_sequence[] = {
static const ber_old_sequence_t AARQ_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aARQ_protocol_version_impl },
{ BER_CLASS_CON, 1, 0, dissect_aARQ_aSO_context_name },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_called_AP_title },
@ -1160,8 +1160,8 @@ static const ber_sequence_t AARQ_apdu_sequence[] = {
static int
dissect_acse_AARQ_apdu(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,
AARQ_apdu_sequence, hf_index, ett_acse_AARQ_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AARQ_apdu_sequence, hf_index, ett_acse_AARQ_apdu);
return offset;
}
@ -1282,7 +1282,7 @@ static const value_string acse_Associate_source_diagnostic_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Associate_source_diagnostic_choice[] = {
static const ber_old_choice_t Associate_source_diagnostic_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_acse_service_user },
{ 2, BER_CLASS_CON, 2, 0, dissect_acse_service_provider },
{ 0, 0, 0, 0, NULL }
@ -1290,9 +1290,9 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = {
static int
dissect_acse_Associate_source_diagnostic(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,
Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic,
NULL);
return offset;
}
@ -1354,7 +1354,7 @@ static int dissect_provider_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t P_context_result_list_item_sequence[] = {
static const ber_old_sequence_t P_context_result_list_item_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pcontext_result_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concrete_syntax_name_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_provider_reason_impl },
@ -1363,8 +1363,8 @@ static const ber_sequence_t P_context_result_list_item_sequence[] = {
static int
dissect_acse_P_context_result_list_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,
P_context_result_list_item_sequence, hf_index, ett_acse_P_context_result_list_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
P_context_result_list_item_sequence, hf_index, ett_acse_P_context_result_list_item);
return offset;
}
@ -1373,14 +1373,14 @@ static int dissect_P_context_result_list_item(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t P_context_result_list_sequence_of[1] = {
static const ber_old_sequence_t P_context_result_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_P_context_result_list_item },
};
static int
dissect_acse_P_context_result_list(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,
P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list);
return offset;
}
@ -1389,7 +1389,7 @@ static int dissect_p_context_result_list_impl(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t AARE_apdu_sequence[] = {
static const ber_old_sequence_t AARE_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aARE_protocol_version_impl },
{ BER_CLASS_CON, 1, 0, dissect_aARE_aSO_context_name },
{ BER_CLASS_CON, 2, 0, dissect_aARE_result },
@ -1412,8 +1412,8 @@ static const ber_sequence_t AARE_apdu_sequence[] = {
static int
dissect_acse_AARE_apdu(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,
AARE_apdu_sequence, hf_index, ett_acse_AARE_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AARE_apdu_sequence, hf_index, ett_acse_AARE_apdu);
return offset;
}
@ -1452,7 +1452,7 @@ static int dissect_rLRQ_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t RLRQ_apdu_sequence[] = {
static const ber_old_sequence_t RLRQ_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rLRQ_reason_impl },
{ BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
{ BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
@ -1462,8 +1462,8 @@ static const ber_sequence_t RLRQ_apdu_sequence[] = {
static int
dissect_acse_RLRQ_apdu(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,
RLRQ_apdu_sequence, hf_index, ett_acse_RLRQ_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RLRQ_apdu_sequence, hf_index, ett_acse_RLRQ_apdu);
return offset;
}
@ -1502,7 +1502,7 @@ static int dissect_rLRE_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t RLRE_apdu_sequence[] = {
static const ber_old_sequence_t RLRE_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rLRE_reason_impl },
{ BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
{ BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
@ -1512,8 +1512,8 @@ static const ber_sequence_t RLRE_apdu_sequence[] = {
static int
dissect_acse_RLRE_apdu(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,
RLRE_apdu_sequence, hf_index, ett_acse_RLRE_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RLRE_apdu_sequence, hf_index, ett_acse_RLRE_apdu);
return offset;
}
@ -1564,7 +1564,7 @@ static int dissect_abort_diagnostic_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t ABRT_apdu_sequence[] = {
static const ber_old_sequence_t ABRT_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abort_source_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abort_diagnostic_impl },
{ BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
@ -1575,8 +1575,8 @@ static const ber_sequence_t ABRT_apdu_sequence[] = {
static int
dissect_acse_ABRT_apdu(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,
ABRT_apdu_sequence, hf_index, ett_acse_ABRT_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ABRT_apdu_sequence, hf_index, ett_acse_ABRT_apdu);
return offset;
}
@ -1635,7 +1635,7 @@ static const value_string acse_T_presentation_data_values_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_presentation_data_values_choice[] = {
static const ber_old_choice_t T_presentation_data_values_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_simple_ASN1_type },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@ -1644,9 +1644,9 @@ static const ber_choice_t T_presentation_data_values_choice[] = {
static int
dissect_acse_T_presentation_data_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values,
NULL);
return offset;
}
@ -1655,7 +1655,7 @@ static int dissect_presentation_data_values(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PDV_list_sequence[] = {
static const ber_old_sequence_t PDV_list_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_presentation_data_values },
@ -1664,8 +1664,8 @@ static const ber_sequence_t PDV_list_sequence[] = {
static int
dissect_acse_PDV_list(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,
PDV_list_sequence, hf_index, ett_acse_PDV_list);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PDV_list_sequence, hf_index, ett_acse_PDV_list);
return offset;
}
@ -1681,7 +1681,7 @@ static const value_string acse_User_Data_vals[] = {
{ 0, NULL }
};
static const ber_choice_t User_Data_choice[] = {
static const ber_old_choice_t User_Data_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_user_information },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_simply_encoded_data },
{ 2, BER_CLASS_CON, 0, 0, dissect_fully_encoded_data },
@ -1690,9 +1690,9 @@ static const ber_choice_t User_Data_choice[] = {
static int
dissect_acse_User_Data(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,
User_Data_choice, hf_index, ett_acse_User_Data,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
User_Data_choice, hf_index, ett_acse_User_Data,
NULL);
return offset;
}
@ -1701,7 +1701,7 @@ static int dissect_a_user_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t A_DT_apdu_sequence[] = {
static const ber_old_sequence_t A_DT_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
{ BER_CLASS_CON, 30, BER_FLAGS_NOTCHKTAG, dissect_a_user_data },
@ -1710,8 +1710,8 @@ static const ber_sequence_t A_DT_apdu_sequence[] = {
static int
dissect_acse_A_DT_apdu(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,
A_DT_apdu_sequence, hf_index, ett_acse_A_DT_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
A_DT_apdu_sequence, hf_index, ett_acse_A_DT_apdu);
return offset;
}
@ -1736,7 +1736,7 @@ static int dissect_aCRQ_aSO_context_name_impl(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t ACRQ_apdu_sequence[] = {
static const ber_old_sequence_t ACRQ_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aCRQ_aSO_context_name_impl },
@ -1748,8 +1748,8 @@ static const ber_sequence_t ACRQ_apdu_sequence[] = {
static int
dissect_acse_ACRQ_apdu(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,
ACRQ_apdu_sequence, hf_index, ett_acse_ACRQ_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ACRQ_apdu_sequence, hf_index, ett_acse_ACRQ_apdu);
return offset;
}
@ -1774,7 +1774,7 @@ static int dissect_aSO_context_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t ACRP_apdu_sequence[] = {
static const ber_old_sequence_t ACRP_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_impl },
@ -1785,8 +1785,8 @@ static const ber_sequence_t ACRP_apdu_sequence[] = {
static int
dissect_acse_ACRP_apdu(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,
ACRP_apdu_sequence, hf_index, ett_acse_ACRP_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ACRP_apdu_sequence, hf_index, ett_acse_ACRP_apdu);
return offset;
}
@ -1810,7 +1810,7 @@ static const value_string acse_ACSE_apdu_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ACSE_apdu_choice[] = {
static const ber_old_choice_t ACSE_apdu_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_IMPLTAG, dissect_aarq_impl },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_aare_impl },
{ 2, BER_CLASS_APP, 2, BER_FLAGS_IMPLTAG, dissect_rlrq_impl },
@ -1830,9 +1830,9 @@ static const ber_choice_t ACSE_apdu_choice[] = {
static int
dissect_acse_ACSE_apdu(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,
ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu,
NULL);
return offset;
}
@ -1877,7 +1877,7 @@ static const value_string acse_AE_title_vals[] = {
{ 0, NULL }
};
static const ber_choice_t AE_title_choice[] = {
static const ber_old_choice_t AE_title_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 },
{ 0, 0, 0, 0, NULL }
@ -1885,9 +1885,9 @@ static const ber_choice_t AE_title_choice[] = {
static int
dissect_acse_AE_title(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,
AE_title_choice, hf_index, ett_acse_AE_title,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AE_title_choice, hf_index, ett_acse_AE_title,
NULL);
return offset;
}

1268
epan/dissectors/packet-ansi_map.c
View File

File diff suppressed because it is too large Load Diff

1034
epan/dissectors/packet-ber.c
View File

File diff suppressed because it is too large Load Diff

45
epan/dissectors/packet-ber.h
View File

@ -38,8 +38,12 @@ if (check_col(pinfo->cinfo, COL_INFO)){ \
} \
tvb_get_guint8(tvb, 9999);
typedef int (*ber_callback)(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
typedef int (*ber_callback)(gboolean imp_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
typedef int (*ber_type_fn)(gboolean, tvbuff_t*, int, asn1_ctx_t *actx, proto_tree*, int);
/* To be removed when the transition to the "New" type is complete */
typedef int (*ber_old_callback)(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
typedef int (*ber_old_type_fn)(gboolean, tvbuff_t*, int, asn1_ctx_t *actx, proto_tree*, int);
#define BER_CLASS_UNI 0
@ -105,6 +109,7 @@ extern int dissect_ber_tagged_type(gboolean implicit_tag, asn1_ctx_t *actx, prot
extern int dissect_ber_octet_string(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
extern int dissect_ber_old_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_old_callback func);
extern int dissect_ber_integer64(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value);
@ -122,33 +127,55 @@ extern int dissect_ber_external_type(gboolean implicit_tag, proto_tree *parent_t
#define BER_FLAGS_NOOWNTAG 0x00000004
#define BER_FLAGS_NOTCHKTAG 0x00000008
typedef struct _ber_sequence_t {
const int *p_id;
gint8 class;
gint32 tag;
guint32 flags;
ber_callback func;
} ber_sequence_t;
/* this function dissects a BER sequence
/* To be removed when the transition to the "New" type is complete */
typedef struct _ber_old_sequence_t {
gint8 class;
gint32 tag;
guint32 flags;
ber_old_callback func;
} ber_old_sequence_t;
/*
* This function dissects a BER sequence
*/
extern int dissect_ber_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
extern int dissect_ber_set(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
/* To be removed when the transition to the "New" type is complete */
extern int dissect_ber_old_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
extern int dissect_ber_old_set(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
typedef struct _ber_choice_t {
guint32 value;
const int *p_id;
gint8 class;
gint32 tag;
guint32 flags;
ber_callback func;
} ber_choice_t;
/* this function dissects a BER choice
typedef struct _ber_old_choice_t {
guint32 value;
gint8 class;
gint32 tag;
guint32 flags;
ber_old_callback func;
} ber_old_choice_t;
/*
* This function dissects a BER choice
*/
extern int dissect_ber_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken);
/* To be removed when the transition to the "New" type is complete */
extern int dissect_ber_old_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken);
/* this function dissects a BER strings
/*
* This function dissects a BER strings
*/
extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
extern int dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len);
@ -165,6 +192,10 @@ extern int dissect_ber_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, prot
extern int dissect_ber_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
/* To be removed when the transition to the "New" type is complete */
extern int dissect_ber_old_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
extern int dissect_ber_old_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);

1290
epan/dissectors/packet-camel.c
View File

File diff suppressed because it is too large Load Diff

28
epan/dissectors/packet-cdt.c
View File

@ -164,7 +164,7 @@ static const value_string cdt_CompressionAlgorithmIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CompressionAlgorithmIdentifier_choice[] = {
static const ber_old_choice_t CompressionAlgorithmIdentifier_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_algorithmID_ShortForm_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_algorithmID_OID_impl },
{ 0, 0, 0, 0, NULL }
@ -172,9 +172,9 @@ static const ber_choice_t CompressionAlgorithmIdentifier_choice[] = {
static int
dissect_cdt_CompressionAlgorithmIdentifier(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,
CompressionAlgorithmIdentifier_choice, hf_index, ett_cdt_CompressionAlgorithmIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CompressionAlgorithmIdentifier_choice, hf_index, ett_cdt_CompressionAlgorithmIdentifier,
NULL);
return offset;
}
@ -225,7 +225,7 @@ static const value_string cdt_T_contentType_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_contentType_choice[] = {
static const ber_old_choice_t T_contentType_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contentType_ShortForm_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_contentType_OID_impl },
{ 0, 0, 0, 0, NULL }
@ -233,9 +233,9 @@ static const ber_choice_t T_contentType_choice[] = {
static int
dissect_cdt_T_contentType(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_contentType_choice, hf_index, ett_cdt_T_contentType,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_contentType_choice, hf_index, ett_cdt_T_contentType,
NULL);
return offset;
}
@ -293,7 +293,7 @@ static int dissect_compressedContent(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t CompressedContentInfo_sequence[] = {
static const ber_old_sequence_t CompressedContentInfo_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contentType },
{ BER_CLASS_CON, 0, 0, dissect_compressedContent },
{ 0, 0, 0, NULL }
@ -301,8 +301,8 @@ static const ber_sequence_t CompressedContentInfo_sequence[] = {
static int
dissect_cdt_CompressedContentInfo(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,
CompressedContentInfo_sequence, hf_index, ett_cdt_CompressedContentInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CompressedContentInfo_sequence, hf_index, ett_cdt_CompressedContentInfo);
return offset;
}
@ -311,7 +311,7 @@ static int dissect_compressedContentInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t CompressedData_sequence[] = {
static const ber_old_sequence_t CompressedData_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_compressionAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_compressedContentInfo },
{ 0, 0, 0, NULL }
@ -319,8 +319,8 @@ static const ber_sequence_t CompressedData_sequence[] = {
int
dissect_cdt_CompressedData(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,
CompressedData_sequence, hf_index, ett_cdt_CompressedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CompressedData_sequence, hf_index, ett_cdt_CompressedData);
return offset;
}

448
epan/dissectors/packet-cmip.c
View File

File diff suppressed because it is too large Load Diff

208
epan/dissectors/packet-cmp.c
View File

@ -434,14 +434,14 @@ static int dissect_PKIFreeText_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t PKIFreeText_sequence_of[1] = {
static const ber_old_sequence_t PKIFreeText_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_PKIFreeText_item },
};
int
dissect_cmp_PKIFreeText(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,
PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText);
return offset;
}
@ -483,7 +483,7 @@ static int dissect_infoValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t InfoTypeAndValue_sequence[] = {
static const ber_old_sequence_t InfoTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_infoType },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_infoValue },
{ 0, 0, 0, NULL }
@ -491,8 +491,8 @@ static const ber_sequence_t InfoTypeAndValue_sequence[] = {
int
dissect_cmp_InfoTypeAndValue(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,
InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
return offset;
}
@ -507,14 +507,14 @@ static int dissect_GenRepContent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_generalInfo_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(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_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue);
return offset;
}
@ -523,7 +523,7 @@ static int dissect_generalInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t PKIHeader_sequence[] = {
static const ber_old_sequence_t PKIHeader_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pvno },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_sender },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_recipient },
@ -541,8 +541,8 @@ static const ber_sequence_t PKIHeader_sequence[] = {
int
dissect_cmp_PKIHeader(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,
PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
return offset;
}
@ -551,14 +551,14 @@ static int dissect_header(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extraCerts_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(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_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate);
return offset;
}
@ -646,7 +646,7 @@ static int dissect_failInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PKIStatusInfo_sequence[] = {
static const ber_old_sequence_t PKIStatusInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statusString },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
@ -655,8 +655,8 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
int
dissect_cmp_PKIStatusInfo(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,
PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
return offset;
}
@ -677,7 +677,7 @@ const value_string cmp_CertOrEncCert_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CertOrEncCert_choice[] = {
static const ber_old_choice_t CertOrEncCert_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_certificate },
{ 1, BER_CLASS_CON, 1, 0, dissect_encryptedCert },
{ 0, 0, 0, 0, NULL }
@ -685,9 +685,9 @@ static const ber_choice_t CertOrEncCert_choice[] = {
int
dissect_cmp_CertOrEncCert(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,
CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert,
NULL);
return offset;
}
@ -696,7 +696,7 @@ static int dissect_certOrEncCert(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t CertifiedKeyPair_sequence[] = {
static const ber_old_sequence_t CertifiedKeyPair_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_privateKey },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_publicationInfo },
@ -705,8 +705,8 @@ static const ber_sequence_t CertifiedKeyPair_sequence[] = {
int
dissect_cmp_CertifiedKeyPair(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,
CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
return offset;
}
@ -718,7 +718,7 @@ static int dissect_keyPairHist_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t CertResponse_sequence[] = {
static const ber_old_sequence_t CertResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certifiedKeyPair },
@ -728,8 +728,8 @@ static const ber_sequence_t CertResponse_sequence[] = {
int
dissect_cmp_CertResponse(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,
CertResponse_sequence, hf_index, ett_cmp_CertResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertResponse_sequence, hf_index, ett_cmp_CertResponse);
return offset;
}
@ -738,14 +738,14 @@ static int dissect_response_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response_item },
};
static int
dissect_cmp_SEQUENCE_OF_CertResponse(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_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse);
return offset;
}
@ -754,7 +754,7 @@ static int dissect_response(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t CertRepMessage_sequence[] = {
static const ber_old_sequence_t CertRepMessage_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caPubs },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response },
{ 0, 0, 0, NULL }
@ -762,8 +762,8 @@ static const ber_sequence_t CertRepMessage_sequence[] = {
int
dissect_cmp_CertRepMessage(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,
CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
return offset;
}
@ -781,7 +781,7 @@ static int dissect_ccp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t Challenge_sequence[] = {
static const ber_old_sequence_t Challenge_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_witness },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_challenge },
@ -790,8 +790,8 @@ static const ber_sequence_t Challenge_sequence[] = {
int
dissect_cmp_Challenge(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,
Challenge_sequence, hf_index, ett_cmp_Challenge);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Challenge_sequence, hf_index, ett_cmp_Challenge);
return offset;
}
@ -800,14 +800,14 @@ static int dissect_POPODecKeyChallContent_item(proto_tree *tree _U_, tvbuff_t *t
}
static const ber_sequence_t POPODecKeyChallContent_sequence_of[1] = {
static const ber_old_sequence_t POPODecKeyChallContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyChallContent_item },
};
int
dissect_cmp_POPODecKeyChallContent(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,
POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent);
return offset;
}
@ -816,14 +816,14 @@ static int dissect_popdecc(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t POPODecKeyRespContent_sequence_of[1] = {
static const ber_old_sequence_t POPODecKeyRespContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyRespContent_item },
};
int
dissect_cmp_POPODecKeyRespContent(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,
POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent);
return offset;
}
@ -832,14 +832,14 @@ static int dissect_popdecr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyPairHist_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(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_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair);
return offset;
}
@ -848,7 +848,7 @@ static int dissect_keyPairHist(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t KeyRecRepContent_sequence[] = {
static const ber_old_sequence_t KeyRecRepContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_newSigCert },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caCerts },
@ -858,8 +858,8 @@ static const ber_sequence_t KeyRecRepContent_sequence[] = {
int
dissect_cmp_KeyRecRepContent(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,
KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
return offset;
}
@ -868,7 +868,7 @@ static int dissect_krp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t RevDetails_sequence[] = {
static const ber_old_sequence_t RevDetails_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revocationReason },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_badSinceDate },
@ -878,8 +878,8 @@ static const ber_sequence_t RevDetails_sequence[] = {
int
dissect_cmp_RevDetails(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,
RevDetails_sequence, hf_index, ett_cmp_RevDetails);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RevDetails_sequence, hf_index, ett_cmp_RevDetails);
return offset;
}
@ -888,14 +888,14 @@ static int dissect_RevReqContent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t RevReqContent_sequence_of[1] = {
static const ber_old_sequence_t RevReqContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RevReqContent_item },
};
int
dissect_cmp_RevReqContent(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,
RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent);
return offset;
}
@ -904,14 +904,14 @@ static int dissect_rr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(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_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo);
return offset;
}
@ -920,14 +920,14 @@ static int dissect_status2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revCerts_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(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_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId);
return offset;
}
@ -936,14 +936,14 @@ static int dissect_revCerts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_crls_item },
};
static int
dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(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_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList);
return offset;
}
@ -952,7 +952,7 @@ static int dissect_crls(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t RevRepContent_sequence[] = {
static const ber_old_sequence_t RevRepContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status2 },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revCerts },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crls },
@ -961,8 +961,8 @@ static const ber_sequence_t RevRepContent_sequence[] = {
int
dissect_cmp_RevRepContent(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,
RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
return offset;
}
@ -971,7 +971,7 @@ static int dissect_rp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
}
static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
static const ber_old_sequence_t CAKeyUpdAnnContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_oldWithNew },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithOld },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithNew },
@ -980,8 +980,8 @@ static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
int
dissect_cmp_CAKeyUpdAnnContent(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,
CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
return offset;
}
@ -1002,7 +1002,7 @@ static int dissect_cann(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t RevAnnContent_sequence[] = {
static const ber_old_sequence_t RevAnnContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certId },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_willBeRevokedAt },
@ -1013,8 +1013,8 @@ static const ber_sequence_t RevAnnContent_sequence[] = {
int
dissect_cmp_RevAnnContent(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,
RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
return offset;
}
@ -1023,14 +1023,14 @@ static int dissect_rann(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t CRLAnnContent_sequence_of[1] = {
static const ber_old_sequence_t CRLAnnContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLAnnContent_item },
};
int
dissect_cmp_CRLAnnContent(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,
CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent);
return offset;
}
@ -1063,14 +1063,14 @@ static int dissect_nested(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t GenMsgContent_sequence_of[1] = {
static const ber_old_sequence_t GenMsgContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenMsgContent_item },
};
int
dissect_cmp_GenMsgContent(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,
GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent);
return offset;
}
@ -1079,14 +1079,14 @@ static int dissect_genm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t GenRepContent_sequence_of[1] = {
static const ber_old_sequence_t GenRepContent_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenRepContent_item },
};
int
dissect_cmp_GenRepContent(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,
GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent);
return offset;
}
@ -1095,7 +1095,7 @@ static int dissect_genp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t ErrorMsgContent_sequence[] = {
static const ber_old_sequence_t ErrorMsgContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pKIStatusInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorCode },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorDetails },
@ -1104,8 +1104,8 @@ static const ber_sequence_t ErrorMsgContent_sequence[] = {
int
dissect_cmp_ErrorMsgContent(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,
ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
return offset;
}
@ -1141,7 +1141,7 @@ const value_string cmp_PKIBody_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PKIBody_choice[] = {
static const ber_old_choice_t PKIBody_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_ir },
{ 1, BER_CLASS_CON, 1, 0, dissect_ip },
{ 2, BER_CLASS_CON, 2, 0, dissect_cr },
@ -1170,9 +1170,9 @@ static const ber_choice_t PKIBody_choice[] = {
int
dissect_cmp_PKIBody(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,
PKIBody_choice, hf_index, ett_cmp_PKIBody,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PKIBody_choice, hf_index, ett_cmp_PKIBody,
NULL);
return offset;
}
@ -1195,7 +1195,7 @@ static int dissect_protection(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t PKIMessage_sequence[] = {
static const ber_old_sequence_t PKIMessage_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_protection },
@ -1205,14 +1205,14 @@ static const ber_sequence_t PKIMessage_sequence[] = {
int
dissect_cmp_PKIMessage(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,
PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
return offset;
}
static const ber_sequence_t ProtectedPart_sequence[] = {
static const ber_old_sequence_t ProtectedPart_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ 0, 0, 0, NULL }
@ -1220,8 +1220,8 @@ static const ber_sequence_t ProtectedPart_sequence[] = {
int
dissect_cmp_ProtectedPart(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,
ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
return offset;
}
@ -1236,7 +1236,7 @@ dissect_cmp_PasswordBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t PBMParameter_sequence[] = {
static const ber_old_sequence_t PBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
@ -1246,8 +1246,8 @@ static const ber_sequence_t PBMParameter_sequence[] = {
int
dissect_cmp_PBMParameter(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,
PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
return offset;
}
@ -1262,7 +1262,7 @@ dissect_cmp_DHBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t DHBMParameter_sequence[] = {
static const ber_old_sequence_t DHBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac },
{ 0, 0, 0, NULL }
@ -1270,8 +1270,8 @@ static const ber_sequence_t DHBMParameter_sequence[] = {
int
dissect_cmp_DHBMParameter(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,
DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
return offset;
}
@ -1300,7 +1300,7 @@ static int dissect_hashVal(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t OOBCertHash_sequence[] = {
static const ber_old_sequence_t OOBCertHash_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_hashAlg },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_certId },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_hashVal },
@ -1309,8 +1309,8 @@ static const ber_sequence_t OOBCertHash_sequence[] = {
int
dissect_cmp_OOBCertHash(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,
OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
return offset;
}

294
epan/dissectors/packet-cms.c
View File

@ -365,7 +365,7 @@ static int dissect_content(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t ContentInfo_sequence[] = {
static const ber_old_sequence_t ContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ BER_CLASS_CON, 0, 0, dissect_content },
{ 0, 0, 0, NULL }
@ -375,8 +375,8 @@ int
dissect_cms_ContentInfo(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 64 "cms.cnf"
top_tree = tree;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
content_tvb = NULL;
top_tree = NULL;
@ -427,14 +427,14 @@ static int dissect_digestAlgorithm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = {
static const ber_old_sequence_t DigestAlgorithmIdentifiers_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DigestAlgorithmIdentifiers_item },
};
int
dissect_cms_DigestAlgorithmIdentifiers(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,
DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers);
return offset;
}
@ -473,7 +473,7 @@ static int dissect_eContent(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
static const ber_old_sequence_t EncapsulatedContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eContentType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_eContent },
{ 0, 0, 0, NULL }
@ -481,8 +481,8 @@ static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
int
dissect_cms_EncapsulatedContentInfo(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,
EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
return offset;
}
@ -530,14 +530,14 @@ static int dissect_attrValues_item(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_attrValues_item },
};
static int
dissect_cms_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_cms_SET_OF_AttributeValue);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeValue_set_of, hf_index, ett_cms_SET_OF_AttributeValue);
return offset;
}
@ -546,7 +546,7 @@ static int dissect_attrValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
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_attrType },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attrValues },
{ 0, 0, 0, NULL }
@ -554,8 +554,8 @@ static const ber_sequence_t Attribute_sequence[] = {
static int
dissect_cms_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_cms_Attribute);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Attribute_sequence, hf_index, ett_cms_Attribute);
return offset;
}
@ -576,14 +576,14 @@ static int dissect_UnauthAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t UnauthAttributes_set_of[1] = {
static const ber_old_sequence_t UnauthAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnauthAttributes_item },
};
static int
dissect_cms_UnauthAttributes(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,
UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
return offset;
}
@ -595,7 +595,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
static const ber_old_sequence_t ExtendedCertificateInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributes },
@ -604,8 +604,8 @@ static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
static int
dissect_cms_ExtendedCertificateInfo(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,
ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
return offset;
}
@ -640,7 +640,7 @@ static int dissect_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ExtendedCertificate_sequence[] = {
static const ber_old_sequence_t ExtendedCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extendedCertificateInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
@ -649,8 +649,8 @@ static const ber_sequence_t ExtendedCertificate_sequence[] = {
static int
dissect_cms_ExtendedCertificate(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,
ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
return offset;
}
@ -666,7 +666,7 @@ static const value_string cms_CertificateChoices_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CertificateChoices_choice[] = {
static const ber_old_choice_t CertificateChoices_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extendedCertificate_impl },
{ 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attrCert_impl },
@ -675,9 +675,9 @@ static const ber_choice_t CertificateChoices_choice[] = {
static int
dissect_cms_CertificateChoices(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,
CertificateChoices_choice, hf_index, ett_cms_CertificateChoices,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CertificateChoices_choice, hf_index, ett_cms_CertificateChoices,
NULL);
return offset;
}
@ -686,14 +686,14 @@ static int dissect_CertificateSet_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t CertificateSet_set_of[1] = {
static const ber_old_sequence_t CertificateSet_set_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item },
};
static int
dissect_cms_CertificateSet(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,
CertificateSet_set_of, hf_index, ett_cms_CertificateSet);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
CertificateSet_set_of, hf_index, ett_cms_CertificateSet);
return offset;
}
@ -705,14 +705,14 @@ static int dissect_certs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t CertificateRevocationLists_set_of[1] = {
static const ber_old_sequence_t CertificateRevocationLists_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificateRevocationLists_item },
};
static int
dissect_cms_CertificateRevocationLists(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,
CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists);
return offset;
}
@ -721,7 +721,7 @@ static int dissect_crls_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
static const ber_old_sequence_t IssuerAndSerialNumber_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
@ -729,8 +729,8 @@ static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
int
dissect_cms_IssuerAndSerialNumber(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,
IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
return offset;
}
@ -767,7 +767,7 @@ const value_string cms_SignerIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SignerIdentifier_choice[] = {
static const ber_old_choice_t SignerIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
{ 0, 0, 0, 0, NULL }
@ -775,9 +775,9 @@ static const ber_choice_t SignerIdentifier_choice[] = {
int
dissect_cms_SignerIdentifier(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,
SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier,
NULL);
return offset;
}
@ -786,14 +786,14 @@ static int dissect_sid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t SignedAttributes_set_of[1] = {
static const ber_old_sequence_t SignedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignedAttributes_item },
};
int
dissect_cms_SignedAttributes(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,
SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
return offset;
}
@ -815,14 +815,14 @@ static int dissect_signatureValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t UnsignedAttributes_set_of[1] = {
static const ber_old_sequence_t UnsignedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnsignedAttributes_item },
};
int
dissect_cms_UnsignedAttributes(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,
UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
return offset;
}
@ -831,7 +831,7 @@ static int dissect_unsignedAttrs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t SignerInfo_sequence[] = {
static const ber_old_sequence_t SignerInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
@ -844,8 +844,8 @@ static const ber_sequence_t SignerInfo_sequence[] = {
int
dissect_cms_SignerInfo(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,
SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
return offset;
}
@ -854,14 +854,14 @@ static int dissect_SignerInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SignerInfos_set_of[1] = {
static const ber_old_sequence_t SignerInfos_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignerInfos_item },
};
int
dissect_cms_SignerInfos(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,
SignerInfos_set_of, hf_index, ett_cms_SignerInfos);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SignerInfos_set_of, hf_index, ett_cms_SignerInfos);
return offset;
}
@ -870,7 +870,7 @@ static int dissect_signerInfos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SignedData_sequence[] = {
static const ber_old_sequence_t SignedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithms },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo },
@ -882,14 +882,14 @@ static const ber_sequence_t SignedData_sequence[] = {
int
dissect_cms_SignedData(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,
SignedData_sequence, hf_index, ett_cms_SignedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SignedData_sequence, hf_index, ett_cms_SignedData);
return offset;
}
static const ber_sequence_t OriginatorInfo_sequence[] = {
static const ber_old_sequence_t OriginatorInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certs_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_crls_impl },
{ 0, 0, 0, NULL }
@ -897,8 +897,8 @@ static const ber_sequence_t OriginatorInfo_sequence[] = {
static int
dissect_cms_OriginatorInfo(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,
OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
return offset;
}
@ -913,7 +913,7 @@ static const value_string cms_RecipientIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RecipientIdentifier_choice[] = {
static const ber_old_choice_t RecipientIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
{ 0, 0, 0, 0, NULL }
@ -921,9 +921,9 @@ static const ber_choice_t RecipientIdentifier_choice[] = {
static int
dissect_cms_RecipientIdentifier(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,
RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier,
NULL);
return offset;
}
@ -957,7 +957,7 @@ static int dissect_encryptedKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
static const ber_old_sequence_t KeyTransRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
@ -967,8 +967,8 @@ static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
static int
dissect_cms_KeyTransRecipientInfo(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,
KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
return offset;
}
@ -991,7 +991,7 @@ static int dissect_publicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t OriginatorPublicKey_sequence[] = {
static const ber_old_sequence_t OriginatorPublicKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_publicKey },
{ 0, 0, 0, NULL }
@ -999,8 +999,8 @@ static const ber_sequence_t OriginatorPublicKey_sequence[] = {
static int
dissect_cms_OriginatorPublicKey(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,
OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
return offset;
}
@ -1016,7 +1016,7 @@ static const value_string cms_OriginatorIdentifierOrKey_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
static const ber_old_choice_t OriginatorIdentifierOrKey_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
{ 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originatorKey_impl },
@ -1025,9 +1025,9 @@ static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
static int
dissect_cms_OriginatorIdentifierOrKey(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,
OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey,
NULL);
return offset;
}
@ -1092,7 +1092,7 @@ static int dissect_keyAttr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t OtherKeyAttribute_sequence[] = {
static const ber_old_sequence_t OtherKeyAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_keyAttrId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyAttr },
{ 0, 0, 0, NULL }
@ -1100,8 +1100,8 @@ static const ber_sequence_t OtherKeyAttribute_sequence[] = {
static int
dissect_cms_OtherKeyAttribute(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,
OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
return offset;
}
@ -1110,7 +1110,7 @@ static int dissect_other(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
static const ber_old_sequence_t RecipientKeyIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other },
@ -1119,8 +1119,8 @@ static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
static int
dissect_cms_RecipientKeyIdentifier(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,
RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
return offset;
}
@ -1138,7 +1138,7 @@ static const value_string cms_KeyAgreeRecipientIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = {
static const ber_old_choice_t KeyAgreeRecipientIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rKeyId_impl },
{ 0, 0, 0, 0, NULL }
@ -1146,9 +1146,9 @@ static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = {
static int
dissect_cms_KeyAgreeRecipientIdentifier(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,
KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier,
NULL);
return offset;
}
@ -1157,7 +1157,7 @@ static int dissect_rekRid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
static const ber_old_sequence_t RecipientEncryptedKey_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey },
{ 0, 0, 0, NULL }
@ -1165,8 +1165,8 @@ static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
static int
dissect_cms_RecipientEncryptedKey(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,
RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
return offset;
}
@ -1175,14 +1175,14 @@ static int dissect_RecipientEncryptedKeys_item(proto_tree *tree _U_, tvbuff_t *t
}
static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = {
static const ber_old_sequence_t RecipientEncryptedKeys_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientEncryptedKeys_item },
};
static int
dissect_cms_RecipientEncryptedKeys(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,
RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys);
return offset;
}
@ -1191,7 +1191,7 @@ static int dissect_recipientEncryptedKeys(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
static const ber_old_sequence_t KeyAgreeRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_originator },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ukm },
@ -1202,8 +1202,8 @@ static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
static int
dissect_cms_KeyAgreeRecipientInfo(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,
KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
return offset;
}
@ -1228,7 +1228,7 @@ static int dissect_iv(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
}
static const ber_sequence_t KEKIdentifier_sequence[] = {
static const ber_old_sequence_t KEKIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_keyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other },
@ -1237,8 +1237,8 @@ static const ber_sequence_t KEKIdentifier_sequence[] = {
static int
dissect_cms_KEKIdentifier(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,
KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
return offset;
}
@ -1247,7 +1247,7 @@ static int dissect_kekid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t KEKRecipientInfo_sequence[] = {
static const ber_old_sequence_t KEKRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kekid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
@ -1257,8 +1257,8 @@ static const ber_sequence_t KEKRecipientInfo_sequence[] = {
static int
dissect_cms_KEKRecipientInfo(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,
KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
return offset;
}
@ -1274,7 +1274,7 @@ static const value_string cms_RecipientInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RecipientInfo_choice[] = {
static const ber_old_choice_t RecipientInfo_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_kari_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_kekri_impl },
@ -1283,9 +1283,9 @@ static const ber_choice_t RecipientInfo_choice[] = {
static int
dissect_cms_RecipientInfo(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,
RecipientInfo_choice, hf_index, ett_cms_RecipientInfo,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RecipientInfo_choice, hf_index, ett_cms_RecipientInfo,
NULL);
return offset;
}
@ -1294,14 +1294,14 @@ static int dissect_RecipientInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t RecipientInfos_set_of[1] = {
static const ber_old_sequence_t RecipientInfos_set_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item },
};
static int
dissect_cms_RecipientInfos(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,
RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
return offset;
}
@ -1335,7 +1335,7 @@ static int dissect_encryptedContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t EncryptedContentInfo_sequence[] = {
static const ber_old_sequence_t EncryptedContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_encryptedContentType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contentEncryptionAlgorithm },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptedContent_impl },
@ -1344,8 +1344,8 @@ static const ber_sequence_t EncryptedContentInfo_sequence[] = {
static int
dissect_cms_EncryptedContentInfo(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,
EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
return offset;
}
@ -1354,14 +1354,14 @@ static int dissect_encryptedContentInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t UnprotectedAttributes_set_of[1] = {
static const ber_old_sequence_t UnprotectedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnprotectedAttributes_item },
};
static int
dissect_cms_UnprotectedAttributes(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,
UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
return offset;
}
@ -1370,7 +1370,7 @@ static int dissect_unprotectedAttrs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t EnvelopedData_sequence[] = {
static const ber_old_sequence_t EnvelopedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos },
@ -1381,8 +1381,8 @@ static const ber_sequence_t EnvelopedData_sequence[] = {
int
dissect_cms_EnvelopedData(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,
EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
return offset;
}
@ -1401,7 +1401,7 @@ static int dissect_digest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t DigestedData_sequence[] = {
static const ber_old_sequence_t DigestedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo },
@ -1411,14 +1411,14 @@ static const ber_sequence_t DigestedData_sequence[] = {
static int
dissect_cms_DigestedData(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,
DigestedData_sequence, hf_index, ett_cms_DigestedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DigestedData_sequence, hf_index, ett_cms_DigestedData);
return offset;
}
static const ber_sequence_t EncryptedData_sequence[] = {
static const ber_old_sequence_t EncryptedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedContentInfo },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unprotectedAttrs_impl },
@ -1427,8 +1427,8 @@ static const ber_sequence_t EncryptedData_sequence[] = {
static int
dissect_cms_EncryptedData(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,
EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
return offset;
}
@ -1446,14 +1446,14 @@ static int dissect_macAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t AuthAttributes_set_of[1] = {
static const ber_old_sequence_t AuthAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthAttributes_item },
};
static int
dissect_cms_AuthAttributes(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,
AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
return offset;
}
@ -1475,7 +1475,7 @@ static int dissect_mac(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t AuthenticatedData_sequence[] = {
static const ber_old_sequence_t AuthenticatedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos },
@ -1490,8 +1490,8 @@ static const ber_sequence_t AuthenticatedData_sequence[] = {
static int
dissect_cms_AuthenticatedData(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,
AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
return offset;
}
@ -1543,7 +1543,7 @@ static const value_string cms_Time_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Time_choice[] = {
static const ber_old_choice_t Time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalTime },
{ 0, 0, 0, 0, NULL }
@ -1551,9 +1551,9 @@ static const ber_choice_t Time_choice[] = {
static int
dissect_cms_Time(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,
Time_choice, hf_index, ett_cms_Time,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Time_choice, hf_index, ett_cms_Time,
NULL);
return offset;
}
@ -1649,7 +1649,7 @@ static int dissect_rc2ParameterVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t RC2CBCParameter_sequence[] = {
static const ber_old_sequence_t RC2CBCParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rc2ParameterVersion },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_iv },
{ 0, 0, 0, NULL }
@ -1657,8 +1657,8 @@ static const ber_sequence_t RC2CBCParameter_sequence[] = {
static int
dissect_cms_RC2CBCParameter(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,
RC2CBCParameter_sequence, hf_index, ett_cms_RC2CBCParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RC2CBCParameter_sequence, hf_index, ett_cms_RC2CBCParameter);
return offset;
}
@ -1708,7 +1708,7 @@ static int dissect_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SMIMECapability_sequence[] = {
static const ber_old_sequence_t SMIMECapability_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_capability },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters },
{ 0, 0, 0, NULL }
@ -1716,8 +1716,8 @@ static const ber_sequence_t SMIMECapability_sequence[] = {
static int
dissect_cms_SMIMECapability(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,
SMIMECapability_sequence, hf_index, ett_cms_SMIMECapability);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMIMECapability_sequence, hf_index, ett_cms_SMIMECapability);
return offset;
}
@ -1726,14 +1726,14 @@ static int dissect_SMIMECapabilities_item(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t SMIMECapabilities_sequence_of[1] = {
static const ber_old_sequence_t SMIMECapabilities_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMIMECapabilities_item },
};
static int
dissect_cms_SMIMECapabilities(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,
SMIMECapabilities_sequence_of, hf_index, ett_cms_SMIMECapabilities);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SMIMECapabilities_sequence_of, hf_index, ett_cms_SMIMECapabilities);
return offset;
}
@ -1746,7 +1746,7 @@ static const value_string cms_SMIMEEncryptionKeyPreference_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SMIMEEncryptionKeyPreference_choice[] = {
static const ber_old_choice_t SMIMEEncryptionKeyPreference_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_issuerAndSerialNumber_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_recipientKeyId_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_subjectAltKeyIdentifier_impl },
@ -1755,9 +1755,9 @@ static const ber_choice_t SMIMEEncryptionKeyPreference_choice[] = {
static int
dissect_cms_SMIMEEncryptionKeyPreference(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,
SMIMEEncryptionKeyPreference_choice, hf_index, ett_cms_SMIMEEncryptionKeyPreference,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SMIMEEncryptionKeyPreference_choice, hf_index, ett_cms_SMIMEEncryptionKeyPreference,
NULL);
return offset;
}
@ -1769,7 +1769,7 @@ static const value_string cms_RC2CBCParameters_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RC2CBCParameters_choice[] = {
static const ber_old_choice_t RC2CBCParameters_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rc2WrapParameter },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rc2CBCParameter },
{ 0, 0, 0, 0, NULL }
@ -1777,9 +1777,9 @@ static const ber_choice_t RC2CBCParameters_choice[] = {
static int
dissect_cms_RC2CBCParameters(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,
RC2CBCParameters_choice, hf_index, ett_cms_RC2CBCParameters,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RC2CBCParameters_choice, hf_index, ett_cms_RC2CBCParameters,
NULL);
return offset;
}

150
epan/dissectors/packet-crmf.c
View File

@ -285,7 +285,7 @@ static const value_string crmf_Time_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Time_choice[] = {
static const ber_old_choice_t Time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalTime },
{ 0, 0, 0, 0, NULL }
@ -293,9 +293,9 @@ static const ber_choice_t Time_choice[] = {
static int
dissect_crmf_Time(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,
Time_choice, hf_index, ett_crmf_Time,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Time_choice, hf_index, ett_crmf_Time,
NULL);
return offset;
}
@ -329,7 +329,7 @@ static int dissect_iterationCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t OptionalValidity_sequence[] = {
static const ber_old_sequence_t OptionalValidity_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter_impl },
{ 0, 0, 0, NULL }
@ -337,8 +337,8 @@ static const ber_sequence_t OptionalValidity_sequence[] = {
int
dissect_crmf_OptionalValidity(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,
OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
return offset;
}
@ -347,7 +347,7 @@ static int dissect_validity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t CertTemplate_sequence[] = {
static const ber_old_sequence_t CertTemplate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_version_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signingAlg_impl },
@ -363,8 +363,8 @@ static const ber_sequence_t CertTemplate_sequence[] = {
int
dissect_crmf_CertTemplate(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,
CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
return offset;
}
@ -400,7 +400,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
static const ber_old_sequence_t AttributeTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
{ 0, 0, 0, NULL }
@ -408,8 +408,8 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
int
dissect_crmf_AttributeTypeAndValue(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,
AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
return offset;
}
@ -421,14 +421,14 @@ static int dissect_Controls_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t Controls_sequence_of[1] = {
static const ber_old_sequence_t Controls_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Controls_item },
};
int
dissect_crmf_Controls(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,
Controls_sequence_of, hf_index, ett_crmf_Controls);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Controls_sequence_of, hf_index, ett_crmf_Controls);
return offset;
}
@ -437,7 +437,7 @@ static int dissect_controls(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t CertRequest_sequence[] = {
static const ber_old_sequence_t CertRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certTemplate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_controls },
@ -446,8 +446,8 @@ static const ber_sequence_t CertRequest_sequence[] = {
int
dissect_crmf_CertRequest(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,
CertRequest_sequence, hf_index, ett_crmf_CertRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertRequest_sequence, hf_index, ett_crmf_CertRequest);
return offset;
}
@ -497,7 +497,7 @@ static int dissect_encValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PKMACValue_sequence[] = {
static const ber_old_sequence_t PKMACValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algId },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_pkmac_value },
{ 0, 0, 0, NULL }
@ -505,8 +505,8 @@ static const ber_sequence_t PKMACValue_sequence[] = {
int
dissect_crmf_PKMACValue(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,
PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
return offset;
}
@ -521,7 +521,7 @@ static const value_string crmf_T_authInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_authInfo_choice[] = {
static const ber_old_choice_t T_authInfo_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sender_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKeyMAC },
{ 0, 0, 0, 0, NULL }
@ -529,9 +529,9 @@ static const ber_choice_t T_authInfo_choice[] = {
static int
dissect_crmf_T_authInfo(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_authInfo_choice, hf_index, ett_crmf_T_authInfo,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_authInfo_choice, hf_index, ett_crmf_T_authInfo,
NULL);
return offset;
}
@ -540,7 +540,7 @@ static int dissect_authInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
static const ber_old_sequence_t POPOSigningKeyInput_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKey },
{ 0, 0, 0, NULL }
@ -548,8 +548,8 @@ static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
int
dissect_crmf_POPOSigningKeyInput(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,
POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
return offset;
}
@ -558,7 +558,7 @@ static int dissect_poposkInput_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t POPOSigningKey_sequence[] = {
static const ber_old_sequence_t POPOSigningKey_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_poposkInput_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sk_signature },
@ -567,8 +567,8 @@ static const ber_sequence_t POPOSigningKey_sequence[] = {
int
dissect_crmf_POPOSigningKey(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,
POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
return offset;
}
@ -603,7 +603,7 @@ const value_string crmf_POPOPrivKey_vals[] = {
{ 0, NULL }
};
static const ber_choice_t POPOPrivKey_choice[] = {
static const ber_old_choice_t POPOPrivKey_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_thisMessage_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_subsequentMessage_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dhMAC_impl },
@ -612,9 +612,9 @@ static const ber_choice_t POPOPrivKey_choice[] = {
int
dissect_crmf_POPOPrivKey(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,
POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey,
NULL);
return offset;
}
@ -634,7 +634,7 @@ const value_string crmf_ProofOfPossession_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ProofOfPossession_choice[] = {
static const ber_old_choice_t ProofOfPossession_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_raVerified_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signature_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_keyEncipherment_impl },
@ -644,9 +644,9 @@ static const ber_choice_t ProofOfPossession_choice[] = {
int
dissect_crmf_ProofOfPossession(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,
ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession,
NULL);
return offset;
}
@ -655,14 +655,14 @@ static int dissect_pop(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_regInfo_item },
};
static int
dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(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_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
return offset;
}
@ -671,7 +671,7 @@ static int dissect_regInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t CertReqMsg_sequence[] = {
static const ber_old_sequence_t CertReqMsg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certReq },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_regInfo },
@ -680,8 +680,8 @@ static const ber_sequence_t CertReqMsg_sequence[] = {
int
dissect_crmf_CertReqMsg(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,
CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
return offset;
}
@ -690,14 +690,14 @@ static int dissect_CertReqMessages_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t CertReqMessages_sequence_of[1] = {
static const ber_old_sequence_t CertReqMessages_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertReqMessages_item },
};
int
dissect_crmf_CertReqMessages(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,
CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages);
return offset;
}
@ -719,7 +719,7 @@ static int dissect_valueHint_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t PBMParameter_sequence[] = {
static const ber_old_sequence_t PBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
@ -729,8 +729,8 @@ static const ber_sequence_t PBMParameter_sequence[] = {
int
dissect_crmf_PBMParameter(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,
PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
return offset;
}
@ -798,7 +798,7 @@ static int dissect_pubMethod(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SinglePubInfo_sequence[] = {
static const ber_old_sequence_t SinglePubInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pubMethod },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubLocation },
{ 0, 0, 0, NULL }
@ -806,8 +806,8 @@ static const ber_sequence_t SinglePubInfo_sequence[] = {
int
dissect_crmf_SinglePubInfo(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,
SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
return offset;
}
@ -816,14 +816,14 @@ static int dissect_pubInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pubInfos_item },
};
static int
dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(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_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo);
return offset;
}
@ -832,7 +832,7 @@ static int dissect_pubInfos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PKIPublicationInfo_sequence[] = {
static const ber_old_sequence_t PKIPublicationInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_action },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubInfos },
{ 0, 0, 0, NULL }
@ -840,14 +840,14 @@ static const ber_sequence_t PKIPublicationInfo_sequence[] = {
int
dissect_crmf_PKIPublicationInfo(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,
PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
return offset;
}
static const ber_sequence_t EncryptedValue_sequence[] = {
static const ber_old_sequence_t EncryptedValue_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_intendedAlg_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_symmAlg_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encSymmKey_impl },
@ -859,8 +859,8 @@ static const ber_sequence_t EncryptedValue_sequence[] = {
int
dissect_crmf_EncryptedValue(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,
EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
return offset;
}
@ -875,7 +875,7 @@ const value_string crmf_EncryptedKey_vals[] = {
{ 0, NULL }
};
static const ber_choice_t EncryptedKey_choice[] = {
static const ber_old_choice_t EncryptedKey_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedValue },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_envelopedData_impl },
{ 0, 0, 0, 0, NULL }
@ -883,9 +883,9 @@ static const ber_choice_t EncryptedKey_choice[] = {
int
dissect_crmf_EncryptedKey(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,
EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey,
NULL);
return offset;
}
@ -926,7 +926,7 @@ const value_string crmf_PKIArchiveOptions_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PKIArchiveOptions_choice[] = {
static const ber_old_choice_t PKIArchiveOptions_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_encryptedPrivKey_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_keyGenParameters_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_archiveRemGenPrivKey_impl },
@ -935,15 +935,15 @@ static const ber_choice_t PKIArchiveOptions_choice[] = {
int
dissect_crmf_PKIArchiveOptions(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,
PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions,
NULL);
return offset;
}
static const ber_sequence_t CertId_sequence[] = {
static const ber_old_sequence_t CertId_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
@ -951,8 +951,8 @@ static const ber_sequence_t CertId_sequence[] = {
int
dissect_crmf_CertId(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,
CertId_sequence, hf_index, ett_crmf_CertId);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertId_sequence, hf_index, ett_crmf_CertId);
return offset;
}

1094
epan/dissectors/packet-dap.c
View File

File diff suppressed because it is too large Load Diff

360
epan/dissectors/packet-disp.c
View File

@ -381,14 +381,14 @@ dissect_disp_EstablishParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t SET_OF_SupplierAndConsumers_set_of[1] = {
static const ber_old_sequence_t SET_OF_SupplierAndConsumers_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifiedSecondaryShadows_item },
};
static int
dissect_disp_SET_OF_SupplierAndConsumers(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_SupplierAndConsumers_set_of, hf_index, ett_disp_SET_OF_SupplierAndConsumers);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_SupplierAndConsumers_set_of, hf_index, ett_disp_SET_OF_SupplierAndConsumers);
return offset;
}
@ -397,15 +397,15 @@ static int dissect_modifiedSecondaryShadows(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t ModificationParameter_sequence[] = {
static const ber_old_sequence_t ModificationParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifiedSecondaryShadows },
{ 0, 0, 0, NULL }
};
static int
dissect_disp_ModificationParameter(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,
ModificationParameter_sequence, hf_index, ett_disp_ModificationParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ModificationParameter_sequence, hf_index, ett_disp_ModificationParameter);
return offset;
}
@ -423,7 +423,7 @@ static int dissect_agreementID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t AreaSpecification_sequence[] = {
static const ber_old_sequence_t AreaSpecification_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextPrefix },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_replicationArea },
{ 0, 0, 0, NULL }
@ -431,8 +431,8 @@ static const ber_sequence_t AreaSpecification_sequence[] = {
static int
dissect_disp_AreaSpecification(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,
AreaSpecification_sequence, hf_index, ett_disp_AreaSpecification);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AreaSpecification_sequence, hf_index, ett_disp_AreaSpecification);
return offset;
}
@ -480,14 +480,14 @@ static int dissect_remove(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t AttributeTypes_set_of[1] = {
static const ber_old_sequence_t AttributeTypes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AttributeTypes_item },
};
static int
dissect_disp_AttributeTypes(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,
AttributeTypes_set_of, hf_index, ett_disp_AttributeTypes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
AttributeTypes_set_of, hf_index, ett_disp_AttributeTypes);
return offset;
}
@ -506,7 +506,7 @@ static const value_string disp_ClassAttributes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ClassAttributes_choice[] = {
static const ber_old_choice_t ClassAttributes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allAttributes },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_include_impl },
{ 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_exclude_impl },
@ -515,9 +515,9 @@ static const ber_choice_t ClassAttributes_choice[] = {
static int
dissect_disp_ClassAttributes(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,
ClassAttributes_choice, hf_index, ett_disp_ClassAttributes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ClassAttributes_choice, hf_index, ett_disp_ClassAttributes,
NULL);
return offset;
}
@ -526,7 +526,7 @@ static int dissect_classAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t ClassAttributeSelection_sequence[] = {
static const ber_old_sequence_t ClassAttributeSelection_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_class },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_classAttributes },
{ 0, 0, 0, NULL }
@ -534,8 +534,8 @@ static const ber_sequence_t ClassAttributeSelection_sequence[] = {
static int
dissect_disp_ClassAttributeSelection(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,
ClassAttributeSelection_sequence, hf_index, ett_disp_ClassAttributeSelection);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ClassAttributeSelection_sequence, hf_index, ett_disp_ClassAttributeSelection);
return offset;
}
@ -544,14 +544,14 @@ static int dissect_AttributeSelection_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t AttributeSelection_set_of[1] = {
static const ber_old_sequence_t AttributeSelection_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributeSelection_item },
};
static int
dissect_disp_AttributeSelection(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,
AttributeSelection_set_of, hf_index, ett_disp_AttributeSelection);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
AttributeSelection_set_of, hf_index, ett_disp_AttributeSelection);
return offset;
}
@ -613,7 +613,7 @@ static int dissect_attComplete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Knowledge_sequence[] = {
static const ber_old_sequence_t Knowledge_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_knowledgeType },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extendedKnowledge },
{ 0, 0, 0, NULL }
@ -621,8 +621,8 @@ static const ber_sequence_t Knowledge_sequence[] = {
static int
dissect_disp_Knowledge(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,
Knowledge_sequence, hf_index, ett_disp_Knowledge);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Knowledge_sequence, hf_index, ett_disp_Knowledge);
return offset;
}
@ -631,14 +631,14 @@ static int dissect_knowledge(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t T_selectedContexts_set_of[1] = {
static const ber_old_sequence_t T_selectedContexts_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item },
};
static int
dissect_disp_T_selectedContexts(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_selectedContexts_set_of, hf_index, ett_disp_T_selectedContexts);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_selectedContexts_set_of, hf_index, ett_disp_T_selectedContexts);
return offset;
}
@ -653,7 +653,7 @@ static const value_string disp_T_supplyContexts_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_supplyContexts_choice[] = {
static const ber_old_choice_t T_supplyContexts_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allContexts },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_selectedContexts },
{ 0, 0, 0, 0, NULL }
@ -661,9 +661,9 @@ static const ber_choice_t T_supplyContexts_choice[] = {
static int
dissect_disp_T_supplyContexts(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_supplyContexts_choice, hf_index, ett_disp_T_supplyContexts,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_supplyContexts_choice, hf_index, ett_disp_T_supplyContexts,
NULL);
return offset;
}
@ -672,7 +672,7 @@ static int dissect_supplyContexts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t UnitOfReplication_sequence[] = {
static const ber_old_sequence_t UnitOfReplication_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_area },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_replication_attributes },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_knowledge },
@ -684,8 +684,8 @@ static const ber_sequence_t UnitOfReplication_sequence[] = {
static int
dissect_disp_UnitOfReplication(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,
UnitOfReplication_sequence, hf_index, ett_disp_UnitOfReplication);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UnitOfReplication_sequence, hf_index, ett_disp_UnitOfReplication);
return offset;
}
@ -734,7 +734,7 @@ static int dissect_updateInterval(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t PeriodicStrategy_sequence[] = {
static const ber_old_sequence_t PeriodicStrategy_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_beginTime },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_windowSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_updateInterval },
@ -743,8 +743,8 @@ static const ber_sequence_t PeriodicStrategy_sequence[] = {
static int
dissect_disp_PeriodicStrategy(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,
PeriodicStrategy_sequence, hf_index, ett_disp_PeriodicStrategy);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PeriodicStrategy_sequence, hf_index, ett_disp_PeriodicStrategy);
return offset;
}
@ -753,7 +753,7 @@ static int dissect_periodic(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SchedulingParameters_sequence[] = {
static const ber_old_sequence_t SchedulingParameters_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_periodic },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_othertimes },
{ 0, 0, 0, NULL }
@ -761,8 +761,8 @@ static const ber_sequence_t SchedulingParameters_sequence[] = {
static int
dissect_disp_SchedulingParameters(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,
SchedulingParameters_sequence, hf_index, ett_disp_SchedulingParameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SchedulingParameters_sequence, hf_index, ett_disp_SchedulingParameters);
return offset;
}
@ -777,7 +777,7 @@ static const value_string disp_SupplierUpdateMode_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SupplierUpdateMode_choice[] = {
static const ber_old_choice_t SupplierUpdateMode_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_onChange },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_scheduled },
{ 0, 0, 0, 0, NULL }
@ -785,9 +785,9 @@ static const ber_choice_t SupplierUpdateMode_choice[] = {
static int
dissect_disp_SupplierUpdateMode(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,
SupplierUpdateMode_choice, hf_index, ett_disp_SupplierUpdateMode,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SupplierUpdateMode_choice, hf_index, ett_disp_SupplierUpdateMode,
NULL);
return offset;
}
@ -814,7 +814,7 @@ static const value_string disp_UpdateMode_vals[] = {
{ 0, NULL }
};
static const ber_choice_t UpdateMode_choice[] = {
static const ber_old_choice_t UpdateMode_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_supplierInitiated_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_consumerInitiated_impl },
{ 0, 0, 0, 0, NULL }
@ -822,9 +822,9 @@ static const ber_choice_t UpdateMode_choice[] = {
static int
dissect_disp_UpdateMode(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,
UpdateMode_choice, hf_index, ett_disp_UpdateMode,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
UpdateMode_choice, hf_index, ett_disp_UpdateMode,
NULL);
return offset;
}
@ -833,7 +833,7 @@ static int dissect_updateMode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t ShadowingAgreementInfo_sequence[] = {
static const ber_old_sequence_t ShadowingAgreementInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_shadowSubject },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_updateMode },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_master },
@ -843,8 +843,8 @@ static const ber_sequence_t ShadowingAgreementInfo_sequence[] = {
static int
dissect_disp_ShadowingAgreementInfo(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,
ShadowingAgreementInfo_sequence, hf_index, ett_disp_ShadowingAgreementInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ShadowingAgreementInfo_sequence, hf_index, ett_disp_ShadowingAgreementInfo);
return offset;
}
@ -886,7 +886,7 @@ static const value_string disp_T_updateStrategy_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_updateStrategy_choice[] = {
static const ber_old_choice_t T_updateStrategy_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_standardUpdate },
{ 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
{ 0, 0, 0, 0, NULL }
@ -894,9 +894,9 @@ static const ber_choice_t T_updateStrategy_choice[] = {
static int
dissect_disp_T_updateStrategy(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_updateStrategy_choice, hf_index, ett_disp_T_updateStrategy,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_updateStrategy_choice, hf_index, ett_disp_T_updateStrategy,
NULL);
return offset;
}
@ -905,7 +905,7 @@ static int dissect_updateStrategy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
static const ber_old_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_updateStrategy },
@ -915,8 +915,8 @@ static const ber_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
static int
dissect_disp_CoordinateShadowUpdateArgumentData(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,
CoordinateShadowUpdateArgumentData_sequence, hf_index, ett_disp_CoordinateShadowUpdateArgumentData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CoordinateShadowUpdateArgumentData_sequence, hf_index, ett_disp_CoordinateShadowUpdateArgumentData);
return offset;
}
@ -942,7 +942,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] = {
static const ber_old_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_coordinateShadowUpdateArgument_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -951,8 +951,8 @@ static const ber_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] =
static int
dissect_disp_T_signedCoordinateShadowUpdateArgument(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_signedCoordinateShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedCoordinateShadowUpdateArgument);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedCoordinateShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedCoordinateShadowUpdateArgument);
return offset;
}
@ -967,7 +967,7 @@ static const value_string disp_CoordinateShadowUpdateArgument_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CoordinateShadowUpdateArgument_choice[] = {
static const ber_old_choice_t CoordinateShadowUpdateArgument_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedCoordinateShadowUpdateArgument_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCoordinateShadowUpdateArgument },
{ 0, 0, 0, 0, NULL }
@ -975,22 +975,22 @@ static const ber_choice_t CoordinateShadowUpdateArgument_choice[] = {
static int
dissect_disp_CoordinateShadowUpdateArgument(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,
CoordinateShadowUpdateArgument_choice, hf_index, ett_disp_CoordinateShadowUpdateArgument,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CoordinateShadowUpdateArgument_choice, hf_index, ett_disp_CoordinateShadowUpdateArgument,
NULL);
return offset;
}
static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notification_item },
};
static int
dissect_disp_SEQUENCE_OF_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_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_disp_SEQUENCE_OF_Attribute);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_disp_SEQUENCE_OF_Attribute);
return offset;
}
@ -999,7 +999,7 @@ static int dissect_notification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t InformationData_sequence[] = {
static const ber_old_sequence_t InformationData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_securityParameters_impl },
@ -1011,8 +1011,8 @@ static const ber_sequence_t InformationData_sequence[] = {
static int
dissect_disp_InformationData(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,
InformationData_sequence, hf_index, ett_disp_InformationData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InformationData_sequence, hf_index, ett_disp_InformationData);
return offset;
}
@ -1024,7 +1024,7 @@ static int dissect_information_data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t T_signedInformation_sequence[] = {
static const ber_old_sequence_t T_signedInformation_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_information_data_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -1033,8 +1033,8 @@ static const ber_sequence_t T_signedInformation_sequence[] = {
static int
dissect_disp_T_signedInformation(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_signedInformation_sequence, hf_index, ett_disp_T_signedInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedInformation_sequence, hf_index, ett_disp_T_signedInformation);
return offset;
}
@ -1049,7 +1049,7 @@ static const value_string disp_Information_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Information_choice[] = {
static const ber_old_choice_t Information_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedInformation_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedInformation },
{ 0, 0, 0, 0, NULL }
@ -1057,9 +1057,9 @@ static const ber_choice_t Information_choice[] = {
static int
dissect_disp_Information(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,
Information_choice, hf_index, ett_disp_Information,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Information_choice, hf_index, ett_disp_Information,
NULL);
return offset;
}
@ -1074,7 +1074,7 @@ static const value_string disp_CoordinateShadowUpdateResult_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CoordinateShadowUpdateResult_choice[] = {
static const ber_old_choice_t CoordinateShadowUpdateResult_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
{ 0, 0, 0, 0, NULL }
@ -1085,9 +1085,9 @@ dissect_disp_CoordinateShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *t
#line 75 "disp.cnf"
guint32 update;
offset = dissect_ber_choice(actx, tree, tvb, offset,
CoordinateShadowUpdateResult_choice, hf_index, ett_disp_CoordinateShadowUpdateResult,
&update);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CoordinateShadowUpdateResult_choice, hf_index, ett_disp_CoordinateShadowUpdateResult,
&update);
if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@ -1135,7 +1135,7 @@ static const value_string disp_T_requestedStrategy_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_requestedStrategy_choice[] = {
static const ber_old_choice_t T_requestedStrategy_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_standard },
{ 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
{ 0, 0, 0, 0, NULL }
@ -1143,9 +1143,9 @@ static const ber_choice_t T_requestedStrategy_choice[] = {
static int
dissect_disp_T_requestedStrategy(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_requestedStrategy_choice, hf_index, ett_disp_T_requestedStrategy,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_requestedStrategy_choice, hf_index, ett_disp_T_requestedStrategy,
NULL);
return offset;
}
@ -1154,7 +1154,7 @@ static int dissect_requestedStrategy(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
static const ber_old_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_requestedStrategy },
@ -1164,8 +1164,8 @@ static const ber_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
static int
dissect_disp_RequestShadowUpdateArgumentData(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,
RequestShadowUpdateArgumentData_sequence, hf_index, ett_disp_RequestShadowUpdateArgumentData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RequestShadowUpdateArgumentData_sequence, hf_index, ett_disp_RequestShadowUpdateArgumentData);
return offset;
}
@ -1177,7 +1177,7 @@ static int dissect_requestShadowUpdateArgument_impl(proto_tree *tree _U_, tvbuff
}
static const ber_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
static const ber_old_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestShadowUpdateArgument_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -1186,8 +1186,8 @@ static const ber_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
static int
dissect_disp_T_signedRequestShadowUpdateArgument(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_signedRequestShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedRequestShadowUpdateArgument);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedRequestShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedRequestShadowUpdateArgument);
return offset;
}
@ -1202,7 +1202,7 @@ static const value_string disp_RequestShadowUpdateArgument_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RequestShadowUpdateArgument_choice[] = {
static const ber_old_choice_t RequestShadowUpdateArgument_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedRequestShadowUpdateArgument_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedRequestShadowUpdateArgument },
{ 0, 0, 0, 0, NULL }
@ -1210,9 +1210,9 @@ static const ber_choice_t RequestShadowUpdateArgument_choice[] = {
static int
dissect_disp_RequestShadowUpdateArgument(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,
RequestShadowUpdateArgument_choice, hf_index, ett_disp_RequestShadowUpdateArgument,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RequestShadowUpdateArgument_choice, hf_index, ett_disp_RequestShadowUpdateArgument,
NULL);
return offset;
}
@ -1224,7 +1224,7 @@ static const value_string disp_RequestShadowUpdateResult_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RequestShadowUpdateResult_choice[] = {
static const ber_old_choice_t RequestShadowUpdateResult_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
{ 0, 0, 0, 0, NULL }
@ -1235,9 +1235,9 @@ dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb
#line 87 "disp.cnf"
guint32 update;
offset = dissect_ber_choice(actx, tree, tvb, offset,
RequestShadowUpdateResult_choice, hf_index, ett_disp_RequestShadowUpdateResult,
&update);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RequestShadowUpdateResult_choice, hf_index, ett_disp_RequestShadowUpdateResult,
&update);
if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@ -1250,7 +1250,7 @@ dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb
}
static const ber_sequence_t UpdateWindow_sequence[] = {
static const ber_old_sequence_t UpdateWindow_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_start },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_stop },
{ 0, 0, 0, NULL }
@ -1258,8 +1258,8 @@ static const ber_sequence_t UpdateWindow_sequence[] = {
static int
dissect_disp_UpdateWindow(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,
UpdateWindow_sequence, hf_index, ett_disp_UpdateWindow);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UpdateWindow_sequence, hf_index, ett_disp_UpdateWindow);
return offset;
}
@ -1280,14 +1280,14 @@ static int dissect_sDSEType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
static const ber_old_sequence_t SET_OF_Attribute_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
};
static int
dissect_disp_SET_OF_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_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Attribute_set_of, hf_index, ett_disp_SET_OF_Attribute);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Attribute_set_of, hf_index, ett_disp_SET_OF_Attribute);
return offset;
}
@ -1299,14 +1299,14 @@ static int dissect_replace_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attValIncomplete_item },
};
static int
dissect_disp_SET_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_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeType_set_of, hf_index, ett_disp_SET_OF_AttributeType);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeType_set_of, hf_index, ett_disp_SET_OF_AttributeType);
return offset;
}
@ -1315,7 +1315,7 @@ static int dissect_attValIncomplete(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SDSEContent_sequence[] = {
static const ber_old_sequence_t SDSEContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sDSEType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subComplete_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attComplete_impl },
@ -1326,8 +1326,8 @@ static const ber_sequence_t SDSEContent_sequence[] = {
static int
dissect_disp_SDSEContent(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,
SDSEContent_sequence, hf_index, ett_disp_SDSEContent);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SDSEContent_sequence, hf_index, ett_disp_SDSEContent);
return offset;
}
@ -1339,14 +1339,14 @@ static int dissect_add_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SET_OF_Subtree_set_of[1] = {
static const ber_old_sequence_t SET_OF_Subtree_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subtree_item },
};
static int
dissect_disp_SET_OF_Subtree(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_Subtree_set_of, hf_index, ett_disp_SET_OF_Subtree);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Subtree_set_of, hf_index, ett_disp_SET_OF_Subtree);
return offset;
}
@ -1355,7 +1355,7 @@ static int dissect_subtree(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t Subtree_sequence[] = {
static const ber_old_sequence_t Subtree_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_rdn },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sDSE },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subtree },
@ -1364,14 +1364,14 @@ static const ber_sequence_t Subtree_sequence[] = {
static int
dissect_disp_Subtree(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,
Subtree_sequence, hf_index, ett_disp_Subtree);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Subtree_sequence, hf_index, ett_disp_Subtree);
return offset;
}
static const ber_sequence_t TotalRefresh_sequence[] = {
static const ber_old_sequence_t TotalRefresh_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sDSE },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subtree },
{ 0, 0, 0, NULL }
@ -1379,8 +1379,8 @@ static const ber_sequence_t TotalRefresh_sequence[] = {
static int
dissect_disp_TotalRefresh(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,
TotalRefresh_sequence, hf_index, ett_disp_TotalRefresh);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TotalRefresh_sequence, hf_index, ett_disp_TotalRefresh);
return offset;
}
@ -1395,7 +1395,7 @@ static const value_string disp_T_rename_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_rename_choice[] = {
static const ber_old_choice_t T_rename_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_newRDN },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newDN },
{ 0, 0, 0, 0, NULL }
@ -1403,9 +1403,9 @@ static const ber_choice_t T_rename_choice[] = {
static int
dissect_disp_T_rename(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_rename_choice, hf_index, ett_disp_T_rename,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_rename_choice, hf_index, ett_disp_T_rename,
NULL);
return offset;
}
@ -1414,14 +1414,14 @@ static int dissect_rename(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_changes_item },
};
static int
dissect_disp_SEQUENCE_OF_EntryModification(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_EntryModification_sequence_of, hf_index, ett_disp_SEQUENCE_OF_EntryModification);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_EntryModification_sequence_of, hf_index, ett_disp_SEQUENCE_OF_EntryModification);
return offset;
}
@ -1436,7 +1436,7 @@ static const value_string disp_T_attributeChanges_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_attributeChanges_choice[] = {
static const ber_old_choice_t T_attributeChanges_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_replace_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_changes_impl },
{ 0, 0, 0, 0, NULL }
@ -1444,9 +1444,9 @@ static const ber_choice_t T_attributeChanges_choice[] = {
static int
dissect_disp_T_attributeChanges(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_attributeChanges_choice, hf_index, ett_disp_T_attributeChanges,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_attributeChanges_choice, hf_index, ett_disp_T_attributeChanges,
NULL);
return offset;
}
@ -1455,7 +1455,7 @@ static int dissect_attributeChanges(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t ContentChange_sequence[] = {
static const ber_old_sequence_t ContentChange_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rename },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeChanges },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sDSEType },
@ -1467,8 +1467,8 @@ static const ber_sequence_t ContentChange_sequence[] = {
static int
dissect_disp_ContentChange(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,
ContentChange_sequence, hf_index, ett_disp_ContentChange);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ContentChange_sequence, hf_index, ett_disp_ContentChange);
return offset;
}
@ -1484,7 +1484,7 @@ static const value_string disp_T_sDSEChanges_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_sDSEChanges_choice[] = {
static const ber_old_choice_t T_sDSEChanges_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_add_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_remove },
{ 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modify_impl },
@ -1493,9 +1493,9 @@ static const ber_choice_t T_sDSEChanges_choice[] = {
static int
dissect_disp_T_sDSEChanges(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_sDSEChanges_choice, hf_index, ett_disp_T_sDSEChanges,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_sDSEChanges_choice, hf_index, ett_disp_T_sDSEChanges,
NULL);
return offset;
}
@ -1504,7 +1504,7 @@ static int dissect_sDSEChanges(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SubordinateChanges_sequence[] = {
static const ber_old_sequence_t SubordinateChanges_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_subordinate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subordinate_changes },
{ 0, 0, 0, NULL }
@ -1512,8 +1512,8 @@ static const ber_sequence_t SubordinateChanges_sequence[] = {
static int
dissect_disp_SubordinateChanges(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,
SubordinateChanges_sequence, hf_index, ett_disp_SubordinateChanges);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SubordinateChanges_sequence, hf_index, ett_disp_SubordinateChanges);
return offset;
}
@ -1522,14 +1522,14 @@ static int dissect_subordinateUpdates_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t SEQUENCE_OF_SubordinateChanges_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_SubordinateChanges_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subordinateUpdates_item },
};
static int
dissect_disp_SEQUENCE_OF_SubordinateChanges(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_SubordinateChanges_sequence_of, hf_index, ett_disp_SEQUENCE_OF_SubordinateChanges);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_SubordinateChanges_sequence_of, hf_index, ett_disp_SEQUENCE_OF_SubordinateChanges);
return offset;
}
@ -1538,7 +1538,7 @@ static int dissect_subordinateUpdates(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t IncrementalStepRefresh_sequence[] = {
static const ber_old_sequence_t IncrementalStepRefresh_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sDSEChanges },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subordinateUpdates },
{ 0, 0, 0, NULL }
@ -1546,21 +1546,21 @@ static const ber_sequence_t IncrementalStepRefresh_sequence[] = {
static int
dissect_disp_IncrementalStepRefresh(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,
IncrementalStepRefresh_sequence, hf_index, ett_disp_IncrementalStepRefresh);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IncrementalStepRefresh_sequence, hf_index, ett_disp_IncrementalStepRefresh);
return offset;
}
static const ber_sequence_t IncrementalRefresh_sequence_of[1] = {
static const ber_old_sequence_t IncrementalRefresh_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IncrementalRefresh_item },
};
static int
dissect_disp_IncrementalRefresh(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,
IncrementalRefresh_sequence_of, hf_index, ett_disp_IncrementalRefresh);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
IncrementalRefresh_sequence_of, hf_index, ett_disp_IncrementalRefresh);
return offset;
}
@ -1577,7 +1577,7 @@ static const value_string disp_RefreshInformation_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RefreshInformation_choice[] = {
static const ber_old_choice_t RefreshInformation_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_noRefresh },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_total_impl },
{ 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_incremental_impl },
@ -1590,9 +1590,9 @@ dissect_disp_RefreshInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
#line 51 "disp.cnf"
guint32 update;
offset = dissect_ber_choice(actx, tree, tvb, offset,
RefreshInformation_choice, hf_index, ett_disp_RefreshInformation,
&update);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RefreshInformation_choice, hf_index, ett_disp_RefreshInformation,
&update);
if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@ -1608,7 +1608,7 @@ static int dissect_updatedInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t UpdateShadowArgumentData_sequence[] = {
static const ber_old_sequence_t UpdateShadowArgumentData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_updateTime },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_updateWindow },
@ -1619,8 +1619,8 @@ static const ber_sequence_t UpdateShadowArgumentData_sequence[] = {
static int
dissect_disp_UpdateShadowArgumentData(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,
UpdateShadowArgumentData_sequence, hf_index, ett_disp_UpdateShadowArgumentData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UpdateShadowArgumentData_sequence, hf_index, ett_disp_UpdateShadowArgumentData);
return offset;
}
@ -1632,7 +1632,7 @@ static int dissect_updateShadowArgument_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t T_signedUpdateShadowArgument_sequence[] = {
static const ber_old_sequence_t T_signedUpdateShadowArgument_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_updateShadowArgument_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -1641,8 +1641,8 @@ static const ber_sequence_t T_signedUpdateShadowArgument_sequence[] = {
static int
dissect_disp_T_signedUpdateShadowArgument(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_signedUpdateShadowArgument_sequence, hf_index, ett_disp_T_signedUpdateShadowArgument);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedUpdateShadowArgument_sequence, hf_index, ett_disp_T_signedUpdateShadowArgument);
return offset;
}
@ -1657,7 +1657,7 @@ static const value_string disp_UpdateShadowArgument_vals[] = {
{ 0, NULL }
};
static const ber_choice_t UpdateShadowArgument_choice[] = {
static const ber_old_choice_t UpdateShadowArgument_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedUpdateShadowArgument_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedUpdateShadowArgument },
{ 0, 0, 0, 0, NULL }
@ -1665,9 +1665,9 @@ static const ber_choice_t UpdateShadowArgument_choice[] = {
static int
dissect_disp_UpdateShadowArgument(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,
UpdateShadowArgument_choice, hf_index, ett_disp_UpdateShadowArgument,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
UpdateShadowArgument_choice, hf_index, ett_disp_UpdateShadowArgument,
NULL);
return offset;
}
@ -1679,7 +1679,7 @@ static const value_string disp_UpdateShadowResult_vals[] = {
{ 0, NULL }
};
static const ber_choice_t UpdateShadowResult_choice[] = {
static const ber_old_choice_t UpdateShadowResult_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
{ 0, 0, 0, 0, NULL }
@ -1690,9 +1690,9 @@ dissect_disp_UpdateShadowResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
#line 99 "disp.cnf"
guint32 update;
offset = dissect_ber_choice(actx, tree, tvb, offset,
UpdateShadowResult_choice, hf_index, ett_disp_UpdateShadowResult,
&update);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
UpdateShadowResult_choice, hf_index, ett_disp_UpdateShadowResult,
&update);
if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@ -1742,7 +1742,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t ShadowErrorData_sequence[] = {
static const ber_old_sequence_t ShadowErrorData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_problem },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_updateWindow },
@ -1755,8 +1755,8 @@ static const ber_sequence_t ShadowErrorData_sequence[] = {
static int
dissect_disp_ShadowErrorData(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,
ShadowErrorData_sequence, hf_index, ett_disp_ShadowErrorData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ShadowErrorData_sequence, hf_index, ett_disp_ShadowErrorData);
return offset;
}
@ -1768,7 +1768,7 @@ static int dissect_shadowError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t T_signedShadowError_sequence[] = {
static const ber_old_sequence_t T_signedShadowError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_shadowError },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -1777,8 +1777,8 @@ static const ber_sequence_t T_signedShadowError_sequence[] = {
static int
dissect_disp_T_signedShadowError(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_signedShadowError_sequence, hf_index, ett_disp_T_signedShadowError);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedShadowError_sequence, hf_index, ett_disp_T_signedShadowError);
return offset;
}
@ -1793,7 +1793,7 @@ static const value_string disp_ShadowError_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ShadowError_choice[] = {
static const ber_old_choice_t ShadowError_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedShadowError },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signedShadowError_impl },
{ 0, 0, 0, 0, NULL }
@ -1801,9 +1801,9 @@ static const ber_choice_t ShadowError_choice[] = {
static int
dissect_disp_ShadowError(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,
ShadowError_choice, hf_index, ett_disp_ShadowError,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ShadowError_choice, hf_index, ett_disp_ShadowError,
NULL);
return offset;
}

418
epan/dissectors/packet-dop.c
View File

File diff suppressed because it is too large Load Diff

458
epan/dissectors/packet-dsp.c
View File

File diff suppressed because it is too large Load Diff

166
epan/dissectors/packet-ess.c
View File

@ -229,14 +229,14 @@ static int dissect_allOrFirstTier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item },
};
static int
dissect_ess_SEQUENCE_OF_GeneralNames(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_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames);
return offset;
}
@ -260,7 +260,7 @@ static const value_string ess_ReceiptsFrom_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ReceiptsFrom_choice[] = {
static const ber_old_choice_t ReceiptsFrom_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_allOrFirstTier_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receiptList_impl },
{ 0, 0, 0, 0, NULL }
@ -268,9 +268,9 @@ static const ber_choice_t ReceiptsFrom_choice[] = {
static int
dissect_ess_ReceiptsFrom(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,
ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom,
NULL);
return offset;
}
@ -279,7 +279,7 @@ static int dissect_receiptsFrom(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t ReceiptRequest_sequence[] = {
static const ber_old_sequence_t ReceiptRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo },
@ -288,8 +288,8 @@ static const ber_sequence_t ReceiptRequest_sequence[] = {
static int
dissect_ess_ReceiptRequest(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,
ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
return offset;
}
@ -326,7 +326,7 @@ static int dissect_originatorSignatureValue(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t Receipt_sequence[] = {
static const ber_old_sequence_t Receipt_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
@ -336,8 +336,8 @@ static const ber_sequence_t Receipt_sequence[] = {
static int
dissect_ess_Receipt(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,
Receipt_sequence, hf_index, ett_ess_Receipt);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Receipt_sequence, hf_index, ett_ess_Receipt);
return offset;
}
@ -360,7 +360,7 @@ static int dissect_utf8String(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t ContentHints_sequence[] = {
static const ber_old_sequence_t ContentHints_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contentDescription },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ 0, 0, 0, NULL }
@ -368,8 +368,8 @@ static const ber_sequence_t ContentHints_sequence[] = {
static int
dissect_ess_ContentHints(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,
ContentHints_sequence, hf_index, ett_ess_ContentHints);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ContentHints_sequence, hf_index, ett_ess_ContentHints);
return offset;
}
@ -385,7 +385,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t ContentReference_sequence[] = {
static const ber_old_sequence_t ContentReference_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_originatorSignatureValue },
@ -394,8 +394,8 @@ static const ber_sequence_t ContentReference_sequence[] = {
static int
dissect_ess_ContentReference(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,
ContentReference_sequence, hf_index, ett_ess_ContentReference);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ContentReference_sequence, hf_index, ett_ess_ContentReference);
return offset;
}
@ -456,7 +456,7 @@ static const value_string ess_ESSPrivacyMark_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ESSPrivacyMark_choice[] = {
static const ber_old_choice_t ESSPrivacyMark_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_pString },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
{ 0, 0, 0, 0, NULL }
@ -464,9 +464,9 @@ static const ber_choice_t ESSPrivacyMark_choice[] = {
static int
dissect_ess_ESSPrivacyMark(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,
ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark,
NULL);
return offset;
}
@ -502,7 +502,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t SecurityCategory_sequence[] = {
static const ber_old_sequence_t SecurityCategory_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_CON, 1, 0, dissect_value },
{ 0, 0, 0, NULL }
@ -510,8 +510,8 @@ static const ber_sequence_t SecurityCategory_sequence[] = {
static int
dissect_ess_SecurityCategory(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,
SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
return offset;
}
@ -520,14 +520,14 @@ static int dissect_SecurityCategories_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t SecurityCategories_set_of[1] = {
static const ber_old_sequence_t SecurityCategories_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item },
};
static int
dissect_ess_SecurityCategories(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,
SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories);
return offset;
}
@ -536,7 +536,7 @@ static int dissect_security_categories(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t ESSSecurityLabel_set[] = {
static const ber_old_sequence_t ESSSecurityLabel_set[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_security_policy_identifier },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_security_classification },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_privacy_mark },
@ -546,8 +546,8 @@ static const ber_sequence_t ESSSecurityLabel_set[] = {
static int
dissect_ess_ESSSecurityLabel(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(implicit_tag, actx, tree, tvb, offset,
ESSSecurityLabel_set, hf_index, ett_ess_ESSSecurityLabel);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
ESSSecurityLabel_set, hf_index, ett_ess_ESSSecurityLabel);
return offset;
}
@ -585,7 +585,7 @@ static int dissect_bitSetAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t RestrictiveTag_sequence[] = {
static const ber_old_sequence_t RestrictiveTag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeFlags },
{ 0, 0, 0, NULL }
@ -593,8 +593,8 @@ static const ber_sequence_t RestrictiveTag_sequence[] = {
static int
dissect_ess_RestrictiveTag(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,
RestrictiveTag_sequence, hf_index, ett_ess_RestrictiveTag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RestrictiveTag_sequence, hf_index, ett_ess_RestrictiveTag);
return offset;
}
@ -616,14 +616,14 @@ static int dissect_securityAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t SET_OF_SecurityAttribute_set_of[1] = {
static const ber_old_sequence_t SET_OF_SecurityAttribute_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
};
static int
dissect_ess_SET_OF_SecurityAttribute(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_SecurityAttribute_set_of, hf_index, ett_ess_SET_OF_SecurityAttribute);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_SecurityAttribute_set_of, hf_index, ett_ess_SET_OF_SecurityAttribute);
return offset;
}
@ -635,7 +635,7 @@ static int dissect_securityAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t EnumeratedTag_sequence[] = {
static const ber_old_sequence_t EnumeratedTag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributeList },
{ 0, 0, 0, NULL }
@ -643,14 +643,14 @@ static const ber_sequence_t EnumeratedTag_sequence[] = {
static int
dissect_ess_EnumeratedTag(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,
EnumeratedTag_sequence, hf_index, ett_ess_EnumeratedTag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EnumeratedTag_sequence, hf_index, ett_ess_EnumeratedTag);
return offset;
}
static const ber_sequence_t PermissiveTag_sequence[] = {
static const ber_old_sequence_t PermissiveTag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeFlags },
{ 0, 0, 0, NULL }
@ -658,8 +658,8 @@ static const ber_sequence_t PermissiveTag_sequence[] = {
static int
dissect_ess_PermissiveTag(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,
PermissiveTag_sequence, hf_index, ett_ess_PermissiveTag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PermissiveTag_sequence, hf_index, ett_ess_PermissiveTag);
return offset;
}
@ -671,7 +671,7 @@ static const value_string ess_FreeFormField_vals[] = {
{ 0, NULL }
};
static const ber_choice_t FreeFormField_choice[] = {
static const ber_old_choice_t FreeFormField_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitSetAttributes },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_securityAttributes },
{ 0, 0, 0, 0, NULL }
@ -679,9 +679,9 @@ static const ber_choice_t FreeFormField_choice[] = {
static int
dissect_ess_FreeFormField(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,
FreeFormField_choice, hf_index, ett_ess_FreeFormField,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
FreeFormField_choice, hf_index, ett_ess_FreeFormField,
NULL);
return offset;
}
@ -690,7 +690,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t InformativeTag_sequence[] = {
static const ber_old_sequence_t InformativeTag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributes },
{ 0, 0, 0, NULL }
@ -698,21 +698,21 @@ static const ber_sequence_t InformativeTag_sequence[] = {
static int
dissect_ess_InformativeTag(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,
InformativeTag_sequence, hf_index, ett_ess_InformativeTag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InformativeTag_sequence, hf_index, ett_ess_InformativeTag);
return offset;
}
static const ber_sequence_t EquivalentLabels_sequence_of[1] = {
static const ber_old_sequence_t EquivalentLabels_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_EquivalentLabels_item },
};
static int
dissect_ess_EquivalentLabels(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,
EquivalentLabels_sequence_of, hf_index, ett_ess_EquivalentLabels);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
EquivalentLabels_sequence_of, hf_index, ett_ess_EquivalentLabels);
return offset;
}
@ -724,7 +724,7 @@ static const value_string ess_EntityIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t EntityIdentifier_choice[] = {
static const ber_old_choice_t EntityIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier },
{ 0, 0, 0, 0, NULL }
@ -732,9 +732,9 @@ static const ber_choice_t EntityIdentifier_choice[] = {
static int
dissect_ess_EntityIdentifier(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,
EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier,
NULL);
return offset;
}
@ -774,7 +774,7 @@ static const value_string ess_MLReceiptPolicy_vals[] = {
{ 0, NULL }
};
static const ber_choice_t MLReceiptPolicy_choice[] = {
static const ber_old_choice_t MLReceiptPolicy_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_none_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insteadOf_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inAdditionTo_impl },
@ -783,9 +783,9 @@ static const ber_choice_t MLReceiptPolicy_choice[] = {
static int
dissect_ess_MLReceiptPolicy(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,
MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy,
NULL);
return offset;
}
@ -794,7 +794,7 @@ static int dissect_mlReceiptPolicy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t MLData_sequence[] = {
static const ber_old_sequence_t MLData_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy },
@ -803,8 +803,8 @@ static const ber_sequence_t MLData_sequence[] = {
static int
dissect_ess_MLData(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,
MLData_sequence, hf_index, ett_ess_MLData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MLData_sequence, hf_index, ett_ess_MLData);
return offset;
}
@ -813,14 +813,14 @@ static int dissect_MLExpansionHistory_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t MLExpansionHistory_sequence_of[1] = {
static const ber_old_sequence_t MLExpansionHistory_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MLExpansionHistory_item },
};
static int
dissect_ess_MLExpansionHistory(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,
MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory);
return offset;
}
@ -839,7 +839,7 @@ static int dissect_certHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t IssuerSerial_sequence[] = {
static const ber_old_sequence_t IssuerSerial_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
@ -847,8 +847,8 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
static int
dissect_ess_IssuerSerial(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,
IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
return offset;
}
@ -857,7 +857,7 @@ static int dissect_issuerSerial(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t ESSCertID_sequence[] = {
static const ber_old_sequence_t ESSCertID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_certHash },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerSerial },
{ 0, 0, 0, NULL }
@ -865,8 +865,8 @@ static const ber_sequence_t ESSCertID_sequence[] = {
static int
dissect_ess_ESSCertID(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,
ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
return offset;
}
@ -875,14 +875,14 @@ static int dissect_certs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
};
static int
dissect_ess_SEQUENCE_OF_ESSCertID(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_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID);
return offset;
}
@ -891,14 +891,14 @@ static int dissect_certs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item },
};
static int
dissect_ess_SEQUENCE_OF_PolicyInformation(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_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation);
return offset;
}
@ -907,7 +907,7 @@ static int dissect_policies(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SigningCertificate_sequence[] = {
static const ber_old_sequence_t SigningCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policies },
{ 0, 0, 0, NULL }
@ -915,8 +915,8 @@ static const ber_sequence_t SigningCertificate_sequence[] = {
static int
dissect_ess_SigningCertificate(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,
SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
return offset;
}

932
epan/dissectors/packet-ftam.c
View File

File diff suppressed because it is too large Load Diff

186
epan/dissectors/packet-ftbp.c
View File

@ -266,7 +266,7 @@ static const value_string ftbp_Pathname_Attribute_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Pathname_Attribute_choice[] = {
static const ber_old_choice_t Pathname_Attribute_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_incomplete_pathname_impl },
{ 23, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_complete_pathname_impl },
{ 0, 0, 0, 0, NULL }
@ -274,9 +274,9 @@ static const ber_choice_t Pathname_Attribute_choice[] = {
static int
dissect_ftbp_Pathname_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_choice(actx, tree, tvb, offset,
Pathname_Attribute_choice, hf_index, ett_ftbp_Pathname_Attribute,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Pathname_Attribute_choice, hf_index, ett_ftbp_Pathname_Attribute,
NULL);
return offset;
}
@ -314,7 +314,7 @@ static int dissect_graphic_string(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t PathnameandVersion_sequence[] = {
static const ber_old_sequence_t PathnameandVersion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_file_version_impl },
{ 0, 0, 0, NULL }
@ -322,8 +322,8 @@ static const ber_sequence_t PathnameandVersion_sequence[] = {
static int
dissect_ftbp_PathnameandVersion(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,
PathnameandVersion_sequence, hf_index, ett_ftbp_PathnameandVersion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PathnameandVersion_sequence, hf_index, ett_ftbp_PathnameandVersion);
return offset;
}
@ -362,7 +362,7 @@ static int dissect_user_relative_identifier_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t MessageReference_set[] = {
static const ber_old_sequence_t MessageReference_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_user_relative_identifier_impl },
{ 0, 0, 0, NULL }
@ -370,8 +370,8 @@ static const ber_sequence_t MessageReference_set[] = {
static int
dissect_ftbp_MessageReference(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(implicit_tag, actx, tree, tvb, offset,
MessageReference_set, hf_index, ett_ftbp_MessageReference);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
MessageReference_set, hf_index, ett_ftbp_MessageReference);
return offset;
}
@ -393,7 +393,7 @@ static int dissect_body_part_reference_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t CrossReference_sequence[] = {
static const ber_old_sequence_t CrossReference_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_application_cross_reference_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_message_reference_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_reference_impl },
@ -402,8 +402,8 @@ static const ber_sequence_t CrossReference_sequence[] = {
static int
dissect_ftbp_CrossReference(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,
CrossReference_sequence, hf_index, ett_ftbp_CrossReference);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CrossReference_sequence, hf_index, ett_ftbp_CrossReference);
return offset;
}
@ -418,7 +418,7 @@ static const value_string ftbp_FileIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t FileIdentifier_choice[] = {
static const ber_old_choice_t FileIdentifier_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pathname_and_version_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cross_reference_impl },
{ 0, 0, 0, 0, NULL }
@ -426,9 +426,9 @@ static const ber_choice_t FileIdentifier_choice[] = {
static int
dissect_ftbp_FileIdentifier(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,
FileIdentifier_choice, hf_index, ett_ftbp_FileIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
FileIdentifier_choice, hf_index, ett_ftbp_FileIdentifier,
NULL);
return offset;
}
@ -464,7 +464,7 @@ static const value_string ftbp_Relationship_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Relationship_choice[] = {
static const ber_old_choice_t Relationship_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_explicit_relationship_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptive_relationship_impl },
{ 0, 0, 0, 0, NULL }
@ -472,9 +472,9 @@ static const ber_choice_t Relationship_choice[] = {
static int
dissect_ftbp_Relationship(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,
Relationship_choice, hf_index, ett_ftbp_Relationship,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Relationship_choice, hf_index, ett_ftbp_Relationship,
NULL);
return offset;
}
@ -483,7 +483,7 @@ static int dissect_relationship(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t RelatedStoredFile_item_sequence[] = {
static const ber_old_sequence_t RelatedStoredFile_item_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_file_identifier },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_relationship },
{ 0, 0, 0, NULL }
@ -491,8 +491,8 @@ static const ber_sequence_t RelatedStoredFile_item_sequence[] = {
static int
dissect_ftbp_RelatedStoredFile_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,
RelatedStoredFile_item_sequence, hf_index, ett_ftbp_RelatedStoredFile_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RelatedStoredFile_item_sequence, hf_index, ett_ftbp_RelatedStoredFile_item);
return offset;
}
@ -501,14 +501,14 @@ static int dissect_RelatedStoredFile_item(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t RelatedStoredFile_set_of[1] = {
static const ber_old_sequence_t RelatedStoredFile_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelatedStoredFile_item },
};
static int
dissect_ftbp_RelatedStoredFile(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,
RelatedStoredFile_set_of, hf_index, ett_ftbp_RelatedStoredFile);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
RelatedStoredFile_set_of, hf_index, ett_ftbp_RelatedStoredFile);
return offset;
}
@ -544,7 +544,7 @@ static int dissect_parameter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t T_document_type_sequence[] = {
static const ber_old_sequence_t T_document_type_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_document_type_name },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_parameter_impl },
{ 0, 0, 0, NULL }
@ -552,8 +552,8 @@ static const ber_sequence_t T_document_type_sequence[] = {
static int
dissect_ftbp_T_document_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_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
T_document_type_sequence, hf_index, ett_ftbp_T_document_type);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_document_type_sequence, hf_index, ett_ftbp_T_document_type);
return offset;
}
@ -586,7 +586,7 @@ static int dissect_abstract_syntax_name(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
static const ber_old_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_constraint_set_name },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax_name },
{ 0, 0, 0, NULL }
@ -594,8 +594,8 @@ static const ber_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
static int
dissect_ftbp_T_constraint_set_and_abstract_syntax(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_constraint_set_and_abstract_syntax_sequence, hf_index, ett_ftbp_T_constraint_set_and_abstract_syntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_constraint_set_and_abstract_syntax_sequence, hf_index, ett_ftbp_T_constraint_set_and_abstract_syntax);
return offset;
}
@ -610,7 +610,7 @@ static const value_string ftbp_Contents_Type_Attribute_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Contents_Type_Attribute_choice[] = {
static const ber_old_choice_t Contents_Type_Attribute_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_document_type_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_constraint_set_and_abstract_syntax_impl },
{ 0, 0, 0, 0, NULL }
@ -618,9 +618,9 @@ static const ber_choice_t Contents_Type_Attribute_choice[] = {
static int
dissect_ftbp_Contents_Type_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_choice(actx, tree, tvb, offset,
Contents_Type_Attribute_choice, hf_index, ett_ftbp_Contents_Type_Attribute,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Contents_Type_Attribute_choice, hf_index, ett_ftbp_Contents_Type_Attribute,
NULL);
return offset;
}
@ -656,14 +656,14 @@ static int dissect_compression_algorithm_id_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t T_descriptive_identifier_sequence_of[1] = {
static const ber_old_sequence_t T_descriptive_identifier_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_descriptive_identifier_item },
};
static int
dissect_ftbp_T_descriptive_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_) {
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_descriptive_identifier_sequence_of, hf_index, ett_ftbp_T_descriptive_identifier);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_descriptive_identifier_sequence_of, hf_index, ett_ftbp_T_descriptive_identifier);
return offset;
}
@ -678,7 +678,7 @@ static const value_string ftbp_GeneralIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice_t GeneralIdentifier_choice[] = {
static const ber_old_choice_t GeneralIdentifier_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_registered_identifier_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptive_identifier_impl },
{ 0, 0, 0, 0, NULL }
@ -686,9 +686,9 @@ static const ber_choice_t GeneralIdentifier_choice[] = {
static int
dissect_ftbp_GeneralIdentifier(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,
GeneralIdentifier_choice, hf_index, ett_ftbp_GeneralIdentifier,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
GeneralIdentifier_choice, hf_index, ett_ftbp_GeneralIdentifier,
NULL);
return offset;
}
@ -700,14 +700,14 @@ static int dissect_machine_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t T_user_visible_string_sequence_of[1] = {
static const ber_old_sequence_t T_user_visible_string_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_user_visible_string_item },
};
static int
dissect_ftbp_T_user_visible_string(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_user_visible_string_sequence_of, hf_index, ett_ftbp_T_user_visible_string);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_user_visible_string_sequence_of, hf_index, ett_ftbp_T_user_visible_string);
return offset;
}
@ -716,7 +716,7 @@ static int dissect_user_visible_string_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t EnvironmentParameter_sequence[] = {
static const ber_old_sequence_t EnvironmentParameter_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_application_reference_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_machine_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_operating_system_impl },
@ -726,8 +726,8 @@ static const ber_sequence_t EnvironmentParameter_sequence[] = {
static int
dissect_ftbp_EnvironmentParameter(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,
EnvironmentParameter_sequence, hf_index, ett_ftbp_EnvironmentParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EnvironmentParameter_sequence, hf_index, ett_ftbp_EnvironmentParameter);
return offset;
}
@ -749,7 +749,7 @@ static int dissect_compression_algorithm_param_impl(proto_tree *tree _U_, tvbuff
}
static const ber_sequence_t CompressionParameter_sequence[] = {
static const ber_old_sequence_t CompressionParameter_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_compression_algorithm_id_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_compression_algorithm_param_impl },
{ 0, 0, 0, NULL }
@ -757,8 +757,8 @@ static const ber_sequence_t CompressionParameter_sequence[] = {
static int
dissect_ftbp_CompressionParameter(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,
CompressionParameter_sequence, hf_index, ett_ftbp_CompressionParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CompressionParameter_sequence, hf_index, ett_ftbp_CompressionParameter);
return offset;
}
@ -799,7 +799,7 @@ static const value_string ftbp_Account_Attribute_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Account_Attribute_choice[] = {
static const ber_old_choice_t Account_Attribute_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_account_actual_values },
{ 0, 0, 0, 0, NULL }
@ -807,9 +807,9 @@ static const ber_choice_t Account_Attribute_choice[] = {
static int
dissect_ftbp_Account_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_choice(actx, tree, tvb, offset,
Account_Attribute_choice, hf_index, ett_ftbp_Account_Attribute,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Account_Attribute_choice, hf_index, ett_ftbp_Account_Attribute,
NULL);
return offset;
}
@ -841,7 +841,7 @@ static const value_string ftbp_User_Identity_Attribute_vals[] = {
{ 0, NULL }
};
static const ber_choice_t User_Identity_Attribute_choice[] = {
static const ber_old_choice_t User_Identity_Attribute_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_identity_actual_values },
{ 0, 0, 0, 0, NULL }
@ -849,9 +849,9 @@ static const ber_choice_t User_Identity_Attribute_choice[] = {
static int
dissect_ftbp_User_Identity_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_choice(actx, tree, tvb, offset,
User_Identity_Attribute_choice, hf_index, ett_ftbp_User_Identity_Attribute,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
User_Identity_Attribute_choice, hf_index, ett_ftbp_User_Identity_Attribute,
NULL);
return offset;
}
@ -900,7 +900,7 @@ static const value_string ftbp_Password_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Password_choice[] = {
static const ber_old_choice_t Password_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_graphic_string },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_string },
{ 0, 0, 0, 0, NULL }
@ -908,9 +908,9 @@ static const ber_choice_t Password_choice[] = {
static int
dissect_ftbp_Password(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,
Password_choice, hf_index, ett_ftbp_Password,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Password_choice, hf_index, ett_ftbp_Password,
NULL);
return offset;
}
@ -946,14 +946,14 @@ static int dissect_Pass_Passwords_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t Pass_Passwords_sequence_of[1] = {
static const ber_old_sequence_t Pass_Passwords_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Pass_Passwords_item },
};
static int
dissect_ftbp_Pass_Passwords(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,
Pass_Passwords_sequence_of, hf_index, ett_ftbp_Pass_Passwords);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Pass_Passwords_sequence_of, hf_index, ett_ftbp_Pass_Passwords);
return offset;
}
@ -962,7 +962,7 @@ static int dissect_pass_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t Access_Passwords_sequence[] = {
static const ber_old_sequence_t Access_Passwords_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_read_password_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_insert_password_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_replace_password_impl },
@ -978,8 +978,8 @@ static const ber_sequence_t Access_Passwords_sequence[] = {
static int
dissect_ftbp_Access_Passwords(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,
Access_Passwords_sequence, hf_index, ett_ftbp_Access_Passwords);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Access_Passwords_sequence, hf_index, ett_ftbp_Access_Passwords);
return offset;
}
@ -988,7 +988,7 @@ static int dissect_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t Application_Entity_Title_sequence[] = {
static const ber_old_sequence_t Application_Entity_Title_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_qualifier },
{ 0, 0, 0, NULL }
@ -996,8 +996,8 @@ static const ber_sequence_t Application_Entity_Title_sequence[] = {
static int
dissect_ftbp_Application_Entity_Title(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,
Application_Entity_Title_sequence, hf_index, ett_ftbp_Application_Entity_Title);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Application_Entity_Title_sequence, hf_index, ett_ftbp_Application_Entity_Title);
return offset;
}
@ -1006,7 +1006,7 @@ static int dissect_location_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t Access_Control_Element_sequence[] = {
static const ber_old_sequence_t Access_Control_Element_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_action_list_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concurrency_access_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_identity_impl },
@ -1017,8 +1017,8 @@ static const ber_sequence_t Access_Control_Element_sequence[] = {
static int
dissect_ftbp_Access_Control_Element(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,
Access_Control_Element_sequence, hf_index, ett_ftbp_Access_Control_Element);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Access_Control_Element_sequence, hf_index, ett_ftbp_Access_Control_Element);
return offset;
}
@ -1027,14 +1027,14 @@ static int dissect_actual_values_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
static const ber_old_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values_item },
};
static int
dissect_ftbp_SET_OF_Access_Control_Element(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_Access_Control_Element_set_of, hf_index, ett_ftbp_SET_OF_Access_Control_Element);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Access_Control_Element_set_of, hf_index, ett_ftbp_SET_OF_Access_Control_Element);
return offset;
}
@ -1049,7 +1049,7 @@ static const value_string ftbp_Access_Control_Attribute_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Access_Control_Attribute_choice[] = {
static const ber_old_choice_t Access_Control_Attribute_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values_impl },
{ 0, 0, 0, 0, NULL }
@ -1057,9 +1057,9 @@ static const ber_choice_t Access_Control_Attribute_choice[] = {
static int
dissect_ftbp_Access_Control_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_choice(actx, tree, tvb, offset,
Access_Control_Attribute_choice, hf_index, ett_ftbp_Access_Control_Attribute,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Access_Control_Attribute_choice, hf_index, ett_ftbp_Access_Control_Attribute,
NULL);
return offset;
}
@ -1068,7 +1068,7 @@ static int dissect_access_control_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t FileAttributes_sequence[] = {
static const ber_old_sequence_t FileAttributes_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_storage_account_impl },
@ -1092,8 +1092,8 @@ static const ber_sequence_t FileAttributes_sequence[] = {
static int
dissect_ftbp_FileAttributes(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,
FileAttributes_sequence, hf_index, ett_ftbp_FileAttributes);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
FileAttributes_sequence, hf_index, ett_ftbp_FileAttributes);
return offset;
}
@ -1102,7 +1102,7 @@ static int dissect_file_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t FileTransferParameters_sequence[] = {
static const ber_old_sequence_t FileTransferParameters_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_related_stored_file_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_contents_type_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_environment_impl },
@ -1114,21 +1114,21 @@ static const ber_sequence_t FileTransferParameters_sequence[] = {
static int
dissect_ftbp_FileTransferParameters(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,
FileTransferParameters_sequence, hf_index, ett_ftbp_FileTransferParameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
FileTransferParameters_sequence, hf_index, ett_ftbp_FileTransferParameters);
return offset;
}
static const ber_sequence_t FileTransferData_sequence_of[1] = {
static const ber_old_sequence_t FileTransferData_sequence_of[1] = {
{ BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_FileTransferData_item },
};
static int
dissect_ftbp_FileTransferData(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,
FileTransferData_sequence_of, hf_index, ett_ftbp_FileTransferData);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
FileTransferData_sequence_of, hf_index, ett_ftbp_FileTransferData);
return offset;
}

692
epan/dissectors/packet-gnm.c
View File

File diff suppressed because it is too large Load Diff

44
epan/dissectors/packet-gsm_a.c
View File

@ -7658,7 +7658,7 @@ static const value_string ROS_OPERATION_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OPERATION_choice[] = {
static const ber_old_choice_t OPERATION_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
{ 0, 0, 0, 0, NULL }
@ -7666,7 +7666,7 @@ static const ber_choice_t OPERATION_choice[] = {
static int
dissect_ROS_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OPERATION_choice, hf_index, ett_ROS_OPERATION, NULL);
return offset;
@ -7687,7 +7687,7 @@ static int dissect_parameter( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
return dissect_ROS_Parameter(FALSE, tvb, offset, actx, tree, hf_ROS_parameter);
}
static const ber_sequence_t Invoke_sequence[] = {
static const ber_old_sequence_t Invoke_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@ -7697,7 +7697,7 @@ static const ber_sequence_t Invoke_sequence[] = {
static int
dissect_ROS_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Invoke_sequence, hf_index, ett_ROS_Invoke);
return offset;
@ -7706,7 +7706,7 @@ static int dissect_invoke_impl( proto_tree *tree, tvbuff_t *tvb, int offset, asn
return dissect_ROS_Invoke(TRUE, tvb, offset, actx, tree, hf_ROS_invoke);
}
static const ber_sequence_t T_resultretres_sequence[] = {
static const ber_old_sequence_t T_resultretres_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
{ 0, 0, 0, NULL }
@ -7714,7 +7714,7 @@ static const ber_sequence_t T_resultretres_sequence[] = {
static int
dissect_ROS_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_resultretres_sequence, hf_index, ett_ROS_T_resultretres);
return offset;
@ -7723,7 +7723,7 @@ static int dissect_resultretres( proto_tree *tree, tvbuff_t *tvb, int offset, as
return dissect_ROS_T_resultretres(FALSE, tvb, offset, actx, tree, hf_ROS_resultretres);
}
static const ber_sequence_t ReturnResult_sequence[] = {
static const ber_old_sequence_t ReturnResult_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
{ 0, 0, 0, NULL }
@ -7731,7 +7731,7 @@ static const ber_sequence_t ReturnResult_sequence[] = {
static int
dissect_ROS_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResult_sequence, hf_index, ett_ROS_ReturnResult);
return offset;
@ -7760,7 +7760,7 @@ static const value_string ROS_ErrorCode_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ErrorCode_choice[] = {
static const ber_old_choice_t ErrorCode_choice[] = {
{ 19, BER_CLASS_PRI, 19, BER_FLAGS_IMPLTAG, dissect_nationaler_impl },
{ 20, BER_CLASS_PRI, 20, BER_FLAGS_IMPLTAG, dissect_privateer_impl },
{ 0, 0, 0, 0, NULL }
@ -7768,7 +7768,7 @@ static const ber_choice_t ErrorCode_choice[] = {
static int
dissect_ROS_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ErrorCode_choice, hf_index, ett_ROS_ErrorCode, NULL);
return offset;
@ -7777,7 +7777,7 @@ static int dissect_errorCode( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
return dissect_ROS_ErrorCode(FALSE, tvb, offset, actx, tree, hf_ROS_errorCode);
}
static const ber_sequence_t ReturnError_sequence[] = {
static const ber_old_sequence_t ReturnError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_PRI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@ -7786,7 +7786,7 @@ static const ber_sequence_t ReturnError_sequence[] = {
static int
dissect_ROS_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnError_sequence, hf_index, ett_ROS_ReturnError);
return offset;
@ -7814,7 +7814,7 @@ static const value_string ROS_T_invokeIDRej_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_invokeIDRej_choice[] = {
static const ber_old_choice_t T_invokeIDRej_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
{ 0, 0, 0, 0, NULL }
@ -7822,7 +7822,7 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
static int
dissect_ROS_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_invokeIDRej_choice, hf_index, ett_ROS_T_invokeIDRej, NULL);
return offset;
@ -7927,7 +7927,7 @@ static const value_string ROS_T_problem_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_problem_choice[] = {
static const ber_old_choice_t T_problem_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@ -7937,7 +7937,7 @@ static const ber_choice_t T_problem_choice[] = {
static int
dissect_ROS_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_problem_choice, hf_index, ett_ROS_T_problem, NULL);
return offset;
@ -7946,7 +7946,7 @@ static int dissect_problem( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
return dissect_ROS_T_problem(FALSE, tvb, offset, actx, tree, hf_ROS_problem);
}
static const ber_sequence_t Reject_sequence[] = {
static const ber_old_sequence_t Reject_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
{ 0, 0, 0, NULL }
@ -7954,7 +7954,7 @@ static const ber_sequence_t Reject_sequence[] = {
static int
dissect_ROS_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Reject_sequence, hf_index, ett_ROS_Reject);
return offset;
@ -7972,7 +7972,7 @@ static const value_string ROS_Component_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Component_choice[] = {
static const ber_old_choice_t Component_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@ -7983,7 +7983,7 @@ static const ber_choice_t Component_choice[] = {
static int
dissect_ROS_Component(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Component_choice, hf_index, ett_ROS_Component, NULL);
/* branch taken will be component type -1 */
@ -7998,7 +7998,7 @@ static const value_string ROS_ERROR_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ERROR_choice[] = {
static const ber_old_choice_t ERROR_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
{ 0, 0, 0, 0, NULL }
@ -8006,7 +8006,7 @@ static const ber_choice_t ERROR_choice[] = {
static int
dissect_ROS_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ERROR_choice, hf_index, ett_ROS_ERROR, NULL);
return offset;

2448
epan/dissectors/packet-gsm_map.c
View File

File diff suppressed because it is too large Load Diff

160
epan/dissectors/packet-gsm_ss.c
View File

@ -474,7 +474,7 @@ static int dissect_ect_CallState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t RemotePartyNumber_sequence[] = {
static const ber_old_sequence_t RemotePartyNumber_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_partyNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_partyNumberSubaddress_impl },
{ 0, 0, 0, NULL }
@ -482,8 +482,8 @@ static const ber_sequence_t RemotePartyNumber_sequence[] = {
static int
dissect_gsm_ss_RemotePartyNumber(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,
RemotePartyNumber_sequence, hf_index, ett_gsm_ss_RemotePartyNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RemotePartyNumber_sequence, hf_index, ett_gsm_ss_RemotePartyNumber);
return offset;
}
@ -503,7 +503,7 @@ static const value_string gsm_ss_RDN_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RDN_choice[] = {
static const ber_old_choice_t RDN_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddress_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -513,9 +513,9 @@ static const ber_choice_t RDN_choice[] = {
static int
dissect_gsm_ss_RDN(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,
RDN_choice, hf_index, ett_gsm_ss_RDN,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RDN_choice, hf_index, ett_gsm_ss_RDN,
NULL);
return offset;
}
@ -524,7 +524,7 @@ static int dissect_rdn_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ECT_Indicator_sequence[] = {
static const ber_old_sequence_t ECT_Indicator_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ect_CallState_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_rdn_impl },
{ 0, 0, 0, NULL }
@ -532,8 +532,8 @@ static const ber_sequence_t ECT_Indicator_sequence[] = {
static int
dissect_gsm_ss_ECT_Indicator(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,
ECT_Indicator_sequence, hf_index, ett_gsm_ss_ECT_Indicator);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ECT_Indicator_sequence, hf_index, ett_gsm_ss_ECT_Indicator);
return offset;
}
@ -555,7 +555,7 @@ static int dissect_lengthInCharacters_impl(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t NameSet_sequence[] = {
static const ber_old_sequence_t NameSet_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lengthInCharacters_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameString_impl },
@ -564,8 +564,8 @@ static const ber_sequence_t NameSet_sequence[] = {
static int
dissect_gsm_ss_NameSet(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,
NameSet_sequence, hf_index, ett_gsm_ss_NameSet);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NameSet_sequence, hf_index, ett_gsm_ss_NameSet);
return offset;
}
@ -585,7 +585,7 @@ static const value_string gsm_ss_Name_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Name_choice[] = {
static const ber_old_choice_t Name_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowed_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameUnavailable_impl },
@ -595,9 +595,9 @@ static const ber_choice_t Name_choice[] = {
static int
dissect_gsm_ss_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_gsm_ss_Name,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Name_choice, hf_index, ett_gsm_ss_Name,
NULL);
return offset;
}
@ -606,15 +606,15 @@ static int dissect_callingName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t NameIndicator_sequence[] = {
static const ber_old_sequence_t NameIndicator_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingName_impl },
{ 0, 0, 0, NULL }
};
static int
dissect_gsm_ss_NameIndicator(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,
NameIndicator_sequence, hf_index, ett_gsm_ss_NameIndicator);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NameIndicator_sequence, hf_index, ett_gsm_ss_NameIndicator);
return offset;
}
@ -642,7 +642,7 @@ static int dissect_multicall_Indicator_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t NotifySS_Arg_sequence[] = {
static const ber_old_sequence_t NotifySS_Arg_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
{ BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Notification_impl },
@ -661,8 +661,8 @@ static const ber_sequence_t NotifySS_Arg_sequence[] = {
static int
dissect_gsm_ss_NotifySS_Arg(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,
NotifySS_Arg_sequence, hf_index, ett_gsm_ss_NotifySS_Arg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NotifySS_Arg_sequence, hf_index, ett_gsm_ss_NotifySS_Arg);
return offset;
}
@ -685,7 +685,7 @@ static int dissect_processUnstructuredSS_Data(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t ForwardCUG_InfoArg_sequence[] = {
static const ber_old_sequence_t ForwardCUG_InfoArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_Index_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppressPrefCUG_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppressOA_impl },
@ -694,8 +694,8 @@ static const ber_sequence_t ForwardCUG_InfoArg_sequence[] = {
static int
dissect_gsm_ss_ForwardCUG_InfoArg(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,
ForwardCUG_InfoArg_sequence, hf_index, ett_gsm_ss_ForwardCUG_InfoArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ForwardCUG_InfoArg_sequence, hf_index, ett_gsm_ss_ForwardCUG_InfoArg);
return offset;
}
@ -704,14 +704,14 @@ static int dissect_forwardCUG_Info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t AccessRegisterCCEntryArg_sequence[] = {
static const ber_old_sequence_t AccessRegisterCCEntryArg_sequence[] = {
{ 0, 0, 0, NULL }
};
static int
dissect_gsm_ss_AccessRegisterCCEntryArg(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,
AccessRegisterCCEntryArg_sequence, hf_index, ett_gsm_ss_AccessRegisterCCEntryArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AccessRegisterCCEntryArg_sequence, hf_index, ett_gsm_ss_AccessRegisterCCEntryArg);
return offset;
}
@ -811,7 +811,7 @@ static int dissect_e7_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t ChargingInformation_sequence[] = {
static const ber_old_sequence_t ChargingInformation_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e1_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e2_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e3_impl },
@ -824,8 +824,8 @@ static const ber_sequence_t ChargingInformation_sequence[] = {
static int
dissect_gsm_ss_ChargingInformation(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,
ChargingInformation_sequence, hf_index, ett_gsm_ss_ChargingInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ChargingInformation_sequence, hf_index, ett_gsm_ss_ChargingInformation);
return offset;
}
@ -834,7 +834,7 @@ static int dissect_chargingInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t ForwardChargeAdviceArg_sequence[] = {
static const ber_old_sequence_t ForwardChargeAdviceArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_chargingInformation_impl },
{ 0, 0, 0, NULL }
@ -842,8 +842,8 @@ static const ber_sequence_t ForwardChargeAdviceArg_sequence[] = {
static int
dissect_gsm_ss_ForwardChargeAdviceArg(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,
ForwardChargeAdviceArg_sequence, hf_index, ett_gsm_ss_ForwardChargeAdviceArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ForwardChargeAdviceArg_sequence, hf_index, ett_gsm_ss_ForwardChargeAdviceArg);
return offset;
}
@ -852,7 +852,7 @@ static int dissect_forwardChargeAdvice(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t CallDeflectionArg_sequence[] = {
static const ber_old_sequence_t CallDeflectionArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_deflectedToNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deflectedToSubaddress_impl },
{ 0, 0, 0, NULL }
@ -860,8 +860,8 @@ static const ber_sequence_t CallDeflectionArg_sequence[] = {
static int
dissect_gsm_ss_CallDeflectionArg(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,
CallDeflectionArg_sequence, hf_index, ett_gsm_ss_CallDeflectionArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CallDeflectionArg_sequence, hf_index, ett_gsm_ss_CallDeflectionArg);
return offset;
}
@ -870,7 +870,7 @@ static int dissect_callDeflection(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t LocationNotificationArg_sequence[] = {
static const ber_old_sequence_t LocationNotificationArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_notificationType_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_locationType_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientExternalID_impl },
@ -883,8 +883,8 @@ static const ber_sequence_t LocationNotificationArg_sequence[] = {
static int
dissect_gsm_ss_LocationNotificationArg(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,
LocationNotificationArg_sequence, hf_index, ett_gsm_ss_LocationNotificationArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LocationNotificationArg_sequence, hf_index, ett_gsm_ss_LocationNotificationArg);
return offset;
}
@ -947,7 +947,7 @@ static int dissect_gpsAssistanceData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t LCS_MOLRArg_sequence[] = {
static const ber_old_sequence_t LCS_MOLRArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_molr_Type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationMethod_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_QoS_impl },
@ -964,8 +964,8 @@ static const ber_sequence_t LCS_MOLRArg_sequence[] = {
static int
dissect_gsm_ss_LCS_MOLRArg(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,
LCS_MOLRArg_sequence, hf_index, ett_gsm_ss_LCS_MOLRArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LCS_MOLRArg_sequence, hf_index, ett_gsm_ss_LCS_MOLRArg);
return offset;
}
@ -974,7 +974,7 @@ static int dissect_lcs_MOLR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t LCS_AreaEventRequestArg_sequence[] = {
static const ber_old_sequence_t LCS_AreaEventRequestArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_deferredLocationEventType_impl },
@ -984,8 +984,8 @@ static const ber_sequence_t LCS_AreaEventRequestArg_sequence[] = {
static int
dissect_gsm_ss_LCS_AreaEventRequestArg(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,
LCS_AreaEventRequestArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventRequestArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LCS_AreaEventRequestArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventRequestArg);
return offset;
}
@ -994,7 +994,7 @@ static int dissect_lcs_AreaEventRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t LCS_AreaEventReportArg_sequence[] = {
static const ber_old_sequence_t LCS_AreaEventReportArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
{ 0, 0, 0, NULL }
@ -1002,8 +1002,8 @@ static const ber_sequence_t LCS_AreaEventReportArg_sequence[] = {
static int
dissect_gsm_ss_LCS_AreaEventReportArg(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,
LCS_AreaEventReportArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventReportArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LCS_AreaEventReportArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventReportArg);
return offset;
}
@ -1012,7 +1012,7 @@ static int dissect_lcs_AreaEventReport(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
static const ber_old_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
{ 0, 0, 0, NULL }
@ -1020,8 +1020,8 @@ static const ber_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
static int
dissect_gsm_ss_LCS_AreaEventCancellationArg(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,
LCS_AreaEventCancellationArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventCancellationArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LCS_AreaEventCancellationArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventCancellationArg);
return offset;
}
@ -1045,7 +1045,7 @@ static const value_string gsm_ss_DummySS_operationsArg_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DummySS_operationsArg_choice[] = {
static const ber_old_choice_t DummySS_operationsArg_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notifySS },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_processUnstructuredSS_Data },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardCUG_Info },
@ -1062,9 +1062,9 @@ static const ber_choice_t DummySS_operationsArg_choice[] = {
static int
dissect_gsm_ss_DummySS_operationsArg(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,
DummySS_operationsArg_choice, hf_index, ett_gsm_ss_DummySS_operationsArg,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DummySS_operationsArg_choice, hf_index, ett_gsm_ss_DummySS_operationsArg,
NULL);
return offset;
}
@ -1131,7 +1131,7 @@ static const value_string gsm_ss_T_basicServiceGroup_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_basicServiceGroup_choice[] = {
static const ber_old_choice_t T_basicServiceGroup_choice[] = {
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_bearerService_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_teleservice_impl },
{ 0, 0, 0, 0, NULL }
@ -1139,9 +1139,9 @@ static const ber_choice_t T_basicServiceGroup_choice[] = {
static int
dissect_gsm_ss_T_basicServiceGroup(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_basicServiceGroup_choice, hf_index, ett_gsm_ss_T_basicServiceGroup,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_basicServiceGroup_choice, hf_index, ett_gsm_ss_T_basicServiceGroup,
NULL);
return offset;
}
@ -1150,7 +1150,7 @@ static int dissect_basicServiceGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t T_ccbs_Feature_sequence[] = {
static const ber_old_sequence_t T_ccbs_Feature_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberNumber_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberSubaddress_impl },
@ -1160,8 +1160,8 @@ static const ber_sequence_t T_ccbs_Feature_sequence[] = {
static int
dissect_gsm_ss_T_ccbs_Feature(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_ccbs_Feature_sequence, hf_index, ett_gsm_ss_T_ccbs_Feature);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_ccbs_Feature_sequence, hf_index, ett_gsm_ss_T_ccbs_Feature);
return offset;
}
@ -1170,15 +1170,15 @@ static int dissect_ccbs_Feature1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t RegisterCC_EntryRes_sequence[] = {
static const ber_old_sequence_t RegisterCC_EntryRes_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Feature1_impl },
{ 0, 0, 0, NULL }
};
static int
dissect_gsm_ss_RegisterCC_EntryRes(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,
RegisterCC_EntryRes_sequence, hf_index, ett_gsm_ss_RegisterCC_EntryRes);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RegisterCC_EntryRes_sequence, hf_index, ett_gsm_ss_RegisterCC_EntryRes);
return offset;
}
@ -1206,15 +1206,15 @@ static int dissect_verificationResponse_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t LocationNotificationRes_sequence[] = {
static const ber_old_sequence_t LocationNotificationRes_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_verificationResponse_impl },
{ 0, 0, 0, NULL }
};
static int
dissect_gsm_ss_LocationNotificationRes(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,
LocationNotificationRes_sequence, hf_index, ett_gsm_ss_LocationNotificationRes);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LocationNotificationRes_sequence, hf_index, ett_gsm_ss_LocationNotificationRes);
return offset;
}
@ -1236,7 +1236,7 @@ static int dissect_decipheringKeys_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t LCS_MOLRRes_sequence[] = {
static const ber_old_sequence_t LCS_MOLRRes_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationEstimate_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_decipheringKeys_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_add_LocationEstimate_impl },
@ -1245,8 +1245,8 @@ static const ber_sequence_t LCS_MOLRRes_sequence[] = {
static int
dissect_gsm_ss_LCS_MOLRRes(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,
LCS_MOLRRes_sequence, hf_index, ett_gsm_ss_LCS_MOLRRes);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LCS_MOLRRes_sequence, hf_index, ett_gsm_ss_LCS_MOLRRes);
return offset;
}
@ -1262,7 +1262,7 @@ static const value_string gsm_ss_DummySS_operationsRes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DummySS_operationsRes_choice[] = {
static const ber_old_choice_t DummySS_operationsRes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_registerCC_EntryRes },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_LocationNotification_res },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_MOLR_res },
@ -1271,9 +1271,9 @@ static const ber_choice_t DummySS_operationsRes_choice[] = {
static int
dissect_gsm_ss_DummySS_operationsRes(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,
DummySS_operationsRes_choice, hf_index, ett_gsm_ss_DummySS_operationsRes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DummySS_operationsRes_choice, hf_index, ett_gsm_ss_DummySS_operationsRes,
NULL);
return offset;
}
@ -1311,7 +1311,7 @@ static int dissect_uUS_Required_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t UserUserServiceArg_sequence[] = {
static const ber_old_sequence_t UserUserServiceArg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_uUS_Service_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_uUS_Required_impl },
{ 0, 0, 0, NULL }
@ -1319,8 +1319,8 @@ static const ber_sequence_t UserUserServiceArg_sequence[] = {
static int
dissect_gsm_ss_UserUserServiceArg(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,
UserUserServiceArg_sequence, hf_index, ett_gsm_ss_UserUserServiceArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UserUserServiceArg_sequence, hf_index, ett_gsm_ss_UserUserServiceArg);
return offset;
}

868
epan/dissectors/packet-h248.c
View File

File diff suppressed because it is too large Load Diff

826
epan/dissectors/packet-inap.c
View File

File diff suppressed because it is too large Load Diff

290
epan/dissectors/packet-kerberos.c
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/packet-kpasswd.c
View File

@ -90,7 +90,7 @@ static int dissect_kpasswd_newpassword(proto_tree *tree, tvbuff_t *tvb, int offs
return offset;
}
static ber_sequence_t ChangePasswdData_sequence[] = {
static ber_old_sequence_t ChangePasswdData_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_kpasswd_newpassword },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -107,7 +107,7 @@ dissect_kpasswd_user_data_request(packet_info *pinfo, tvbuff_t *tvb, proto_tree
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
offset=dissect_ber_sequence(FALSE, &asn1_ctx, tree, tvb, offset, ChangePasswdData_sequence, hf_kpasswd_ChangePasswdData, ett_ChangePasswdData);
offset=dissect_ber_old_sequence(FALSE, &asn1_ctx, tree, tvb, offset, ChangePasswdData_sequence, hf_kpasswd_ChangePasswdData, ett_ChangePasswdData);
return offset;
}

248
epan/dissectors/packet-ldap.c
View File

@ -1007,7 +1007,7 @@ static int dissect_credentials(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SaslCredentials_sequence[] = {
static const ber_old_sequence_t SaslCredentials_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mechanism },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_credentials },
{ 0, 0, 0, NULL }
@ -1015,8 +1015,8 @@ static const ber_sequence_t SaslCredentials_sequence[] = {
static int
dissect_ldap_SaslCredentials(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,
SaslCredentials_sequence, hf_index, ett_ldap_SaslCredentials);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SaslCredentials_sequence, hf_index, ett_ldap_SaslCredentials);
return offset;
}
@ -1071,7 +1071,7 @@ static const value_string ldap_AuthenticationChoice_vals[] = {
{ 0, NULL }
};
static const ber_choice_t AuthenticationChoice_choice[] = {
static const ber_old_choice_t AuthenticationChoice_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_simple_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_sasl_impl },
{ 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_ntlmsspNegotiate_impl },
@ -1086,9 +1086,9 @@ dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
gint auth = -1;
const gchar *valstr;
offset = dissect_ber_choice(actx, tree, tvb, offset,
AuthenticationChoice_choice, hf_index, ett_ldap_AuthenticationChoice,
&branch);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AuthenticationChoice_choice, hf_index, ett_ldap_AuthenticationChoice,
&branch);
ldap_do_protocolop(actx->pinfo);
@ -1115,7 +1115,7 @@ static int dissect_authentication(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t BindRequest_sequence[] = {
static const ber_old_sequence_t BindRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_name },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authentication },
@ -1124,8 +1124,8 @@ static const ber_sequence_t BindRequest_sequence[] = {
static int
dissect_ldap_BindRequest(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,
BindRequest_sequence, hf_index, ett_ldap_BindRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BindRequest_sequence, hf_index, ett_ldap_BindRequest);
return offset;
}
@ -1272,14 +1272,14 @@ static int dissect_SearchResultReference_item(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t Referral_sequence_of[1] = {
static const ber_old_sequence_t Referral_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Referral_item },
};
static int
dissect_ldap_Referral(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,
Referral_sequence_of, hf_index, ett_ldap_Referral);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Referral_sequence_of, hf_index, ett_ldap_Referral);
return offset;
}
@ -1363,7 +1363,7 @@ static int dissect_serverSaslCreds_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t BindResponse_sequence[] = {
static const ber_old_sequence_t BindResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_bindResponse_resultCode },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN1 },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@ -1374,8 +1374,8 @@ static const ber_sequence_t BindResponse_sequence[] = {
static int
dissect_ldap_BindResponse(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,
BindResponse_sequence, hf_index, ett_ldap_BindResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BindResponse_sequence, hf_index, ett_ldap_BindResponse);
return offset;
}
@ -1537,14 +1537,14 @@ static int dissect_and_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t T_and_set_of[1] = {
static const ber_old_sequence_t T_and_set_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
static int
dissect_ldap_T_and(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 502 "ldap.cnf"
const ber_sequence_t and_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
const ber_old_sequence_t and_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
proto_tree *tr=NULL;
proto_item *it=NULL;
@ -1555,7 +1555,7 @@ dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "and: ");
tr=proto_item_add_subtree(it, ett_ldap_T_and);
}
offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
and_set_of, -1, ett_ldap_T_and);
proto_item_append_text(it, "%s", and_filter_string);
@ -1592,14 +1592,14 @@ static int dissect_or_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t T_or_set_of[1] = {
static const ber_old_sequence_t T_or_set_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
};
static int
dissect_ldap_T_or(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 529 "ldap.cnf"
const ber_sequence_t or_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
const ber_old_sequence_t or_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
};
proto_tree *tr=NULL;
proto_item *it=NULL;
@ -1610,7 +1610,7 @@ dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "or: ");
tr=proto_item_add_subtree(it, ett_ldap_T_or);
}
offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
or_set_of, -1, ett_ldap_T_or);
proto_item_append_text(it, "%s", or_filter_string);
@ -1676,7 +1676,7 @@ static int dissect_matchValue_impl(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_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeDesc },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_assertionValue },
{ 0, 0, 0, NULL }
@ -1684,8 +1684,8 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = {
static int
dissect_ldap_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_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeValueAssertion_sequence, hf_index, ett_ldap_AttributeValueAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeValueAssertion_sequence, hf_index, ett_ldap_AttributeValueAssertion);
return offset;
}
@ -1718,7 +1718,7 @@ static const value_string ldap_T_substringFilter_substrings_item_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_substringFilter_substrings_item_choice[] = {
static const ber_old_choice_t T_substringFilter_substrings_item_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initial_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_any_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_final_impl },
@ -1727,9 +1727,9 @@ static const ber_choice_t T_substringFilter_substrings_item_choice[] = {
static int
dissect_ldap_T_substringFilter_substrings_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_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
NULL);
#line 577 "ldap.cnf"
if (substring_item_final) {
@ -1753,14 +1753,14 @@ static int dissect_substringFilter_substrings_item(proto_tree *tree _U_, tvbuff_
}
static const ber_sequence_t T_substringFilter_substrings_sequence_of[1] = {
static const ber_old_sequence_t T_substringFilter_substrings_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substringFilter_substrings_item },
};
static int
dissect_ldap_T_substringFilter_substrings(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_substringFilter_substrings_sequence_of, hf_index, ett_ldap_T_substringFilter_substrings);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_substringFilter_substrings_sequence_of, hf_index, ett_ldap_T_substringFilter_substrings);
return offset;
}
@ -1769,7 +1769,7 @@ static int dissect_substringFilter_substrings(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t SubstringFilter_sequence[] = {
static const ber_old_sequence_t SubstringFilter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substringFilter_substrings },
{ 0, 0, 0, NULL }
@ -1790,7 +1790,7 @@ dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "substring: ");
tr=proto_item_add_subtree(it, ett_ldap_SubstringFilter);
}
offset = dissect_ber_sequence(implicit_tag, actx, tr, tvb, offset,
offset = dissect_ber_old_sequence(implicit_tag, actx, tr, tvb, offset,
SubstringFilter_sequence, hf_index,
ett_ldap_SubstringFilter);
@ -1888,7 +1888,7 @@ static int dissect_orderingRule_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
static const ber_old_sequence_t MatchingRuleAssertion_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_matchingRule_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_matchValue_impl },
@ -1898,8 +1898,8 @@ static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
static int
dissect_ldap_MatchingRuleAssertion(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,
MatchingRuleAssertion_sequence, hf_index, ett_ldap_MatchingRuleAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MatchingRuleAssertion_sequence, hf_index, ett_ldap_MatchingRuleAssertion);
return offset;
}
@ -1947,7 +1947,7 @@ static const value_string ldap_Filter_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Filter_choice[] = {
static const ber_old_choice_t Filter_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_and_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_or_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_not_impl },
@ -1971,7 +1971,7 @@ dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Filter: ");
tr=proto_item_add_subtree(it, ett_ldap_Filter);
}
offset = dissect_ber_choice(actx, tr, tvb, offset,
offset = dissect_ber_old_choice(actx, tr, tvb, offset,
Filter_choice, -1, ett_ldap_Filter,
NULL);
@ -2004,14 +2004,14 @@ static int dissect_filter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t AttributeDescriptionList_sequence_of[1] = {
static const ber_old_sequence_t AttributeDescriptionList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_AttributeDescriptionList_item },
};
static int
dissect_ldap_AttributeDescriptionList(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,
AttributeDescriptionList_sequence_of, hf_index, ett_ldap_AttributeDescriptionList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AttributeDescriptionList_sequence_of, hf_index, ett_ldap_AttributeDescriptionList);
return offset;
}
@ -2020,7 +2020,7 @@ static int dissect_searchRequest_attributes(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t SearchRequest_sequence[] = {
static const ber_old_sequence_t SearchRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_baseObject },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_scope },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_derefAliases },
@ -2034,8 +2034,8 @@ static const ber_sequence_t SearchRequest_sequence[] = {
static int
dissect_ldap_SearchRequest(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,
SearchRequest_sequence, hf_index, ett_ldap_SearchRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SearchRequest_sequence, hf_index, ett_ldap_SearchRequest);
return offset;
}
@ -2093,14 +2093,14 @@ static int dissect_vals_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
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_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_vals_item },
};
static int
dissect_ldap_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_ldap_SET_OF_AttributeValue);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeValue_set_of, hf_index, ett_ldap_SET_OF_AttributeValue);
return offset;
}
@ -2109,7 +2109,7 @@ static int dissect_vals(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t PartialAttributeList_item_sequence[] = {
static const ber_old_sequence_t PartialAttributeList_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
{ 0, 0, 0, NULL }
@ -2117,8 +2117,8 @@ static const ber_sequence_t PartialAttributeList_item_sequence[] = {
static int
dissect_ldap_PartialAttributeList_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,
PartialAttributeList_item_sequence, hf_index, ett_ldap_PartialAttributeList_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PartialAttributeList_item_sequence, hf_index, ett_ldap_PartialAttributeList_item);
return offset;
}
@ -2127,14 +2127,14 @@ static int dissect_PartialAttributeList_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PartialAttributeList_sequence_of[1] = {
static const ber_old_sequence_t PartialAttributeList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PartialAttributeList_item },
};
static int
dissect_ldap_PartialAttributeList(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,
PartialAttributeList_sequence_of, hf_index, ett_ldap_PartialAttributeList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PartialAttributeList_sequence_of, hf_index, ett_ldap_PartialAttributeList);
return offset;
}
@ -2143,7 +2143,7 @@ static int dissect_searchResultEntry_attributes(proto_tree *tree _U_, tvbuff_t *
}
static const ber_sequence_t SearchResultEntry_sequence[] = {
static const ber_old_sequence_t SearchResultEntry_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_objectName },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_searchResultEntry_attributes },
{ 0, 0, 0, NULL }
@ -2151,8 +2151,8 @@ static const ber_sequence_t SearchResultEntry_sequence[] = {
static int
dissect_ldap_SearchResultEntry(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,
SearchResultEntry_sequence, hf_index, ett_ldap_SearchResultEntry);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SearchResultEntry_sequence, hf_index, ett_ldap_SearchResultEntry);
return offset;
}
@ -2238,7 +2238,7 @@ static int dissect_resultCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t LDAPResult_sequence[] = {
static const ber_old_sequence_t LDAPResult_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_resultCode },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@ -2248,8 +2248,8 @@ static const ber_sequence_t LDAPResult_sequence[] = {
static int
dissect_ldap_LDAPResult(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,
LDAPResult_sequence, hf_index, ett_ldap_LDAPResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LDAPResult_sequence, hf_index, ett_ldap_LDAPResult);
return offset;
}
@ -2267,14 +2267,14 @@ static int dissect_searchResDone(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SearchResultReference_sequence_of[1] = {
static const ber_old_sequence_t SearchResultReference_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SearchResultReference_item },
};
static int
dissect_ldap_SearchResultReference(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,
SearchResultReference_sequence_of, hf_index, ett_ldap_SearchResultReference);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SearchResultReference_sequence_of, hf_index, ett_ldap_SearchResultReference);
return offset;
}
@ -2303,7 +2303,7 @@ static int dissect_operation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t AttributeTypeAndValues_sequence[] = {
static const ber_old_sequence_t AttributeTypeAndValues_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
{ 0, 0, 0, NULL }
@ -2311,8 +2311,8 @@ static const ber_sequence_t AttributeTypeAndValues_sequence[] = {
static int
dissect_ldap_AttributeTypeAndValues(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,
AttributeTypeAndValues_sequence, hf_index, ett_ldap_AttributeTypeAndValues);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeTypeAndValues_sequence, hf_index, ett_ldap_AttributeTypeAndValues);
return offset;
}
@ -2321,7 +2321,7 @@ static int dissect_modification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = {
static const ber_old_sequence_t T_modifyRequest_modification_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_operation },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modification },
{ 0, 0, 0, NULL }
@ -2329,8 +2329,8 @@ static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = {
static int
dissect_ldap_T_modifyRequest_modification_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_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item);
return offset;
}
@ -2339,14 +2339,14 @@ static int dissect_modifyRequest_modification_item(proto_tree *tree _U_, tvbuff_
}
static const ber_sequence_t ModifyRequest_modification_sequence_of[1] = {
static const ber_old_sequence_t ModifyRequest_modification_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyRequest_modification_item },
};
static int
dissect_ldap_ModifyRequest_modification(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,
ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification);
return offset;
}
@ -2355,7 +2355,7 @@ static int dissect_modifyRequest_modification(proto_tree *tree _U_, tvbuff_t *tv
}
static const ber_sequence_t ModifyRequest_sequence[] = {
static const ber_old_sequence_t ModifyRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_object },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyRequest_modification },
{ 0, 0, 0, NULL }
@ -2363,8 +2363,8 @@ static const ber_sequence_t ModifyRequest_sequence[] = {
static int
dissect_ldap_ModifyRequest(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,
ModifyRequest_sequence, hf_index, ett_ldap_ModifyRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ModifyRequest_sequence, hf_index, ett_ldap_ModifyRequest);
return offset;
}
@ -2385,7 +2385,7 @@ static int dissect_modifyResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t AttributeList_item_sequence[] = {
static const ber_old_sequence_t AttributeList_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
{ 0, 0, 0, NULL }
@ -2393,8 +2393,8 @@ static const ber_sequence_t AttributeList_item_sequence[] = {
static int
dissect_ldap_AttributeList_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,
AttributeList_item_sequence, hf_index, ett_ldap_AttributeList_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeList_item_sequence, hf_index, ett_ldap_AttributeList_item);
return offset;
}
@ -2403,14 +2403,14 @@ static int dissect_AttributeList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t AttributeList_sequence_of[1] = {
static const ber_old_sequence_t AttributeList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributeList_item },
};
static int
dissect_ldap_AttributeList(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,
AttributeList_sequence_of, hf_index, ett_ldap_AttributeList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AttributeList_sequence_of, hf_index, ett_ldap_AttributeList);
return offset;
}
@ -2419,7 +2419,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t AddRequest_sequence[] = {
static const ber_old_sequence_t AddRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes },
{ 0, 0, 0, NULL }
@ -2427,8 +2427,8 @@ static const ber_sequence_t AddRequest_sequence[] = {
static int
dissect_ldap_AddRequest(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,
AddRequest_sequence, hf_index, ett_ldap_AddRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AddRequest_sequence, hf_index, ett_ldap_AddRequest);
return offset;
}
@ -2485,7 +2485,7 @@ static int dissect_newrdn(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t ModifyDNRequest_sequence[] = {
static const ber_old_sequence_t ModifyDNRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_newrdn },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_deleteoldrdn },
@ -2495,8 +2495,8 @@ static const ber_sequence_t ModifyDNRequest_sequence[] = {
static int
dissect_ldap_ModifyDNRequest(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,
ModifyDNRequest_sequence, hf_index, ett_ldap_ModifyDNRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ModifyDNRequest_sequence, hf_index, ett_ldap_ModifyDNRequest);
return offset;
}
@ -2517,7 +2517,7 @@ static int dissect_modDNResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t CompareRequest_sequence[] = {
static const ber_old_sequence_t CompareRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ava },
{ 0, 0, 0, NULL }
@ -2525,8 +2525,8 @@ static const ber_sequence_t CompareRequest_sequence[] = {
static int
dissect_ldap_CompareRequest(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,
CompareRequest_sequence, hf_index, ett_ldap_CompareRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CompareRequest_sequence, hf_index, ett_ldap_CompareRequest);
return offset;
}
@ -2617,7 +2617,7 @@ static int dissect_cookie(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t ExtendedRequest_sequence[] = {
static const ber_old_sequence_t ExtendedRequest_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestName_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestValue_impl },
{ 0, 0, 0, NULL }
@ -2625,8 +2625,8 @@ static const ber_sequence_t ExtendedRequest_sequence[] = {
static int
dissect_ldap_ExtendedRequest(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,
ExtendedRequest_sequence, hf_index, ett_ldap_ExtendedRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ExtendedRequest_sequence, hf_index, ett_ldap_ExtendedRequest);
return offset;
}
@ -2703,7 +2703,7 @@ static int dissect_responseName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t ExtendedResponse_sequence[] = {
static const ber_old_sequence_t ExtendedResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_extendedResponse_resultCode },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@ -2715,8 +2715,8 @@ static const ber_sequence_t ExtendedResponse_sequence[] = {
static int
dissect_ldap_ExtendedResponse(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,
ExtendedResponse_sequence, hf_index, ett_ldap_ExtendedResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ExtendedResponse_sequence, hf_index, ett_ldap_ExtendedResponse);
return offset;
}
@ -2749,7 +2749,7 @@ static const value_string ldap_ProtocolOp_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ProtocolOp_choice[] = {
static const ber_old_choice_t ProtocolOp_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_bindRequest },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_bindResponse },
{ 2, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_unbindRequest },
@ -2782,9 +2782,9 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
do_protocolop = TRUE;
offset = dissect_ber_choice(actx, tree, tvb, offset,
ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
&ProtocolOp);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
&ProtocolOp);
#line 82 "ldap.cnf"
@ -2874,7 +2874,7 @@ static int dissect_controlValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t Control_sequence[] = {
static const ber_old_sequence_t Control_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_controlType },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_criticality },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_controlValue },
@ -2883,8 +2883,8 @@ static const ber_sequence_t Control_sequence[] = {
static int
dissect_ldap_Control(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,
Control_sequence, hf_index, ett_ldap_Control);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Control_sequence, hf_index, ett_ldap_Control);
return offset;
}
@ -2893,14 +2893,14 @@ static int dissect_Controls_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t Controls_sequence_of[1] = {
static const ber_old_sequence_t Controls_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Controls_item },
};
static int
dissect_ldap_Controls(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,
Controls_sequence_of, hf_index, ett_ldap_Controls);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Controls_sequence_of, hf_index, ett_ldap_Controls);
return offset;
}
@ -2909,7 +2909,7 @@ static int dissect_controls_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t LDAPMessage_sequence[] = {
static const ber_old_sequence_t LDAPMessage_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_messageID },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_protocolOp },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controls_impl },
@ -2918,8 +2918,8 @@ static const ber_sequence_t LDAPMessage_sequence[] = {
static int
dissect_ldap_LDAPMessage(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,
LDAPMessage_sequence, hf_index, ett_ldap_LDAPMessage);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LDAPMessage_sequence, hf_index, ett_ldap_LDAPMessage);
return offset;
}
@ -2946,7 +2946,7 @@ static int dissect_maxReturnLength(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SearchControlValue_sequence[] = {
static const ber_old_sequence_t SearchControlValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_size },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cookie },
{ 0, 0, 0, NULL }
@ -2954,14 +2954,14 @@ static const ber_sequence_t SearchControlValue_sequence[] = {
static int
dissect_ldap_SearchControlValue(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,
SearchControlValue_sequence, hf_index, ett_ldap_SearchControlValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SearchControlValue_sequence, hf_index, ett_ldap_SearchControlValue);
return offset;
}
static const ber_sequence_t SortKeyList_item_sequence[] = {
static const ber_old_sequence_t SortKeyList_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_orderingRule_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reverseOrder_impl },
@ -2970,8 +2970,8 @@ static const ber_sequence_t SortKeyList_item_sequence[] = {
static int
dissect_ldap_SortKeyList_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,
SortKeyList_item_sequence, hf_index, ett_ldap_SortKeyList_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SortKeyList_item_sequence, hf_index, ett_ldap_SortKeyList_item);
return offset;
}
@ -2980,14 +2980,14 @@ static int dissect_SortKeyList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SortKeyList_sequence_of[1] = {
static const ber_old_sequence_t SortKeyList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SortKeyList_item },
};
static int
dissect_ldap_SortKeyList(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,
SortKeyList_sequence_of, hf_index, ett_ldap_SortKeyList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SortKeyList_sequence_of, hf_index, ett_ldap_SortKeyList);
return offset;
}
@ -3021,7 +3021,7 @@ static int dissect_sortResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SortResult_sequence[] = {
static const ber_old_sequence_t SortResult_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sortResult },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attributeType_impl },
{ 0, 0, 0, NULL }
@ -3029,14 +3029,14 @@ static const ber_sequence_t SortResult_sequence[] = {
static int
dissect_ldap_SortResult(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,
SortResult_sequence, hf_index, ett_ldap_SortResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SortResult_sequence, hf_index, ett_ldap_SortResult);
return offset;
}
static const ber_sequence_t ReplControlValue_sequence[] = {
static const ber_old_sequence_t ReplControlValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_parentsFirst },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_maxReturnLength },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cookie },
@ -3045,8 +3045,8 @@ static const ber_sequence_t ReplControlValue_sequence[] = {
static int
dissect_ldap_ReplControlValue(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,
ReplControlValue_sequence, hf_index, ett_ldap_ReplControlValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReplControlValue_sequence, hf_index, ett_ldap_ReplControlValue);
return offset;
}

118
epan/dissectors/packet-logotypecertextn.c
View File

@ -179,7 +179,7 @@ static int dissect_hashValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t HashAlgAndValue_sequence[] = {
static const ber_old_sequence_t HashAlgAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlg },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashValue },
{ 0, 0, 0, NULL }
@ -187,8 +187,8 @@ static const ber_sequence_t HashAlgAndValue_sequence[] = {
static int
dissect_logotypecertextn_HashAlgAndValue(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,
HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
return offset;
}
@ -200,14 +200,14 @@ static int dissect_refStructHash_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item },
};
static int
dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(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_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue);
return offset;
}
@ -219,14 +219,14 @@ static int dissect_refStructHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t T_logotypeURI_sequence_of[1] = {
static const ber_old_sequence_t T_logotypeURI_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item },
};
static int
dissect_logotypecertextn_T_logotypeURI(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_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI);
return offset;
}
@ -235,7 +235,7 @@ static int dissect_logotypeURI(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t LogotypeDetails_sequence[] = {
static const ber_old_sequence_t LogotypeDetails_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mediaType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeURI },
@ -244,8 +244,8 @@ static const ber_sequence_t LogotypeDetails_sequence[] = {
static int
dissect_logotypecertextn_LogotypeDetails(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,
LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
return offset;
}
@ -316,7 +316,7 @@ static const value_string logotypecertextn_LogotypeImageResolution_vals[] = {
{ 0, NULL }
};
static const ber_choice_t LogotypeImageResolution_choice[] = {
static const ber_old_choice_t LogotypeImageResolution_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numBits_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_tableSize_impl },
{ 0, 0, 0, 0, NULL }
@ -324,9 +324,9 @@ static const ber_choice_t LogotypeImageResolution_choice[] = {
static int
dissect_logotypecertextn_LogotypeImageResolution(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,
LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution,
NULL);
return offset;
}
@ -335,7 +335,7 @@ static int dissect_resolution(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t LogotypeImageInfo_sequence[] = {
static const ber_old_sequence_t LogotypeImageInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_xSize },
@ -347,8 +347,8 @@ static const ber_sequence_t LogotypeImageInfo_sequence[] = {
static int
dissect_logotypecertextn_LogotypeImageInfo(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,
LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
return offset;
}
@ -357,7 +357,7 @@ static int dissect_imageInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t LogotypeImage_sequence[] = {
static const ber_old_sequence_t LogotypeImage_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imageDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imageInfo },
{ 0, 0, 0, NULL }
@ -365,8 +365,8 @@ static const ber_sequence_t LogotypeImage_sequence[] = {
static int
dissect_logotypecertextn_LogotypeImage(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,
LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
return offset;
}
@ -375,14 +375,14 @@ static int dissect_image_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item },
};
static int
dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(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_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage);
return offset;
}
@ -391,7 +391,7 @@ static int dissect_image(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
static const ber_old_sequence_t LogotypeAudioInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_playTime },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_channels },
@ -402,8 +402,8 @@ static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
static int
dissect_logotypecertextn_LogotypeAudioInfo(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,
LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
return offset;
}
@ -412,7 +412,7 @@ static int dissect_audioInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t LogotypeAudio_sequence[] = {
static const ber_old_sequence_t LogotypeAudio_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audioDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_audioInfo },
{ 0, 0, 0, NULL }
@ -420,8 +420,8 @@ static const ber_sequence_t LogotypeAudio_sequence[] = {
static int
dissect_logotypecertextn_LogotypeAudio(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,
LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
return offset;
}
@ -430,14 +430,14 @@ static int dissect_audio_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item },
};
static int
dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(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_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio);
return offset;
}
@ -446,7 +446,7 @@ static int dissect_audio_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t LogotypeData_sequence[] = {
static const ber_old_sequence_t LogotypeData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_image },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_audio_impl },
{ 0, 0, 0, NULL }
@ -454,8 +454,8 @@ static const ber_sequence_t LogotypeData_sequence[] = {
static int
dissect_logotypecertextn_LogotypeData(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,
LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
return offset;
}
@ -464,14 +464,14 @@ static int dissect_direct_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t T_refStructURI_sequence_of[1] = {
static const ber_old_sequence_t T_refStructURI_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_refStructURI_item },
};
static int
dissect_logotypecertextn_T_refStructURI(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_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI);
return offset;
}
@ -480,7 +480,7 @@ static int dissect_refStructURI(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t LogotypeReference_sequence[] = {
static const ber_old_sequence_t LogotypeReference_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI },
{ 0, 0, 0, NULL }
@ -488,8 +488,8 @@ static const ber_sequence_t LogotypeReference_sequence[] = {
static int
dissect_logotypecertextn_LogotypeReference(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,
LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
return offset;
}
@ -504,7 +504,7 @@ static const value_string logotypecertextn_LogotypeInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice_t LogotypeInfo_choice[] = {
static const ber_old_choice_t LogotypeInfo_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_direct_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indirect_impl },
{ 0, 0, 0, 0, NULL }
@ -512,9 +512,9 @@ static const ber_choice_t LogotypeInfo_choice[] = {
static int
dissect_logotypecertextn_LogotypeInfo(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,
LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo,
NULL);
return offset;
}
@ -532,14 +532,14 @@ static int dissect_info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item },
};
static int
dissect_logotypecertextn_SEQUENCE_OF_LogotypeInfo(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_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo);
return offset;
}
@ -560,7 +560,7 @@ static int dissect_logotypeType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
static const ber_old_sequence_t OtherLogotypeInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info },
{ 0, 0, 0, NULL }
@ -568,8 +568,8 @@ static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
static int
dissect_logotypecertextn_OtherLogotypeInfo(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,
OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
return offset;
}
@ -578,14 +578,14 @@ static int dissect_otherLogos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item },
};
static int
dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(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_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo);
return offset;
}
@ -594,7 +594,7 @@ static int dissect_otherLogos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t LogotypeExtn_sequence[] = {
static const ber_old_sequence_t LogotypeExtn_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_communityLogos },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_issuerLogo },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_subjectLogo },
@ -604,8 +604,8 @@ static const ber_sequence_t LogotypeExtn_sequence[] = {
static int
dissect_logotypecertextn_LogotypeExtn(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,
LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
return offset;
}

1301
epan/dissectors/packet-mms.c
View File

File diff suppressed because it is too large Load Diff

118
epan/dissectors/packet-ocsp.c
View File

@ -224,7 +224,7 @@ static int dissect_issuerKeyHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t CertID_sequence[] = {
static const ber_old_sequence_t CertID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerNameHash },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerKeyHash },
@ -234,8 +234,8 @@ static const ber_sequence_t CertID_sequence[] = {
static int
dissect_ocsp_CertID(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,
CertID_sequence, hf_index, ett_ocsp_CertID);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertID_sequence, hf_index, ett_ocsp_CertID);
return offset;
}
@ -247,7 +247,7 @@ static int dissect_certID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t Request_sequence[] = {
static const ber_old_sequence_t Request_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_reqCert },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_singleRequestExtensions },
{ 0, 0, 0, NULL }
@ -255,8 +255,8 @@ static const ber_sequence_t Request_sequence[] = {
static int
dissect_ocsp_Request(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,
Request_sequence, hf_index, ett_ocsp_Request);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Request_sequence, hf_index, ett_ocsp_Request);
return offset;
}
@ -265,14 +265,14 @@ static int dissect_requestList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SEQUENCE_OF_Request_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Request_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item },
};
static int
dissect_ocsp_SEQUENCE_OF_Request(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_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request);
return offset;
}
@ -281,7 +281,7 @@ static int dissect_requestList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t TBSRequest_sequence[] = {
static const ber_old_sequence_t TBSRequest_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_requestorName },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList },
@ -291,8 +291,8 @@ static const ber_sequence_t TBSRequest_sequence[] = {
static int
dissect_ocsp_TBSRequest(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,
TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
return offset;
}
@ -315,14 +315,14 @@ static int dissect_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
};
static int
dissect_ocsp_SEQUENCE_OF_Certificate(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_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate);
return offset;
}
@ -331,7 +331,7 @@ static int dissect_certs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t Signature_sequence[] = {
static const ber_old_sequence_t Signature_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certs },
@ -340,8 +340,8 @@ static const ber_sequence_t Signature_sequence[] = {
static int
dissect_ocsp_Signature(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,
Signature_sequence, hf_index, ett_ocsp_Signature);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Signature_sequence, hf_index, ett_ocsp_Signature);
return offset;
}
@ -350,7 +350,7 @@ static int dissect_optionalSignature(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t OCSPRequest_sequence[] = {
static const ber_old_sequence_t OCSPRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsRequest },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_optionalSignature },
{ 0, 0, 0, NULL }
@ -358,8 +358,8 @@ static const ber_sequence_t OCSPRequest_sequence[] = {
static int
dissect_ocsp_OCSPRequest(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,
OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
return offset;
}
@ -422,7 +422,7 @@ static int dissect_response(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ResponseBytes_sequence[] = {
static const ber_old_sequence_t ResponseBytes_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_responseType },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_response },
{ 0, 0, 0, NULL }
@ -430,8 +430,8 @@ static const ber_sequence_t ResponseBytes_sequence[] = {
static int
dissect_ocsp_ResponseBytes(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,
ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
return offset;
}
@ -440,7 +440,7 @@ static int dissect_responseBytes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t OCSPResponse_sequence[] = {
static const ber_old_sequence_t OCSPResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseStatus },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_responseBytes },
{ 0, 0, 0, NULL }
@ -448,8 +448,8 @@ static const ber_sequence_t OCSPResponse_sequence[] = {
static int
dissect_ocsp_OCSPResponse(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,
OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
return offset;
}
@ -474,7 +474,7 @@ static const value_string ocsp_ResponderID_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ResponderID_choice[] = {
static const ber_old_choice_t ResponderID_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_byName },
{ 2, BER_CLASS_CON, 2, 0, dissect_byKey },
{ 0, 0, 0, 0, NULL }
@ -482,9 +482,9 @@ static const ber_choice_t ResponderID_choice[] = {
static int
dissect_ocsp_ResponderID(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,
ResponderID_choice, hf_index, ett_ocsp_ResponderID,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ResponderID_choice, hf_index, ett_ocsp_ResponderID,
NULL);
return offset;
}
@ -529,7 +529,7 @@ static int dissect_good_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t RevokedInfo_sequence[] = {
static const ber_old_sequence_t RevokedInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_revocationTime },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revocationReason },
{ 0, 0, 0, NULL }
@ -537,8 +537,8 @@ static const ber_sequence_t RevokedInfo_sequence[] = {
static int
dissect_ocsp_RevokedInfo(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,
RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
return offset;
}
@ -566,7 +566,7 @@ static const value_string ocsp_CertStatus_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CertStatus_choice[] = {
static const ber_old_choice_t CertStatus_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_good_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_revoked_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_unknown_impl },
@ -575,9 +575,9 @@ static const ber_choice_t CertStatus_choice[] = {
static int
dissect_ocsp_CertStatus(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,
CertStatus_choice, hf_index, ett_ocsp_CertStatus,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CertStatus_choice, hf_index, ett_ocsp_CertStatus,
NULL);
return offset;
}
@ -586,7 +586,7 @@ static int dissect_certStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t SingleResponse_sequence[] = {
static const ber_old_sequence_t SingleResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate },
@ -597,8 +597,8 @@ static const ber_sequence_t SingleResponse_sequence[] = {
static int
dissect_ocsp_SingleResponse(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,
SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
return offset;
}
@ -607,14 +607,14 @@ static int dissect_responses_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item },
};
static int
dissect_ocsp_SEQUENCE_OF_SingleResponse(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_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse);
return offset;
}
@ -623,7 +623,7 @@ static int dissect_responses(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ResponseData_sequence[] = {
static const ber_old_sequence_t ResponseData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt },
@ -634,8 +634,8 @@ static const ber_sequence_t ResponseData_sequence[] = {
static int
dissect_ocsp_ResponseData(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,
ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
return offset;
}
@ -644,7 +644,7 @@ static int dissect_tbsResponseData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t BasicOCSPResponse_sequence[] = {
static const ber_old_sequence_t BasicOCSPResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsResponseData },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
@ -654,8 +654,8 @@ static const ber_sequence_t BasicOCSPResponse_sequence[] = {
static int
dissect_ocsp_BasicOCSPResponse(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,
BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
return offset;
}
@ -682,20 +682,20 @@ static int dissect_AcceptableResponses_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t AcceptableResponses_sequence_of[1] = {
static const ber_old_sequence_t AcceptableResponses_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AcceptableResponses_item },
};
static int
dissect_ocsp_AcceptableResponses(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,
AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses);
return offset;
}
static const ber_sequence_t ServiceLocator_sequence[] = {
static const ber_old_sequence_t ServiceLocator_sequence[] = {
{ BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locator },
{ 0, 0, 0, NULL }
@ -703,8 +703,8 @@ static const ber_sequence_t ServiceLocator_sequence[] = {
static int
dissect_ocsp_ServiceLocator(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,
ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
return offset;
}
@ -737,7 +737,7 @@ static int dissect_crlNum(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t CrlID_sequence[] = {
static const ber_old_sequence_t CrlID_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlUrl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crlNum },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_crlTime },
@ -746,8 +746,8 @@ static const ber_sequence_t CrlID_sequence[] = {
static int
dissect_ocsp_CrlID(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,
CrlID_sequence, hf_index, ett_ocsp_CrlID);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CrlID_sequence, hf_index, ett_ocsp_CrlID);
return offset;
}

18
epan/dissectors/packet-pkcs1.c
View File

@ -123,7 +123,7 @@ static int dissect_coefficient(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t RSAPublicKey_sequence[] = {
static const ber_old_sequence_t RSAPublicKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
{ 0, 0, 0, NULL }
@ -131,8 +131,8 @@ static const ber_sequence_t RSAPublicKey_sequence[] = {
int
dissect_pkcs1_RSAPublicKey(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,
RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
return offset;
}
@ -151,7 +151,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t RSAPrivateKey_sequence[] = {
static const ber_old_sequence_t RSAPrivateKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
@ -166,8 +166,8 @@ static const ber_sequence_t RSAPrivateKey_sequence[] = {
int
dissect_pkcs1_RSAPrivateKey(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,
RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
return offset;
}
@ -198,7 +198,7 @@ static int dissect_digest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t DigestInfo_sequence[] = {
static const ber_old_sequence_t DigestInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
{ 0, 0, 0, NULL }
@ -206,8 +206,8 @@ static const ber_sequence_t DigestInfo_sequence[] = {
int
dissect_pkcs1_DigestInfo(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,
DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
return offset;
}

122
epan/dissectors/packet-pkcs12.c
View File

@ -212,7 +212,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t DigestInfo_sequence[] = {
static const ber_old_sequence_t DigestInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
{ 0, 0, 0, NULL }
@ -220,8 +220,8 @@ static const ber_sequence_t DigestInfo_sequence[] = {
static int
dissect_pkcs12_DigestInfo(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,
DigestInfo_sequence, hf_index, ett_pkcs12_DigestInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DigestInfo_sequence, hf_index, ett_pkcs12_DigestInfo);
return offset;
}
@ -265,7 +265,7 @@ static int dissect_iterationCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t MacData_sequence[] = {
static const ber_old_sequence_t MacData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_macSalt },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_iterations },
@ -274,8 +274,8 @@ static const ber_sequence_t MacData_sequence[] = {
static int
dissect_pkcs12_MacData(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,
MacData_sequence, hf_index, ett_pkcs12_MacData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MacData_sequence, hf_index, ett_pkcs12_MacData);
return offset;
}
@ -284,7 +284,7 @@ static int dissect_macData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t PFX_sequence[] = {
static const ber_old_sequence_t PFX_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_authSafe },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_macData },
@ -301,8 +301,8 @@ dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
dissector_handle=create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
PFX_sequence, hf_index, ett_pkcs12_PFX);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PFX_sequence, hf_index, ett_pkcs12_PFX);
/* restore the original dissector */
@ -314,7 +314,7 @@ dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t AuthenticatedSafe_sequence_of[1] = {
static const ber_old_sequence_t AuthenticatedSafe_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthenticatedSafe_item },
};
@ -327,8 +327,8 @@ dissect_pkcs12_AuthenticatedSafe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
dissector_handle=create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
AuthenticatedSafe_sequence_of, hf_index, ett_pkcs12_AuthenticatedSafe);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AuthenticatedSafe_sequence_of, hf_index, ett_pkcs12_AuthenticatedSafe);
/* restore the original dissector */
@ -405,14 +405,14 @@ static int dissect_attrValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t T_attrValues_set_of[1] = {
static const ber_old_sequence_t T_attrValues_set_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_attrValues_item },
};
static int
dissect_pkcs12_T_attrValues(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_attrValues_set_of, hf_index, ett_pkcs12_T_attrValues);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_attrValues_set_of, hf_index, ett_pkcs12_T_attrValues);
return offset;
}
@ -421,7 +421,7 @@ static int dissect_attrValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t PKCS12Attribute_sequence[] = {
static const ber_old_sequence_t PKCS12Attribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrId },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attrValues },
{ 0, 0, 0, NULL }
@ -429,8 +429,8 @@ static const ber_sequence_t PKCS12Attribute_sequence[] = {
static int
dissect_pkcs12_PKCS12Attribute(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,
PKCS12Attribute_sequence, hf_index, ett_pkcs12_PKCS12Attribute);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKCS12Attribute_sequence, hf_index, ett_pkcs12_PKCS12Attribute);
return offset;
}
@ -439,14 +439,14 @@ static int dissect_bagAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t SET_OF_PKCS12Attribute_set_of[1] = {
static const ber_old_sequence_t SET_OF_PKCS12Attribute_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bagAttributes_item },
};
static int
dissect_pkcs12_SET_OF_PKCS12Attribute(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_PKCS12Attribute_set_of, hf_index, ett_pkcs12_SET_OF_PKCS12Attribute);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_PKCS12Attribute_set_of, hf_index, ett_pkcs12_SET_OF_PKCS12Attribute);
return offset;
}
@ -455,7 +455,7 @@ static int dissect_bagAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SafeBag_sequence[] = {
static const ber_old_sequence_t SafeBag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_bagId },
{ BER_CLASS_CON, 0, 0, dissect_bagValue },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bagAttributes },
@ -464,8 +464,8 @@ static const ber_sequence_t SafeBag_sequence[] = {
static int
dissect_pkcs12_SafeBag(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,
SafeBag_sequence, hf_index, ett_pkcs12_SafeBag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SafeBag_sequence, hf_index, ett_pkcs12_SafeBag);
return offset;
}
@ -474,14 +474,14 @@ static int dissect_SafeContents_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t SafeContents_sequence_of[1] = {
static const ber_old_sequence_t SafeContents_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SafeContents_item },
};
static int
dissect_pkcs12_SafeContents(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,
SafeContents_sequence_of, hf_index, ett_pkcs12_SafeContents);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SafeContents_sequence_of, hf_index, ett_pkcs12_SafeContents);
return offset;
}
@ -518,14 +518,14 @@ static int dissect_privateKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t Attributes_set_of[1] = {
static const ber_old_sequence_t Attributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attributes_item },
};
static int
dissect_pkcs12_Attributes(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,
Attributes_set_of, hf_index, ett_pkcs12_Attributes);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
Attributes_set_of, hf_index, ett_pkcs12_Attributes);
return offset;
}
@ -534,7 +534,7 @@ static int dissect_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t PrivateKeyInfo_sequence[] = {
static const ber_old_sequence_t PrivateKeyInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_privateKeyVersion },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_privateKeyAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_privateKey },
@ -544,8 +544,8 @@ static const ber_sequence_t PrivateKeyInfo_sequence[] = {
static int
dissect_pkcs12_PrivateKeyInfo(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,
PrivateKeyInfo_sequence, hf_index, ett_pkcs12_PrivateKeyInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PrivateKeyInfo_sequence, hf_index, ett_pkcs12_PrivateKeyInfo);
return offset;
}
@ -573,7 +573,7 @@ static int dissect_encryptedData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
static const ber_old_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptionAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedData },
{ 0, 0, 0, NULL }
@ -581,8 +581,8 @@ static const ber_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
static int
dissect_pkcs12_EncryptedPrivateKeyInfo(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,
EncryptedPrivateKeyInfo_sequence, hf_index, ett_pkcs12_EncryptedPrivateKeyInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EncryptedPrivateKeyInfo_sequence, hf_index, ett_pkcs12_EncryptedPrivateKeyInfo);
return offset;
}
@ -613,7 +613,7 @@ static int dissect_certValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t CertBag_sequence[] = {
static const ber_old_sequence_t CertBag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_certId },
{ BER_CLASS_CON, 0, 0, dissect_certValue },
{ 0, 0, 0, NULL }
@ -621,8 +621,8 @@ static const ber_sequence_t CertBag_sequence[] = {
static int
dissect_pkcs12_CertBag(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,
CertBag_sequence, hf_index, ett_pkcs12_CertBag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertBag_sequence, hf_index, ett_pkcs12_CertBag);
return offset;
}
@ -644,7 +644,7 @@ static int dissect_crlValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t CRLBag_sequence[] = {
static const ber_old_sequence_t CRLBag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_crlId },
{ BER_CLASS_CON, 0, 0, dissect_crlValue },
{ 0, 0, 0, NULL }
@ -652,8 +652,8 @@ static const ber_sequence_t CRLBag_sequence[] = {
static int
dissect_pkcs12_CRLBag(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,
CRLBag_sequence, hf_index, ett_pkcs12_CRLBag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CRLBag_sequence, hf_index, ett_pkcs12_CRLBag);
return offset;
}
@ -675,7 +675,7 @@ static int dissect_secretValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SecretBag_sequence[] = {
static const ber_old_sequence_t SecretBag_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_secretTypeId },
{ BER_CLASS_CON, 0, 0, dissect_secretValue },
{ 0, 0, 0, NULL }
@ -683,14 +683,14 @@ static const ber_sequence_t SecretBag_sequence[] = {
static int
dissect_pkcs12_SecretBag(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,
SecretBag_sequence, hf_index, ett_pkcs12_SecretBag);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SecretBag_sequence, hf_index, ett_pkcs12_SecretBag);
return offset;
}
static const ber_sequence_t PBEParameter_sequence[] = {
static const ber_old_sequence_t PBEParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
{ 0, 0, 0, NULL }
@ -698,8 +698,8 @@ static const ber_sequence_t PBEParameter_sequence[] = {
static int
dissect_pkcs12_PBEParameter(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,
PBEParameter_sequence, hf_index, ett_pkcs12_PBEParameter);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBEParameter_sequence, hf_index, ett_pkcs12_PBEParameter);
return offset;
}
@ -711,7 +711,7 @@ static const value_string pkcs12_T_saltChoice_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_saltChoice_choice[] = {
static const ber_old_choice_t T_saltChoice_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_specified },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherSource },
{ 0, 0, 0, 0, NULL }
@ -719,9 +719,9 @@ static const ber_choice_t T_saltChoice_choice[] = {
static int
dissect_pkcs12_T_saltChoice(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_saltChoice_choice, hf_index, ett_pkcs12_T_saltChoice,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_saltChoice_choice, hf_index, ett_pkcs12_T_saltChoice,
NULL);
return offset;
}
@ -743,7 +743,7 @@ static int dissect_keyLength(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PBKDF2Params_sequence[] = {
static const ber_old_sequence_t PBKDF2Params_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_saltChoice },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyLength },
@ -753,14 +753,14 @@ static const ber_sequence_t PBKDF2Params_sequence[] = {
static int
dissect_pkcs12_PBKDF2Params(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,
PBKDF2Params_sequence, hf_index, ett_pkcs12_PBKDF2Params);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBKDF2Params_sequence, hf_index, ett_pkcs12_PBKDF2Params);
return offset;
}
static const ber_sequence_t PBES2Params_sequence[] = {
static const ber_old_sequence_t PBES2Params_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyDerivationFunc },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptionScheme },
{ 0, 0, 0, NULL }
@ -768,14 +768,14 @@ static const ber_sequence_t PBES2Params_sequence[] = {
static int
dissect_pkcs12_PBES2Params(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,
PBES2Params_sequence, hf_index, ett_pkcs12_PBES2Params);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBES2Params_sequence, hf_index, ett_pkcs12_PBES2Params);
return offset;
}
static const ber_sequence_t PBMAC1Params_sequence[] = {
static const ber_old_sequence_t PBMAC1Params_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyDerivationFunc },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageAuthScheme },
{ 0, 0, 0, NULL }
@ -783,8 +783,8 @@ static const ber_sequence_t PBMAC1Params_sequence[] = {
static int
dissect_pkcs12_PBMAC1Params(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,
PBMAC1Params_sequence, hf_index, ett_pkcs12_PBMAC1Params);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PBMAC1Params_sequence, hf_index, ett_pkcs12_PBMAC1Params);
return offset;
}

52
epan/dissectors/packet-pkinit.c
View File

@ -148,7 +148,7 @@ static const value_string pkinit_TrustedCA_vals[] = {
{ 0, NULL }
};
static const ber_choice_t TrustedCA_choice[] = {
static const ber_old_choice_t TrustedCA_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_caName },
{ 2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial },
{ 0, 0, 0, 0, NULL }
@ -156,9 +156,9 @@ static const ber_choice_t TrustedCA_choice[] = {
static int
dissect_pkinit_TrustedCA(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,
TrustedCA_choice, hf_index, ett_pkinit_TrustedCA,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
TrustedCA_choice, hf_index, ett_pkinit_TrustedCA,
NULL);
return offset;
}
@ -167,14 +167,14 @@ static int dissect_trustedCertifiers_item(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
};
static int
dissect_pkinit_SEQUENCE_OF_TrustedCA(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_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA);
return offset;
}
@ -183,7 +183,7 @@ static int dissect_trustedCertifiers(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t PaPkAsReq_sequence[] = {
static const ber_old_sequence_t PaPkAsReq_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_signedAuthPack },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert },
@ -192,8 +192,8 @@ static const ber_sequence_t PaPkAsReq_sequence[] = {
static int
dissect_pkinit_PaPkAsReq(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,
PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
return offset;
}
@ -228,7 +228,7 @@ static int dissect_paNonce(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t PKAuthenticator_sequence[] = {
static const ber_old_sequence_t PKAuthenticator_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_cusec },
{ BER_CLASS_CON, 1, 0, dissect_ctime },
{ BER_CLASS_CON, 2, 0, dissect_paNonce },
@ -238,8 +238,8 @@ static const ber_sequence_t PKAuthenticator_sequence[] = {
static int
dissect_pkinit_PKAuthenticator(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,
PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
return offset;
}
@ -248,14 +248,14 @@ static int dissect_pkAuthenticator(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item },
};
static int
dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(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_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier);
return offset;
}
@ -264,7 +264,7 @@ static int dissect_supportedCMSTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t AuthPack_sequence[] = {
static const ber_old_sequence_t AuthPack_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_pkAuthenticator },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_clientPublicValue },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_supportedCMSTypes },
@ -273,8 +273,8 @@ static const ber_sequence_t AuthPack_sequence[] = {
static int
dissect_pkinit_AuthPack(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,
AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
return offset;
}
@ -286,7 +286,7 @@ static const value_string pkinit_PaPkAsRep_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PaPkAsRep_choice[] = {
static const ber_old_choice_t PaPkAsRep_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_dhSignedData },
{ 1, BER_CLASS_CON, 1, 0, dissect_encKeyPack },
{ 0, 0, 0, 0, NULL }
@ -294,9 +294,9 @@ static const ber_choice_t PaPkAsRep_choice[] = {
static int
dissect_pkinit_PaPkAsRep(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,
PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep,
NULL);
return offset;
}
@ -316,7 +316,7 @@ static int dissect_subjectPublicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
static const ber_old_sequence_t KDCDHKeyInfo_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_subjectPublicKey },
{ BER_CLASS_CON, 1, 0, dissect_dhNonce },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_dhKeyExpiration },
@ -325,8 +325,8 @@ static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
static int
dissect_pkinit_KDCDHKeyInfo(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,
KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
return offset;
}

48
epan/dissectors/packet-pkix1explicit.c
View File

@ -205,7 +205,7 @@ static int dissect_extnValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Extension_sequence[] = {
static const ber_old_sequence_t Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue },
@ -214,8 +214,8 @@ static const ber_sequence_t Extension_sequence[] = {
int
dissect_pkix1explicit_Extension(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,
Extension_sequence, hf_index, ett_pkix1explicit_Extension);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Extension_sequence, hf_index, ett_pkix1explicit_Extension);
return offset;
}
@ -224,14 +224,14 @@ static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Extensions_sequence_of[1] = {
static const ber_old_sequence_t Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
int
dissect_pkix1explicit_Extensions(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,
Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
return offset;
}
@ -276,7 +276,7 @@ static int dissect_seed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t ValidationParms_sequence[] = {
static const ber_old_sequence_t ValidationParms_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_seed },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pgenCounter },
{ 0, 0, 0, NULL }
@ -284,8 +284,8 @@ static const ber_sequence_t ValidationParms_sequence[] = {
static int
dissect_pkix1explicit_ValidationParms(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,
ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
return offset;
}
@ -294,7 +294,7 @@ static int dissect_validationParms(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t DomainParameters_sequence[] = {
static const ber_old_sequence_t DomainParameters_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_q },
@ -305,8 +305,8 @@ static const ber_sequence_t DomainParameters_sequence[] = {
static int
dissect_pkix1explicit_DomainParameters(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,
DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
return offset;
}
@ -339,7 +339,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
static const ber_old_sequence_t AttributeTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
{ 0, 0, 0, NULL }
@ -347,8 +347,8 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
int
dissect_pkix1explicit_AttributeTypeAndValue(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,
AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
return offset;
}
@ -357,14 +357,14 @@ 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 },
};
int
dissect_pkix1explicit_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_) {
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
return offset;
}
@ -373,14 +373,14 @@ 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 },
};
int
dissect_pkix1explicit_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_) {
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
return offset;
}
@ -435,7 +435,7 @@ static int dissect_value1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
static const ber_old_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type1 },
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value1 },
{ 0, 0, 0, NULL }
@ -443,8 +443,8 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
int
dissect_pkix1explicit_TeletexDomainDefinedAttribute(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,
TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
return offset;
}

44
epan/dissectors/packet-pkix1implicit.c
View File

@ -129,7 +129,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t EDIPartyName_sequence[] = {
static const ber_old_sequence_t EDIPartyName_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
{ 0, 0, 0, NULL }
@ -137,8 +137,8 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
static int
dissect_pkix1implicit_EDIPartyName(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,
EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
return offset;
}
@ -156,7 +156,7 @@ static int dissect_accessMethod(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t AccessDescription_sequence[] = {
static const ber_old_sequence_t AccessDescription_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_accessMethod },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_accessLocation },
{ 0, 0, 0, NULL }
@ -164,8 +164,8 @@ static const ber_sequence_t AccessDescription_sequence[] = {
static int
dissect_pkix1implicit_AccessDescription(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,
AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
return offset;
}
@ -174,14 +174,14 @@ static int dissect_AuthorityInfoAccessSyntax_item(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = {
static const ber_old_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthorityInfoAccessSyntax_item },
};
int
dissect_pkix1implicit_AuthorityInfoAccessSyntax(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,
AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax);
return offset;
}
@ -236,7 +236,7 @@ static const value_string pkix1implicit_DisplayText_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DisplayText_choice[] = {
static const ber_old_choice_t DisplayText_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
@ -245,9 +245,9 @@ static const ber_choice_t DisplayText_choice[] = {
static int
dissect_pkix1implicit_DisplayText(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,
DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText,
NULL);
return offset;
}
@ -272,14 +272,14 @@ static int dissect_noticeNumbers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t T_noticeNumbers_sequence_of[1] = {
static const ber_old_sequence_t T_noticeNumbers_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item },
};
static int
dissect_pkix1implicit_T_noticeNumbers(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_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers);
return offset;
}
@ -288,7 +288,7 @@ static int dissect_noticeNumbers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t NoticeReference_sequence[] = {
static const ber_old_sequence_t NoticeReference_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers },
{ 0, 0, 0, NULL }
@ -296,8 +296,8 @@ static const ber_sequence_t NoticeReference_sequence[] = {
static int
dissect_pkix1implicit_NoticeReference(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,
NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
return offset;
}
@ -306,7 +306,7 @@ static int dissect_noticeRef(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t UserNotice_sequence[] = {
static const ber_old_sequence_t UserNotice_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
{ 0, 0, 0, NULL }
@ -314,8 +314,8 @@ static const ber_sequence_t UserNotice_sequence[] = {
int
dissect_pkix1implicit_UserNotice(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,
UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
return offset;
}

12
epan/dissectors/packet-pkixproxy.c
View File

@ -119,7 +119,7 @@ static int dissect_policy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t ProxyPolicy_sequence[] = {
static const ber_old_sequence_t ProxyPolicy_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyLanguage },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policy },
{ 0, 0, 0, NULL }
@ -127,8 +127,8 @@ static const ber_sequence_t ProxyPolicy_sequence[] = {
static int
dissect_pkixproxy_ProxyPolicy(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,
ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
return offset;
}
@ -137,7 +137,7 @@ static int dissect_proxyPolicy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
static const ber_old_sequence_t ProxyCertInfoExtension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pCPathLenConstraint },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_proxyPolicy },
{ 0, 0, 0, NULL }
@ -145,8 +145,8 @@ static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
static int
dissect_pkixproxy_ProxyCertInfoExtension(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,
ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
return offset;
}

44
epan/dissectors/packet-pkixqualified.c
View File

@ -180,7 +180,7 @@ static const value_string pkixqualified_TypeOfBiometricData_vals[] = {
{ 0, NULL }
};
static const ber_choice_t TypeOfBiometricData_choice[] = {
static const ber_old_choice_t TypeOfBiometricData_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_predefinedBiometricType },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_biometricDataOid },
{ 0, 0, 0, 0, NULL }
@ -188,9 +188,9 @@ static const ber_choice_t TypeOfBiometricData_choice[] = {
static int
dissect_pkixqualified_TypeOfBiometricData(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,
TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData,
NULL);
return offset;
}
@ -226,7 +226,7 @@ static int dissect_sourceDataUri(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t BiometricData_sequence[] = {
static const ber_old_sequence_t BiometricData_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash },
@ -236,8 +236,8 @@ static const ber_sequence_t BiometricData_sequence[] = {
static int
dissect_pkixqualified_BiometricData(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,
BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
return offset;
}
@ -246,14 +246,14 @@ static int dissect_BiometricSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t BiometricSyntax_sequence_of[1] = {
static const ber_old_sequence_t BiometricSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item },
};
static int
dissect_pkixqualified_BiometricSyntax(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,
BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax);
return offset;
}
@ -286,7 +286,7 @@ static int dissect_statementInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t QCStatement_sequence[] = {
static const ber_old_sequence_t QCStatement_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo },
{ 0, 0, 0, NULL }
@ -294,8 +294,8 @@ static const ber_sequence_t QCStatement_sequence[] = {
static int
dissect_pkixqualified_QCStatement(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,
QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
return offset;
}
@ -304,27 +304,27 @@ static int dissect_QCStatements_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t QCStatements_sequence_of[1] = {
static const ber_old_sequence_t QCStatements_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item },
};
static int
dissect_pkixqualified_QCStatements(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,
QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements);
return offset;
}
static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = {
static const ber_old_sequence_t NameRegistrationAuthorities_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item },
};
static int
dissect_pkixqualified_NameRegistrationAuthorities(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,
NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities);
return offset;
}
@ -333,7 +333,7 @@ static int dissect_nameRegistrationAuthorities(proto_tree *tree _U_, tvbuff_t *t
}
static const ber_sequence_t SemanticsInformation_sequence[] = {
static const ber_old_sequence_t SemanticsInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities },
{ 0, 0, 0, NULL }
@ -341,8 +341,8 @@ static const ber_sequence_t SemanticsInformation_sequence[] = {
static int
dissect_pkixqualified_SemanticsInformation(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,
SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
return offset;
}

36
epan/dissectors/packet-pkixtsp.c
View File

@ -156,7 +156,7 @@ static int dissect_hashedMessage(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t MessageImprint_sequence[] = {
static const ber_old_sequence_t MessageImprint_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage },
{ 0, 0, 0, NULL }
@ -164,8 +164,8 @@ static const ber_sequence_t MessageImprint_sequence[] = {
static int
dissect_pkixtsp_MessageImprint(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,
MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
return offset;
}
@ -223,7 +223,7 @@ static int dissect_ordering(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t TimeStampReq_sequence[] = {
static const ber_old_sequence_t TimeStampReq_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_reqPolicy },
@ -235,8 +235,8 @@ static const ber_sequence_t TimeStampReq_sequence[] = {
static int
dissect_pkixtsp_TimeStampReq(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,
TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
return offset;
}
@ -290,7 +290,7 @@ static int dissect_failInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PKIStatusInfo_sequence[] = {
static const ber_old_sequence_t PKIStatusInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
{ 0, 0, 0, NULL }
@ -298,8 +298,8 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
static int
dissect_pkixtsp_PKIStatusInfo(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,
PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
return offset;
}
@ -320,7 +320,7 @@ static int dissect_timeStampToken(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t TimeStampResp_sequence[] = {
static const ber_old_sequence_t TimeStampResp_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken },
{ 0, 0, 0, NULL }
@ -328,8 +328,8 @@ static const ber_sequence_t TimeStampResp_sequence[] = {
static int
dissect_pkixtsp_TimeStampResp(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,
TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
return offset;
}
@ -381,7 +381,7 @@ static int dissect_micros_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t Accuracy_sequence[] = {
static const ber_old_sequence_t Accuracy_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_micros_impl },
@ -390,8 +390,8 @@ static const ber_sequence_t Accuracy_sequence[] = {
static int
dissect_pkixtsp_Accuracy(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,
Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
return offset;
}
@ -400,7 +400,7 @@ static int dissect_accuracy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t TSTInfo_sequence[] = {
static const ber_old_sequence_t TSTInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
@ -416,8 +416,8 @@ static const ber_sequence_t TSTInfo_sequence[] = {
static int
dissect_pkixtsp_TSTInfo(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,
TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
return offset;
}

198
epan/dissectors/packet-pres.c
View File

@ -315,15 +315,15 @@ static int dissect_mode_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Mode_selector_set[] = {
static const ber_old_sequence_t Mode_selector_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_value_impl },
{ 0, 0, 0, NULL }
};
static int
dissect_pres_Mode_selector(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(implicit_tag, actx, tree, tvb, offset,
Mode_selector_set, hf_index, ett_pres_Mode_selector);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
Mode_selector_set, hf_index, ett_pres_Mode_selector);
return offset;
}
@ -447,14 +447,14 @@ static int dissect_transfer_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t SEQUENCE_OF_Transfer_syntax_name_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Transfer_syntax_name_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name_list_item },
};
static int
dissect_pres_SEQUENCE_OF_Transfer_syntax_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_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Transfer_syntax_name_sequence_of, hf_index, ett_pres_SEQUENCE_OF_Transfer_syntax_name);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Transfer_syntax_name_sequence_of, hf_index, ett_pres_SEQUENCE_OF_Transfer_syntax_name);
return offset;
}
@ -463,7 +463,7 @@ static int dissect_transfer_syntax_name_list(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t Context_list_item_sequence[] = {
static const ber_old_sequence_t Context_list_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax_name },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name_list },
@ -475,8 +475,8 @@ dissect_pres_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
#line 76 "pres.cnf"
abstract_syntax_name_oid=NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Context_list_item_sequence, hf_index, ett_pres_Context_list_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Context_list_item_sequence, hf_index, ett_pres_Context_list_item);
#line 79 "pres.cnf"
register_ctx_id_and_oid(actx->pinfo, presentation_context_identifier, abstract_syntax_name_oid);
@ -488,14 +488,14 @@ static int dissect_Context_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Context_list_sequence_of[1] = {
static const ber_old_sequence_t Context_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item },
};
static int
dissect_pres_Context_list(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,
Context_list_sequence_of, hf_index, ett_pres_Context_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Context_list_sequence_of, hf_index, ett_pres_Context_list);
return offset;
}
@ -513,7 +513,7 @@ static int dissect_presentation_context_definition_list_impl(proto_tree *tree _U
}
static const ber_sequence_t Default_context_name_sequence[] = {
static const ber_old_sequence_t Default_context_name_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abstract_syntax_name_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
{ 0, 0, 0, NULL }
@ -521,8 +521,8 @@ static const ber_sequence_t Default_context_name_sequence[] = {
static int
dissect_pres_Default_context_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_sequence(implicit_tag, actx, tree, tvb, offset,
Default_context_name_sequence, hf_index, ett_pres_Default_context_name);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Default_context_name_sequence, hf_index, ett_pres_Default_context_name);
return offset;
}
@ -600,14 +600,14 @@ static int dissect_protocol_options(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t T_extensions_sequence[] = {
static const ber_old_sequence_t T_extensions_sequence[] = {
{ 0, 0, 0, NULL }
};
static int
dissect_pres_T_extensions(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_extensions_sequence, hf_index, ett_pres_T_extensions);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_extensions_sequence, hf_index, ett_pres_T_extensions);
return offset;
}
@ -706,7 +706,7 @@ static const value_string pres_T_presentation_data_values_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_presentation_data_values_choice[] = {
static const ber_old_choice_t T_presentation_data_values_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_single_ASN1_type_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@ -715,9 +715,9 @@ static const ber_choice_t T_presentation_data_values_choice[] = {
static int
dissect_pres_T_presentation_data_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
T_presentation_data_values_choice, hf_index, ett_pres_T_presentation_data_values,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_presentation_data_values_choice, hf_index, ett_pres_T_presentation_data_values,
NULL);
return offset;
}
@ -726,7 +726,7 @@ static int dissect_presentation_data_values(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PDV_list_sequence[] = {
static const ber_old_sequence_t PDV_list_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_presentation_data_values },
@ -735,8 +735,8 @@ static const ber_sequence_t PDV_list_sequence[] = {
static int
dissect_pres_PDV_list(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,
PDV_list_sequence, hf_index, ett_pres_PDV_list);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PDV_list_sequence, hf_index, ett_pres_PDV_list);
return offset;
}
@ -745,14 +745,14 @@ static int dissect_Fully_encoded_data_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t Fully_encoded_data_sequence_of[1] = {
static const ber_old_sequence_t Fully_encoded_data_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Fully_encoded_data_item },
};
static int
dissect_pres_Fully_encoded_data(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,
Fully_encoded_data_sequence_of, hf_index, ett_pres_Fully_encoded_data);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Fully_encoded_data_sequence_of, hf_index, ett_pres_Fully_encoded_data);
return offset;
}
@ -767,7 +767,7 @@ static const value_string pres_User_data_vals[] = {
{ 0, NULL }
};
static const ber_choice_t User_data_choice[] = {
static const ber_old_choice_t User_data_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_IMPLTAG, dissect_simply_encoded_data_impl },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_fully_encoded_data_impl },
{ 0, 0, 0, 0, NULL }
@ -775,9 +775,9 @@ static const ber_choice_t User_data_choice[] = {
static int
dissect_pres_User_data(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,
User_data_choice, hf_index, ett_pres_User_data,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
User_data_choice, hf_index, ett_pres_User_data,
NULL);
return offset;
}
@ -789,7 +789,7 @@ static int dissect_ttdPPDU(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t T_normal_mode_parameters_sequence[] = {
static const ber_old_sequence_t T_normal_mode_parameters_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calling_presentation_selector_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_called_presentation_selector_impl },
@ -806,8 +806,8 @@ static const ber_sequence_t T_normal_mode_parameters_sequence[] = {
static int
dissect_pres_T_normal_mode_parameters(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_normal_mode_parameters_sequence, hf_index, ett_pres_T_normal_mode_parameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_normal_mode_parameters_sequence, hf_index, ett_pres_T_normal_mode_parameters);
return offset;
}
@ -816,7 +816,7 @@ static int dissect_normal_mode_parameters_impl(proto_tree *tree _U_, tvbuff_t *t
}
static const ber_sequence_t CP_type_set[] = {
static const ber_old_sequence_t CP_type_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_selector_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x410_mode_parameters_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_normal_mode_parameters_impl },
@ -825,8 +825,8 @@ static const ber_sequence_t CP_type_set[] = {
static int
dissect_pres_CP_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_) {
offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
CP_type_set, hf_index, ett_pres_CP_type);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
CP_type_set, hf_index, ett_pres_CP_type);
return offset;
}
@ -894,7 +894,7 @@ static int dissect_provider_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t Result_list_item_sequence[] = {
static const ber_old_sequence_t Result_list_item_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_result_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_provider_reason_impl },
@ -903,8 +903,8 @@ static const ber_sequence_t Result_list_item_sequence[] = {
static int
dissect_pres_Result_list_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,
Result_list_item_sequence, hf_index, ett_pres_Result_list_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Result_list_item_sequence, hf_index, ett_pres_Result_list_item);
return offset;
}
@ -913,14 +913,14 @@ static int dissect_Result_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Result_list_sequence_of[1] = {
static const ber_old_sequence_t Result_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Result_list_item },
};
static int
dissect_pres_Result_list(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,
Result_list_sequence_of, hf_index, ett_pres_Result_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Result_list_sequence_of, hf_index, ett_pres_Result_list);
return offset;
}
@ -938,7 +938,7 @@ static int dissect_presentation_context_definition_result_list_impl(proto_tree *
}
static const ber_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
static const ber_old_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responding_presentation_selector_impl },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_definition_result_list_impl },
@ -952,8 +952,8 @@ static const ber_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
static int
dissect_pres_T_CPA_PPDU_normal_mode_parameters(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_CPA_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPA_PPDU_normal_mode_parameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_CPA_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPA_PPDU_normal_mode_parameters);
return offset;
}
@ -962,7 +962,7 @@ static int dissect_cPU_PPDU_normal_mode_parameters_impl(proto_tree *tree _U_, tv
}
static const ber_sequence_t CPA_PPDU_set[] = {
static const ber_old_sequence_t CPA_PPDU_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_selector_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cPR_PPDU_x400_mode_parameters_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cPU_PPDU_normal_mode_parameters_impl },
@ -971,8 +971,8 @@ static const ber_sequence_t CPA_PPDU_set[] = {
static int
dissect_pres_CPA_PPDU(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(implicit_tag, actx, tree, tvb, offset,
CPA_PPDU_set, hf_index, ett_pres_CPA_PPDU);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
CPA_PPDU_set, hf_index, ett_pres_CPA_PPDU);
return offset;
}
@ -1015,7 +1015,7 @@ static int dissect_cPR_PPDU__provider_reason_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
static const ber_old_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responding_presentation_selector_impl },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_definition_result_list_impl },
@ -1027,8 +1027,8 @@ static const ber_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
static int
dissect_pres_T_CPR_PPDU_normal_mode_parameters(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_CPR_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPR_PPDU_normal_mode_parameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_CPR_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPR_PPDU_normal_mode_parameters);
return offset;
}
@ -1043,7 +1043,7 @@ static const value_string pres_CPR_PPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CPR_PPDU_choice[] = {
static const ber_old_choice_t CPR_PPDU_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_cPU_PPDU_x400_mode_parameters },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cPR_PPDU_normal_mode_parameters },
{ 0, 0, 0, 0, NULL }
@ -1051,15 +1051,15 @@ static const ber_choice_t CPR_PPDU_choice[] = {
static int
dissect_pres_CPR_PPDU(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,
CPR_PPDU_choice, hf_index, ett_pres_CPR_PPDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CPR_PPDU_choice, hf_index, ett_pres_CPR_PPDU,
NULL);
return offset;
}
static const ber_sequence_t Presentation_context_identifier_list_item_sequence[] = {
static const ber_old_sequence_t Presentation_context_identifier_list_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
{ 0, 0, 0, NULL }
@ -1067,8 +1067,8 @@ static const ber_sequence_t Presentation_context_identifier_list_item_sequence[]
static int
dissect_pres_Presentation_context_identifier_list_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,
Presentation_context_identifier_list_item_sequence, hf_index, ett_pres_Presentation_context_identifier_list_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Presentation_context_identifier_list_item_sequence, hf_index, ett_pres_Presentation_context_identifier_list_item);
return offset;
}
@ -1077,14 +1077,14 @@ static int dissect_Presentation_context_identifier_list_item(proto_tree *tree _U
}
static const ber_sequence_t Presentation_context_identifier_list_sequence_of[1] = {
static const ber_old_sequence_t Presentation_context_identifier_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_identifier_list_item },
};
static int
dissect_pres_Presentation_context_identifier_list(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,
Presentation_context_identifier_list_sequence_of, hf_index, ett_pres_Presentation_context_identifier_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Presentation_context_identifier_list_sequence_of, hf_index, ett_pres_Presentation_context_identifier_list);
return offset;
}
@ -1093,7 +1093,7 @@ static int dissect_presentation_context_identifier_list_impl(proto_tree *tree _U
}
static const ber_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
static const ber_old_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
{ 0, 0, 0, NULL }
@ -1101,8 +1101,8 @@ static const ber_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
static int
dissect_pres_T_ARU_PPDU_normal_mode_parameters(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_ARU_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_ARU_PPDU_normal_mode_parameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_ARU_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_ARU_PPDU_normal_mode_parameters);
return offset;
}
@ -1117,7 +1117,7 @@ static const value_string pres_ARU_PPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ARU_PPDU_choice[] = {
static const ber_old_choice_t ARU_PPDU_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_aRU_PPDU_x400_mode_parameters },
{ 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aRU_PPDU_normal_mode_parameters_impl },
{ 0, 0, 0, 0, NULL }
@ -1125,9 +1125,9 @@ static const ber_choice_t ARU_PPDU_choice[] = {
static int
dissect_pres_ARU_PPDU(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,
ARU_PPDU_choice, hf_index, ett_pres_ARU_PPDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ARU_PPDU_choice, hf_index, ett_pres_ARU_PPDU,
NULL);
return offset;
}
@ -1210,7 +1210,7 @@ static int dissect_event_identifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t ARP_PPDU_sequence[] = {
static const ber_old_sequence_t ARP_PPDU_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aRU_PPDU_provider_reason_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_event_identifier_impl },
{ 0, 0, 0, NULL }
@ -1218,8 +1218,8 @@ static const ber_sequence_t ARP_PPDU_sequence[] = {
static int
dissect_pres_ARP_PPDU(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,
ARP_PPDU_sequence, hf_index, ett_pres_ARP_PPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ARP_PPDU_sequence, hf_index, ett_pres_ARP_PPDU);
return offset;
}
@ -1234,7 +1234,7 @@ static const value_string pres_Abort_type_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Abort_type_choice[] = {
static const ber_old_choice_t Abort_type_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_aru_ppdu },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_arp_ppdu },
{ 0, 0, 0, 0, NULL }
@ -1242,9 +1242,9 @@ static const ber_choice_t Abort_type_choice[] = {
static int
dissect_pres_Abort_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
Abort_type_choice, hf_index, ett_pres_Abort_type,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Abort_type_choice, hf_index, ett_pres_Abort_type,
NULL);
return offset;
}
@ -1262,14 +1262,14 @@ static int dissect_presentation_context_addition_list_impl(proto_tree *tree _U_,
}
static const ber_sequence_t Presentation_context_deletion_list_sequence_of[1] = {
static const ber_old_sequence_t Presentation_context_deletion_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_deletion_list_item },
};
static int
dissect_pres_Presentation_context_deletion_list(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,
Presentation_context_deletion_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Presentation_context_deletion_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_list);
return offset;
}
@ -1278,7 +1278,7 @@ static int dissect_presentation_context_deletion_list_impl(proto_tree *tree _U_,
}
static const ber_sequence_t AC_PPDU_sequence[] = {
static const ber_old_sequence_t AC_PPDU_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_addition_list_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_deletion_list_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
@ -1287,8 +1287,8 @@ static const ber_sequence_t AC_PPDU_sequence[] = {
static int
dissect_pres_AC_PPDU(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,
AC_PPDU_sequence, hf_index, ett_pres_AC_PPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AC_PPDU_sequence, hf_index, ett_pres_AC_PPDU);
return offset;
}
@ -1328,14 +1328,14 @@ static int dissect_Presentation_context_deletion_result_list_item(proto_tree *tr
}
static const ber_sequence_t Presentation_context_deletion_result_list_sequence_of[1] = {
static const ber_old_sequence_t Presentation_context_deletion_result_list_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_deletion_result_list_item },
};
static int
dissect_pres_Presentation_context_deletion_result_list(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,
Presentation_context_deletion_result_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_result_list);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Presentation_context_deletion_result_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_result_list);
return offset;
}
@ -1344,7 +1344,7 @@ static int dissect_presentation_context_deletion_result_list_impl(proto_tree *tr
}
static const ber_sequence_t ACA_PPDU_sequence[] = {
static const ber_old_sequence_t ACA_PPDU_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_addition_result_list_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_deletion_result_list_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
@ -1353,8 +1353,8 @@ static const ber_sequence_t ACA_PPDU_sequence[] = {
static int
dissect_pres_ACA_PPDU(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,
ACA_PPDU_sequence, hf_index, ett_pres_ACA_PPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ACA_PPDU_sequence, hf_index, ett_pres_ACA_PPDU);
return offset;
}
@ -1370,7 +1370,7 @@ static const value_string pres_Typed_data_type_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Typed_data_type_choice[] = {
static const ber_old_choice_t Typed_data_type_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_acPPDU_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_acaPPDU_impl },
{ 2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ttdPPDU },
@ -1379,15 +1379,15 @@ static const ber_choice_t Typed_data_type_choice[] = {
static int
dissect_pres_Typed_data_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
Typed_data_type_choice, hf_index, ett_pres_Typed_data_type,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Typed_data_type_choice, hf_index, ett_pres_Typed_data_type,
NULL);
return offset;
}
static const ber_sequence_t RS_PPDU_sequence[] = {
static const ber_old_sequence_t RS_PPDU_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
{ 0, 0, 0, NULL }
@ -1395,14 +1395,14 @@ static const ber_sequence_t RS_PPDU_sequence[] = {
static int
dissect_pres_RS_PPDU(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,
RS_PPDU_sequence, hf_index, ett_pres_RS_PPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RS_PPDU_sequence, hf_index, ett_pres_RS_PPDU);
return offset;
}
static const ber_sequence_t RSA_PPDU_sequence[] = {
static const ber_old_sequence_t RSA_PPDU_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
{ 0, 0, 0, NULL }
@ -1410,8 +1410,8 @@ static const ber_sequence_t RSA_PPDU_sequence[] = {
static int
dissect_pres_RSA_PPDU(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,
RSA_PPDU_sequence, hf_index, ett_pres_RSA_PPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RSA_PPDU_sequence, hf_index, ett_pres_RSA_PPDU);
return offset;
}

70
epan/dissectors/packet-q932-ros.c
View File

@ -160,7 +160,7 @@ static const value_string q932_ros_Code_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Code_choice[] = {
static const ber_old_choice_t Code_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global },
{ 0, 0, 0, 0, NULL }
@ -173,9 +173,9 @@ dissect_q932_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
code_local = -1;
code_global = "";
offset = dissect_ber_choice(actx, tree, tvb, offset,
Code_choice, hf_index, ett_q932_ros_Code,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Code_choice, hf_index, ett_q932_ros_Code,
NULL);
return offset;
}
@ -221,7 +221,7 @@ static const value_string q932_ros_InvokeId_vals[] = {
{ 0, NULL }
};
static const ber_choice_t InvokeId_choice[] = {
static const ber_old_choice_t InvokeId_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
{ 0, 0, 0, 0, NULL }
@ -229,9 +229,9 @@ static const ber_choice_t InvokeId_choice[] = {
static int
dissect_q932_ros_InvokeId(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,
InvokeId_choice, hf_index, ett_q932_ros_InvokeId,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
InvokeId_choice, hf_index, ett_q932_ros_InvokeId,
NULL);
return offset;
}
@ -249,7 +249,7 @@ static const value_string q932_ros_T_linkedId_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_linkedId_choice[] = {
static const ber_old_choice_t T_linkedId_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_linkedIdPresent_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_absent_impl },
{ 0, 0, 0, 0, NULL }
@ -257,9 +257,9 @@ static const ber_choice_t T_linkedId_choice[] = {
static int
dissect_q932_ros_T_linkedId(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_linkedId_choice, hf_index, ett_q932_ros_T_linkedId,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_linkedId_choice, hf_index, ett_q932_ros_T_linkedId,
NULL);
return offset;
}
@ -290,7 +290,7 @@ static int dissect_argument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Invoke_sequence[] = {
static const ber_old_sequence_t Invoke_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_linkedId },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode },
@ -305,8 +305,8 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
arg_next_tvb = NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Invoke_sequence, hf_index, ett_q932_ros_Invoke);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Invoke_sequence, hf_index, ett_q932_ros_Invoke);
#line 73 "q932-ros.cnf"
if (code_choice == 0) {
@ -359,7 +359,7 @@ static int dissect_resultArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t T_result_sequence[] = {
static const ber_old_sequence_t T_result_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultArgument },
{ 0, 0, 0, NULL }
@ -367,8 +367,8 @@ static const ber_sequence_t T_result_sequence[] = {
static int
dissect_q932_ros_T_result(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_result_sequence, hf_index, ett_q932_ros_T_result);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_result_sequence, hf_index, ett_q932_ros_T_result);
return offset;
}
@ -377,7 +377,7 @@ static int dissect_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t ReturnResult_sequence[] = {
static const ber_old_sequence_t ReturnResult_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_result },
{ 0, 0, 0, NULL }
@ -390,8 +390,8 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
res_next_tvb = NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult);
#line 116 "q932-ros.cnf"
if (code_choice == 0) {
@ -445,7 +445,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ReturnError_sequence[] = {
static const ber_old_sequence_t ReturnError_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errcode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@ -459,8 +459,8 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
err_next_tvb = NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnError_sequence, hf_index, ett_q932_ros_ReturnError);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnError_sequence, hf_index, ett_q932_ros_ReturnError);
#line 159 "q932-ros.cnf"
if (code_choice == 0) {
@ -598,7 +598,7 @@ static const value_string q932_ros_T_problem_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_problem_choice[] = {
static const ber_old_choice_t T_problem_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_general_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@ -608,9 +608,9 @@ static const ber_choice_t T_problem_choice[] = {
static int
dissect_q932_ros_T_problem(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_problem_choice, hf_index, ett_q932_ros_T_problem,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_problem_choice, hf_index, ett_q932_ros_T_problem,
NULL);
return offset;
}
@ -619,7 +619,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t Reject_sequence[] = {
static const ber_old_sequence_t Reject_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
{ 0, 0, 0, NULL }
@ -630,8 +630,8 @@ dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
#line 184 "q932-ros.cnf"
problem_str[0] = '\0';
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Reject_sequence, hf_index, ett_q932_ros_Reject);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Reject_sequence, hf_index, ett_q932_ros_Reject);
#line 186 "q932-ros.cnf"
proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), " REJ: %s", problem_str);
@ -651,7 +651,7 @@ static const value_string q932_ros_RoseAPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RoseAPDU_choice[] = {
static const ber_old_choice_t RoseAPDU_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@ -661,9 +661,9 @@ static const ber_choice_t RoseAPDU_choice[] = {
static int
dissect_q932_ros_RoseAPDU(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,
RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU,
NULL);
return offset;
}

90
epan/dissectors/packet-q932.c
View File

@ -253,7 +253,7 @@ static int dissect_publicTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t PublicPartyNumber_sequence[] = {
static const ber_old_sequence_t PublicPartyNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_publicTypeOfNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_publicNumberDigits },
{ 0, 0, 0, NULL }
@ -261,8 +261,8 @@ static const ber_sequence_t PublicPartyNumber_sequence[] = {
static int
dissect_q932_PublicPartyNumber(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,
PublicPartyNumber_sequence, hf_index, ett_q932_PublicPartyNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PublicPartyNumber_sequence, hf_index, ett_q932_PublicPartyNumber);
return offset;
}
@ -307,7 +307,7 @@ static int dissect_privateTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t PrivatePartyNumber_sequence[] = {
static const ber_old_sequence_t PrivatePartyNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_privateTypeOfNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_privateNumberDigits },
{ 0, 0, 0, NULL }
@ -315,8 +315,8 @@ static const ber_sequence_t PrivatePartyNumber_sequence[] = {
static int
dissect_q932_PrivatePartyNumber(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,
PrivatePartyNumber_sequence, hf_index, ett_q932_PrivatePartyNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PrivatePartyNumber_sequence, hf_index, ett_q932_PrivatePartyNumber);
return offset;
}
@ -325,7 +325,7 @@ static int dissect_privatePartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_choice_t PartyNumber_choice[] = {
static const ber_old_choice_t PartyNumber_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknownPartyNumber_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_publicPartyNumber_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nsapEncodedNumber_impl },
@ -338,9 +338,9 @@ static const ber_choice_t PartyNumber_choice[] = {
int
dissect_q932_PartyNumber(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,
PartyNumber_choice, hf_index, ett_q932_PartyNumber,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PartyNumber_choice, hf_index, ett_q932_PartyNumber,
NULL);
return offset;
}
@ -396,7 +396,7 @@ static int dissect_oddCountIndicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
static const ber_old_sequence_t UserSpecifiedSubaddress_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subaddressInformation },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_oddCountIndicator },
{ 0, 0, 0, NULL }
@ -404,8 +404,8 @@ static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
static int
dissect_q932_UserSpecifiedSubaddress(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,
UserSpecifiedSubaddress_sequence, hf_index, ett_q932_UserSpecifiedSubaddress);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UserSpecifiedSubaddress_sequence, hf_index, ett_q932_UserSpecifiedSubaddress);
return offset;
}
@ -427,7 +427,7 @@ static int dissect_nSAPSubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_choice_t PartySubaddress_choice[] = {
static const ber_old_choice_t PartySubaddress_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userSpecifiedSubaddress },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nSAPSubaddress },
{ 0, 0, 0, 0, NULL }
@ -435,9 +435,9 @@ static const ber_choice_t PartySubaddress_choice[] = {
int
dissect_q932_PartySubaddress(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,
PartySubaddress_choice, hf_index, ett_q932_PartySubaddress,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PartySubaddress_choice, hf_index, ett_q932_PartySubaddress,
NULL);
return offset;
}
@ -446,7 +446,7 @@ static int dissect_partySubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t AddressScreened_sequence[] = {
static const ber_old_sequence_t AddressScreened_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeninglndicator },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
@ -455,8 +455,8 @@ static const ber_sequence_t AddressScreened_sequence[] = {
static int
dissect_q932_AddressScreened(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,
AddressScreened_sequence, hf_index, ett_q932_AddressScreened);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AddressScreened_sequence, hf_index, ett_q932_AddressScreened);
return offset;
}
@ -486,7 +486,7 @@ static int dissect_numberNotAvailableDueToInterworking_impl(proto_tree *tree _U_
}
static const ber_choice_t PresentedAddressScreened_choice[] = {
static const ber_old_choice_t PresentedAddressScreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAlIowedAddress_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueTolnterworking_impl },
@ -496,15 +496,15 @@ static const ber_choice_t PresentedAddressScreened_choice[] = {
int
dissect_q932_PresentedAddressScreened(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,
PresentedAddressScreened_choice, hf_index, ett_q932_PresentedAddressScreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedAddressScreened_choice, hf_index, ett_q932_PresentedAddressScreened,
NULL);
return offset;
}
static const ber_sequence_t Address_sequence[] = {
static const ber_old_sequence_t Address_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
{ 0, 0, 0, NULL }
@ -512,8 +512,8 @@ static const ber_sequence_t Address_sequence[] = {
int
dissect_q932_Address(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,
Address_sequence, hf_index, ett_q932_Address);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Address_sequence, hf_index, ett_q932_Address);
return offset;
}
@ -525,7 +525,7 @@ static int dissect_presentationRestrictedAddress_impl(proto_tree *tree _U_, tvbu
}
static const ber_choice_t PresentedAddressUnscreened_choice[] = {
static const ber_old_choice_t PresentedAddressUnscreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddress_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueTolnterworking_impl },
@ -535,15 +535,15 @@ static const ber_choice_t PresentedAddressUnscreened_choice[] = {
int
dissect_q932_PresentedAddressUnscreened(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,
PresentedAddressUnscreened_choice, hf_index, ett_q932_PresentedAddressUnscreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedAddressUnscreened_choice, hf_index, ett_q932_PresentedAddressUnscreened,
NULL);
return offset;
}
static const ber_sequence_t NumberScreened_sequence[] = {
static const ber_old_sequence_t NumberScreened_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
{ 0, 0, 0, NULL }
@ -551,8 +551,8 @@ static const ber_sequence_t NumberScreened_sequence[] = {
static int
dissect_q932_NumberScreened(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,
NumberScreened_sequence, hf_index, ett_q932_NumberScreened);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NumberScreened_sequence, hf_index, ett_q932_NumberScreened);
return offset;
}
@ -564,7 +564,7 @@ static int dissect_presentationRestrictedNumberScreened_impl(proto_tree *tree _U
}
static const ber_choice_t PresentedNumberScreened_choice[] = {
static const ber_old_choice_t PresentedNumberScreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedNumberScreened_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -574,15 +574,15 @@ static const ber_choice_t PresentedNumberScreened_choice[] = {
int
dissect_q932_PresentedNumberScreened(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,
PresentedNumberScreened_choice, hf_index, ett_q932_PresentedNumberScreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedNumberScreened_choice, hf_index, ett_q932_PresentedNumberScreened,
NULL);
return offset;
}
static const ber_choice_t PresentedNumberUnscreened_choice[] = {
static const ber_old_choice_t PresentedNumberUnscreened_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_presentationAllowedNumber },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -592,9 +592,9 @@ static const ber_choice_t PresentedNumberUnscreened_choice[] = {
int
dissect_q932_PresentedNumberUnscreened(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,
PresentedNumberUnscreened_choice, hf_index, ett_q932_PresentedNumberUnscreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedNumberUnscreened_choice, hf_index, ett_q932_PresentedNumberUnscreened,
NULL);
return offset;
}
@ -646,7 +646,7 @@ static int dissect_destinationEntityAddress(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t NetworkFacilityExtension_U_sequence[] = {
static const ber_old_sequence_t NetworkFacilityExtension_U_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sourceEntity_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_sourceEntityAddress },
{ BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_destinationEntity_impl },
@ -656,8 +656,8 @@ static const ber_sequence_t NetworkFacilityExtension_U_sequence[] = {
static int
dissect_q932_NetworkFacilityExtension_U(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,
NetworkFacilityExtension_U_sequence, hf_index, ett_q932_NetworkFacilityExtension_U);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NetworkFacilityExtension_U_sequence, hf_index, ett_q932_NetworkFacilityExtension_U);
return offset;
}

320
epan/dissectors/packet-qsig.c
View File

@ -674,7 +674,7 @@ static int dissect_extensionArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Extension_sequence[] = {
static const ber_old_sequence_t Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extensionId },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extensionArgument },
{ 0, 0, 0, NULL }
@ -682,8 +682,8 @@ static const ber_sequence_t Extension_sequence[] = {
static int
dissect_qsig_Extension(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,
Extension_sequence, hf_index, ett_qsig_Extension);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Extension_sequence, hf_index, ett_qsig_Extension);
return offset;
}
@ -770,7 +770,7 @@ static int dissect_publicTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t PublicPartyNumber_sequence[] = {
static const ber_old_sequence_t PublicPartyNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_publicTypeOfNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_publicNumberDigits },
{ 0, 0, 0, NULL }
@ -778,8 +778,8 @@ static const ber_sequence_t PublicPartyNumber_sequence[] = {
static int
dissect_qsig_PublicPartyNumber(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,
PublicPartyNumber_sequence, hf_index, ett_qsig_PublicPartyNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PublicPartyNumber_sequence, hf_index, ett_qsig_PublicPartyNumber);
return offset;
}
@ -811,7 +811,7 @@ static int dissect_privateTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t PrivatePartyNumber_sequence[] = {
static const ber_old_sequence_t PrivatePartyNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_privateTypeOfNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_privateNumberDigits },
{ 0, 0, 0, NULL }
@ -819,8 +819,8 @@ static const ber_sequence_t PrivatePartyNumber_sequence[] = {
static int
dissect_qsig_PrivatePartyNumber(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,
PrivatePartyNumber_sequence, hf_index, ett_qsig_PrivatePartyNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PrivatePartyNumber_sequence, hf_index, ett_qsig_PrivatePartyNumber);
return offset;
}
@ -839,7 +839,7 @@ static const value_string qsig_PartyNumber_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PartyNumber_choice[] = {
static const ber_old_choice_t PartyNumber_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknownPartyNumber_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_publicPartyNumber_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dataPartyNumber_impl },
@ -851,9 +851,9 @@ static const ber_choice_t PartyNumber_choice[] = {
static int
dissect_qsig_PartyNumber(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,
PartyNumber_choice, hf_index, ett_qsig_PartyNumber,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PartyNumber_choice, hf_index, ett_qsig_PartyNumber,
NULL);
return offset;
}
@ -935,7 +935,7 @@ static int dissect_remoteEnabled(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
static const ber_old_sequence_t UserSpecifiedSubaddress_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subaddressInformation },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_oddCountIndicator },
{ 0, 0, 0, NULL }
@ -943,8 +943,8 @@ static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
static int
dissect_qsig_UserSpecifiedSubaddress(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,
UserSpecifiedSubaddress_sequence, hf_index, ett_qsig_UserSpecifiedSubaddress);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UserSpecifiedSubaddress_sequence, hf_index, ett_qsig_UserSpecifiedSubaddress);
return offset;
}
@ -972,7 +972,7 @@ static const value_string qsig_PartySubaddress_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PartySubaddress_choice[] = {
static const ber_old_choice_t PartySubaddress_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userSpecifiedSubaddress },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nSAPSubaddress },
{ 0, 0, 0, 0, NULL }
@ -980,9 +980,9 @@ static const ber_choice_t PartySubaddress_choice[] = {
static int
dissect_qsig_PartySubaddress(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,
PartySubaddress_choice, hf_index, ett_qsig_PartySubaddress,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PartySubaddress_choice, hf_index, ett_qsig_PartySubaddress,
NULL);
return offset;
}
@ -994,7 +994,7 @@ static int dissect_callingPartySubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t AddressScreened_sequence[] = {
static const ber_old_sequence_t AddressScreened_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
@ -1003,8 +1003,8 @@ static const ber_sequence_t AddressScreened_sequence[] = {
static int
dissect_qsig_AddressScreened(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,
AddressScreened_sequence, hf_index, ett_qsig_AddressScreened);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AddressScreened_sequence, hf_index, ett_qsig_AddressScreened);
return offset;
}
@ -1045,7 +1045,7 @@ static const value_string qsig_PresentedAddressScreened_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PresentedAddressScreened_choice[] = {
static const ber_old_choice_t PresentedAddressScreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressS_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -1055,15 +1055,15 @@ static const ber_choice_t PresentedAddressScreened_choice[] = {
static int
dissect_qsig_PresentedAddressScreened(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,
PresentedAddressScreened_choice, hf_index, ett_qsig_PresentedAddressScreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedAddressScreened_choice, hf_index, ett_qsig_PresentedAddressScreened,
NULL);
return offset;
}
static const ber_sequence_t Address_sequence[] = {
static const ber_old_sequence_t Address_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
{ 0, 0, 0, NULL }
@ -1071,8 +1071,8 @@ static const ber_sequence_t Address_sequence[] = {
static int
dissect_qsig_Address(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,
Address_sequence, hf_index, ett_qsig_Address);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Address_sequence, hf_index, ett_qsig_Address);
return offset;
}
@ -1098,7 +1098,7 @@ static const value_string qsig_PresentedAddressUnscreened_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PresentedAddressUnscreened_choice[] = {
static const ber_old_choice_t PresentedAddressUnscreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressU_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -1108,15 +1108,15 @@ static const ber_choice_t PresentedAddressUnscreened_choice[] = {
static int
dissect_qsig_PresentedAddressUnscreened(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,
PresentedAddressUnscreened_choice, hf_index, ett_qsig_PresentedAddressUnscreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedAddressUnscreened_choice, hf_index, ett_qsig_PresentedAddressUnscreened,
NULL);
return offset;
}
static const ber_sequence_t NumberScreened_sequence[] = {
static const ber_old_sequence_t NumberScreened_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
{ 0, 0, 0, NULL }
@ -1124,8 +1124,8 @@ static const ber_sequence_t NumberScreened_sequence[] = {
static int
dissect_qsig_NumberScreened(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,
NumberScreened_sequence, hf_index, ett_qsig_NumberScreened);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NumberScreened_sequence, hf_index, ett_qsig_NumberScreened);
return offset;
}
@ -1145,7 +1145,7 @@ static const value_string qsig_PresentedNumberScreened_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PresentedNumberScreened_choice[] = {
static const ber_old_choice_t PresentedNumberScreened_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressNS_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -1155,9 +1155,9 @@ static const ber_choice_t PresentedNumberScreened_choice[] = {
static int
dissect_qsig_PresentedNumberScreened(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,
PresentedNumberScreened_choice, hf_index, ett_qsig_PresentedNumberScreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedNumberScreened_choice, hf_index, ett_qsig_PresentedNumberScreened,
NULL);
return offset;
}
@ -1174,7 +1174,7 @@ static const value_string qsig_PresentedNumberUnscreened_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PresentedNumberUnscreened_choice[] = {
static const ber_old_choice_t PresentedNumberUnscreened_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_presentationAllowedAddressNU },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@ -1184,9 +1184,9 @@ static const ber_choice_t PresentedNumberUnscreened_choice[] = {
static int
dissect_qsig_PresentedNumberUnscreened(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,
PresentedNumberUnscreened_choice, hf_index, ett_qsig_PresentedNumberUnscreened,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PresentedNumberUnscreened_choice, hf_index, ett_qsig_PresentedNumberUnscreened,
NULL);
return offset;
}
@ -1258,7 +1258,7 @@ static int dissect_characterSet(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t NameSet_sequence[] = {
static const ber_old_sequence_t NameSet_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nameData },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_characterSet },
{ 0, 0, 0, NULL }
@ -1266,8 +1266,8 @@ static const ber_sequence_t NameSet_sequence[] = {
static int
dissect_qsig_NameSet(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,
NameSet_sequence, hf_index, ett_qsig_NameSet);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NameSet_sequence, hf_index, ett_qsig_NameSet);
return offset;
}
@ -1285,7 +1285,7 @@ static const value_string qsig_NamePresentationAllowed_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NamePresentationAllowed_choice[] = {
static const ber_old_choice_t NamePresentationAllowed_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowedSimple_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowedExtended_impl },
{ 0, 0, 0, 0, NULL }
@ -1293,9 +1293,9 @@ static const ber_choice_t NamePresentationAllowed_choice[] = {
static int
dissect_qsig_NamePresentationAllowed(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,
NamePresentationAllowed_choice, hf_index, ett_qsig_NamePresentationAllowed,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NamePresentationAllowed_choice, hf_index, ett_qsig_NamePresentationAllowed,
NULL);
return offset;
}
@ -1311,7 +1311,7 @@ static const value_string qsig_NamePresentationRestricted_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NamePresentationRestricted_choice[] = {
static const ber_old_choice_t NamePresentationRestricted_choice[] = {
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedSimple_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedExtended_impl },
{ 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedNull_impl },
@ -1320,9 +1320,9 @@ static const ber_choice_t NamePresentationRestricted_choice[] = {
static int
dissect_qsig_NamePresentationRestricted(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,
NamePresentationRestricted_choice, hf_index, ett_qsig_NamePresentationRestricted,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NamePresentationRestricted_choice, hf_index, ett_qsig_NamePresentationRestricted,
NULL);
return offset;
}
@ -1344,7 +1344,7 @@ static int dissect_nameNotAvailable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_choice_t Name_choice[] = {
static const ber_old_choice_t Name_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_namePresentationAllowed },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_namePresentationRestricted },
{ 2, BER_CLASS_CON, 4, BER_FLAGS_NOOWNTAG, dissect_nameNotAvailable },
@ -1353,9 +1353,9 @@ static const ber_choice_t Name_choice[] = {
int
dissect_qsig_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_qsig_Name,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Name_choice, hf_index, ett_qsig_Name,
NULL);
return offset;
}
@ -1376,14 +1376,14 @@ static int dissect_redirectionName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SEQUENCE_OF_Extension_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Extension_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiple_item },
};
static int
dissect_qsig_SEQUENCE_OF_Extension(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_Extension_sequence_of, hf_index, ett_qsig_SEQUENCE_OF_Extension);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Extension_sequence_of, hf_index, ett_qsig_SEQUENCE_OF_Extension);
return offset;
}
@ -1398,7 +1398,7 @@ static const value_string qsig_NameExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NameExtension_choice[] = {
static const ber_old_choice_t NameExtension_choice[] = {
{ 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1406,9 +1406,9 @@ static const ber_choice_t NameExtension_choice[] = {
static int
dissect_qsig_NameExtension(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,
NameExtension_choice, hf_index, ett_qsig_NameExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NameExtension_choice, hf_index, ett_qsig_NameExtension,
NULL);
return offset;
}
@ -1417,7 +1417,7 @@ static int dissect_extensionNA(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t T_nameSequence_sequence[] = {
static const ber_old_sequence_t T_nameSequence_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extensionNA },
{ 0, 0, 0, NULL }
@ -1425,8 +1425,8 @@ static const ber_sequence_t T_nameSequence_sequence[] = {
static int
dissect_qsig_T_nameSequence(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_nameSequence_sequence, hf_index, ett_qsig_T_nameSequence);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_nameSequence_sequence, hf_index, ett_qsig_T_nameSequence);
return offset;
}
@ -1441,7 +1441,7 @@ static const value_string qsig_NameArg_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NameArg_choice[] = {
static const ber_old_choice_t NameArg_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_name },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_nameSequence },
{ 0, 0, 0, 0, NULL }
@ -1449,9 +1449,9 @@ static const ber_choice_t NameArg_choice[] = {
static int
dissect_qsig_NameArg(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,
NameArg_choice, hf_index, ett_qsig_NameArg,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NameArg_choice, hf_index, ett_qsig_NameArg,
NULL);
return offset;
}
@ -1509,7 +1509,7 @@ static const value_string qsig_ADExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ADExtension_choice[] = {
static const ber_old_choice_t ADExtension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1517,9 +1517,9 @@ static const ber_choice_t ADExtension_choice[] = {
static int
dissect_qsig_ADExtension(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,
ADExtension_choice, hf_index, ett_qsig_ADExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ADExtension_choice, hf_index, ett_qsig_ADExtension,
NULL);
return offset;
}
@ -1528,7 +1528,7 @@ static int dissect_extensionAD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t ActivateDivArg_sequence[] = {
static const ber_old_sequence_t ActivateDivArg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_divertedToAddress },
@ -1540,8 +1540,8 @@ static const ber_sequence_t ActivateDivArg_sequence[] = {
static int
dissect_qsig_ActivateDivArg(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,
ActivateDivArg_sequence, hf_index, ett_qsig_ActivateDivArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ActivateDivArg_sequence, hf_index, ett_qsig_ActivateDivArg);
return offset;
}
@ -1554,7 +1554,7 @@ static const value_string qsig_ActivateDivRes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ActivateDivRes_choice[] = {
static const ber_old_choice_t ActivateDivRes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@ -1563,9 +1563,9 @@ static const ber_choice_t ActivateDivRes_choice[] = {
static int
dissect_qsig_ActivateDivRes(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,
ActivateDivRes_choice, hf_index, ett_qsig_ActivateDivRes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ActivateDivRes_choice, hf_index, ett_qsig_ActivateDivRes,
NULL);
return offset;
}
@ -1577,7 +1577,7 @@ static const value_string qsig_DDExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DDExtension_choice[] = {
static const ber_old_choice_t DDExtension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1585,9 +1585,9 @@ static const ber_choice_t DDExtension_choice[] = {
static int
dissect_qsig_DDExtension(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,
DDExtension_choice, hf_index, ett_qsig_DDExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DDExtension_choice, hf_index, ett_qsig_DDExtension,
NULL);
return offset;
}
@ -1596,7 +1596,7 @@ static int dissect_extensionDD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t DeactivateDivArg_sequence[] = {
static const ber_old_sequence_t DeactivateDivArg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
@ -1607,8 +1607,8 @@ static const ber_sequence_t DeactivateDivArg_sequence[] = {
static int
dissect_qsig_DeactivateDivArg(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,
DeactivateDivArg_sequence, hf_index, ett_qsig_DeactivateDivArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DeactivateDivArg_sequence, hf_index, ett_qsig_DeactivateDivArg);
return offset;
}
@ -1621,7 +1621,7 @@ static const value_string qsig_DeactivateDivRes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DeactivateDivRes_choice[] = {
static const ber_old_choice_t DeactivateDivRes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@ -1630,9 +1630,9 @@ static const ber_choice_t DeactivateDivRes_choice[] = {
static int
dissect_qsig_DeactivateDivRes(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,
DeactivateDivRes_choice, hf_index, ett_qsig_DeactivateDivRes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DeactivateDivRes_choice, hf_index, ett_qsig_DeactivateDivRes,
NULL);
return offset;
}
@ -1644,7 +1644,7 @@ static const value_string qsig_IDExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t IDExtension_choice[] = {
static const ber_old_choice_t IDExtension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1652,9 +1652,9 @@ static const ber_choice_t IDExtension_choice[] = {
static int
dissect_qsig_IDExtension(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,
IDExtension_choice, hf_index, ett_qsig_IDExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
IDExtension_choice, hf_index, ett_qsig_IDExtension,
NULL);
return offset;
}
@ -1663,7 +1663,7 @@ static int dissect_extensionID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t InterrDivArg_sequence[] = {
static const ber_old_sequence_t InterrDivArg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_basicService },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
@ -1674,8 +1674,8 @@ static const ber_sequence_t InterrDivArg_sequence[] = {
static int
dissect_qsig_InterrDivArg(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,
InterrDivArg_sequence, hf_index, ett_qsig_InterrDivArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InterrDivArg_sequence, hf_index, ett_qsig_InterrDivArg);
return offset;
}
@ -1687,7 +1687,7 @@ static const value_string qsig_CHRExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CHRExtension_choice[] = {
static const ber_old_choice_t CHRExtension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1695,9 +1695,9 @@ static const ber_choice_t CHRExtension_choice[] = {
static int
dissect_qsig_CHRExtension(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,
CHRExtension_choice, hf_index, ett_qsig_CHRExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CHRExtension_choice, hf_index, ett_qsig_CHRExtension,
NULL);
return offset;
}
@ -1706,7 +1706,7 @@ static int dissect_extensionCHR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t ChkResArg_sequence[] = {
static const ber_old_sequence_t ChkResArg_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_divertedToNr },
@ -1716,8 +1716,8 @@ static const ber_sequence_t ChkResArg_sequence[] = {
static int
dissect_qsig_ChkResArg(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,
ChkResArg_sequence, hf_index, ett_qsig_ChkResArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ChkResArg_sequence, hf_index, ett_qsig_ChkResArg);
return offset;
}
@ -1730,7 +1730,7 @@ static const value_string qsig_ChkResRes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ChkResRes_choice[] = {
static const ber_old_choice_t ChkResRes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@ -1739,9 +1739,9 @@ static const ber_choice_t ChkResRes_choice[] = {
static int
dissect_qsig_ChkResRes(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,
ChkResRes_choice, hf_index, ett_qsig_ChkResRes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ChkResRes_choice, hf_index, ett_qsig_ChkResRes,
NULL);
return offset;
}
@ -1819,7 +1819,7 @@ static const value_string qsig_CRRExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CRRExtension_choice[] = {
static const ber_old_choice_t CRRExtension_choice[] = {
{ 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1827,9 +1827,9 @@ static const ber_choice_t CRRExtension_choice[] = {
static int
dissect_qsig_CRRExtension(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,
CRRExtension_choice, hf_index, ett_qsig_CRRExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CRRExtension_choice, hf_index, ett_qsig_CRRExtension,
NULL);
return offset;
}
@ -1838,7 +1838,7 @@ static int dissect_extensionCRR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t CallRrArg_sequence[] = {
static const ber_old_sequence_t CallRrArg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_rerouteingReason },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalRerouteingReason_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_calledAddress },
@ -1858,8 +1858,8 @@ static const ber_sequence_t CallRrArg_sequence[] = {
static int
dissect_qsig_CallRrArg(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,
CallRrArg_sequence, hf_index, ett_qsig_CallRrArg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CallRrArg_sequence, hf_index, ett_qsig_CallRrArg);
return offset;
}
@ -1872,7 +1872,7 @@ static const value_string qsig_CallRrRes_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CallRrRes_choice[] = {
static const ber_old_choice_t CallRrRes_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@ -1881,9 +1881,9 @@ static const ber_choice_t CallRrRes_choice[] = {
static int
dissect_qsig_CallRrRes(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,
CallRrRes_choice, hf_index, ett_qsig_CallRrRes,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CallRrRes_choice, hf_index, ett_qsig_CallRrRes,
NULL);
return offset;
}
@ -1895,7 +1895,7 @@ static const value_string qsig_DLI1Extension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DLI1Extension_choice[] = {
static const ber_old_choice_t DLI1Extension_choice[] = {
{ 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1903,9 +1903,9 @@ static const ber_choice_t DLI1Extension_choice[] = {
static int
dissect_qsig_DLI1Extension(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,
DLI1Extension_choice, hf_index, ett_qsig_DLI1Extension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DLI1Extension_choice, hf_index, ett_qsig_DLI1Extension,
NULL);
return offset;
}
@ -1914,7 +1914,7 @@ static int dissect_extensionDLI1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t DivLegInf1Arg_sequence[] = {
static const ber_old_sequence_t DivLegInf1Arg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_diversionReason },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_subscriptionOption },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nominatedNr },
@ -1924,8 +1924,8 @@ static const ber_sequence_t DivLegInf1Arg_sequence[] = {
static int
dissect_qsig_DivLegInf1Arg(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,
DivLegInf1Arg_sequence, hf_index, ett_qsig_DivLegInf1Arg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DivLegInf1Arg_sequence, hf_index, ett_qsig_DivLegInf1Arg);
return offset;
}
@ -1937,7 +1937,7 @@ static const value_string qsig_DLI2Extension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DLI2Extension_choice[] = {
static const ber_old_choice_t DLI2Extension_choice[] = {
{ 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1945,9 +1945,9 @@ static const ber_choice_t DLI2Extension_choice[] = {
static int
dissect_qsig_DLI2Extension(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,
DLI2Extension_choice, hf_index, ett_qsig_DLI2Extension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DLI2Extension_choice, hf_index, ett_qsig_DLI2Extension,
NULL);
return offset;
}
@ -1956,7 +1956,7 @@ static int dissect_extensionDLI2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t DivLegInf2Arg_sequence[] = {
static const ber_old_sequence_t DivLegInf2Arg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_diversionCounter },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_diversionReason },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalDiversionReason_impl },
@ -1970,8 +1970,8 @@ static const ber_sequence_t DivLegInf2Arg_sequence[] = {
static int
dissect_qsig_DivLegInf2Arg(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,
DivLegInf2Arg_sequence, hf_index, ett_qsig_DivLegInf2Arg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DivLegInf2Arg_sequence, hf_index, ett_qsig_DivLegInf2Arg);
return offset;
}
@ -1983,7 +1983,7 @@ static const value_string qsig_DLI3Extension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DLI3Extension_choice[] = {
static const ber_old_choice_t DLI3Extension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -1991,9 +1991,9 @@ static const ber_choice_t DLI3Extension_choice[] = {
static int
dissect_qsig_DLI3Extension(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,
DLI3Extension_choice, hf_index, ett_qsig_DLI3Extension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DLI3Extension_choice, hf_index, ett_qsig_DLI3Extension,
NULL);
return offset;
}
@ -2002,7 +2002,7 @@ static int dissect_extensionDLI3(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t DivLegInf3Arg_sequence[] = {
static const ber_old_sequence_t DivLegInf3Arg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_presentationAllowedIndicator },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_redirectionName },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extensionDLI3 },
@ -2011,8 +2011,8 @@ static const ber_sequence_t DivLegInf3Arg_sequence[] = {
static int
dissect_qsig_DivLegInf3Arg(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,
DivLegInf3Arg_sequence, hf_index, ett_qsig_DivLegInf3Arg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DivLegInf3Arg_sequence, hf_index, ett_qsig_DivLegInf3Arg);
return offset;
}
@ -2025,7 +2025,7 @@ static const value_string qsig_DivLegFailArg_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DivLegFailArg_choice[] = {
static const ber_old_choice_t DivLegFailArg_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@ -2034,9 +2034,9 @@ static const ber_choice_t DivLegFailArg_choice[] = {
static int
dissect_qsig_DivLegFailArg(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,
DivLegFailArg_choice, hf_index, ett_qsig_DivLegFailArg,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DivLegFailArg_choice, hf_index, ett_qsig_DivLegFailArg,
NULL);
return offset;
}
@ -2048,7 +2048,7 @@ static const value_string qsig_IRExtension_vals[] = {
{ 0, NULL }
};
static const ber_choice_t IRExtension_choice[] = {
static const ber_old_choice_t IRExtension_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
{ 0, 0, 0, 0, NULL }
@ -2056,9 +2056,9 @@ static const ber_choice_t IRExtension_choice[] = {
static int
dissect_qsig_IRExtension(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,
IRExtension_choice, hf_index, ett_qsig_IRExtension,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
IRExtension_choice, hf_index, ett_qsig_IRExtension,
NULL);
return offset;
}
@ -2067,7 +2067,7 @@ static int dissect_extensionIR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t IntResult_sequence[] = {
static const ber_old_sequence_t IntResult_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
@ -2079,8 +2079,8 @@ static const ber_sequence_t IntResult_sequence[] = {
static int
dissect_qsig_IntResult(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,
IntResult_sequence, hf_index, ett_qsig_IntResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IntResult_sequence, hf_index, ett_qsig_IntResult);
return offset;
}
@ -2089,14 +2089,14 @@ static int dissect_IntResultList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t IntResultList_set_of[1] = {
static const ber_old_sequence_t IntResultList_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IntResultList_item },
};
static int
dissect_qsig_IntResultList(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,
IntResultList_set_of, hf_index, ett_qsig_IntResultList);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
IntResultList_set_of, hf_index, ett_qsig_IntResultList);
return offset;
}

62
epan/dissectors/packet-ros.c
View File

@ -354,7 +354,7 @@ const value_string ros_InvokeId_vals[] = {
{ 0, NULL }
};
static const ber_choice_t InvokeId_choice[] = {
static const ber_old_choice_t InvokeId_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
{ 0, 0, 0, 0, NULL }
@ -362,9 +362,9 @@ static const ber_choice_t InvokeId_choice[] = {
int
dissect_ros_InvokeId(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,
InvokeId_choice, hf_index, ett_ros_InvokeId,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
InvokeId_choice, hf_index, ett_ros_InvokeId,
NULL);
return offset;
}
@ -413,7 +413,7 @@ static int dissect_argument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Invoke_sequence[] = {
static const ber_old_sequence_t Invoke_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedId_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
@ -423,8 +423,8 @@ static const ber_sequence_t Invoke_sequence[] = {
static int
dissect_ros_Invoke(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,
Invoke_sequence, hf_index, ett_ros_Invoke);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Invoke_sequence, hf_index, ett_ros_Invoke);
return offset;
}
@ -460,7 +460,7 @@ static int dissect_operationResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t T_result_sequence[] = {
static const ber_old_sequence_t T_result_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_operationResult },
{ 0, 0, 0, NULL }
@ -468,8 +468,8 @@ static const ber_sequence_t T_result_sequence[] = {
static int
dissect_ros_T_result(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_result_sequence, hf_index, ett_ros_T_result);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_result_sequence, hf_index, ett_ros_T_result);
return offset;
}
@ -478,7 +478,7 @@ static int dissect_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t ReturnResult_sequence[] = {
static const ber_old_sequence_t ReturnResult_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_result },
{ 0, 0, 0, NULL }
@ -486,8 +486,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
static int
dissect_ros_ReturnResult(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,
ReturnResult_sequence, hf_index, ett_ros_ReturnResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResult_sequence, hf_index, ett_ros_ReturnResult);
return offset;
}
@ -537,7 +537,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ReturnError_sequence[] = {
static const ber_old_sequence_t ReturnError_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_errcode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@ -546,8 +546,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
static int
dissect_ros_ReturnError(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,
ReturnError_sequence, hf_index, ett_ros_ReturnError);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnError_sequence, hf_index, ett_ros_ReturnError);
return offset;
}
@ -651,7 +651,7 @@ static const value_string ros_T_problem_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_problem_choice[] = {
static const ber_old_choice_t T_problem_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_general_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_rejectResult_impl },
@ -661,9 +661,9 @@ static const ber_choice_t T_problem_choice[] = {
static int
dissect_ros_T_problem(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_problem_choice, hf_index, ett_ros_T_problem,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_problem_choice, hf_index, ett_ros_T_problem,
NULL);
return offset;
}
@ -672,7 +672,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t Reject_sequence[] = {
static const ber_old_sequence_t Reject_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
{ 0, 0, 0, NULL }
@ -680,8 +680,8 @@ static const ber_sequence_t Reject_sequence[] = {
static int
dissect_ros_Reject(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,
Reject_sequence, hf_index, ett_ros_Reject);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Reject_sequence, hf_index, ett_ros_Reject);
return offset;
}
@ -843,7 +843,7 @@ static const value_string ros_ROS_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ROS_choice[] = {
static const ber_old_choice_t ROS_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@ -859,9 +859,9 @@ static const ber_choice_t ROS_choice[] = {
static int
dissect_ros_ROS(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,
ROS_choice, hf_index, ett_ros_ROS,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ROS_choice, hf_index, ett_ros_ROS,
NULL);
return offset;
}
@ -885,7 +885,7 @@ const value_string ros_Code_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Code_choice[] = {
static const ber_old_choice_t Code_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global },
{ 0, 0, 0, 0, NULL }
@ -893,9 +893,9 @@ static const ber_choice_t Code_choice[] = {
int
dissect_ros_Code(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,
Code_choice, hf_index, ett_ros_Code,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Code_choice, hf_index, ett_ros_Code,
NULL);
return offset;
}

66
epan/dissectors/packet-rtse.c
View File

@ -312,7 +312,7 @@ static const value_string rtse_CallingSSuserReference_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CallingSSuserReference_choice[] = {
static const ber_old_choice_t CallingSSuserReference_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_t61String },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octetString },
{ 0, 0, 0, 0, NULL }
@ -320,9 +320,9 @@ static const ber_choice_t CallingSSuserReference_choice[] = {
static int
dissect_rtse_CallingSSuserReference(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,
CallingSSuserReference_choice, hf_index, ett_rtse_CallingSSuserReference,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CallingSSuserReference_choice, hf_index, ett_rtse_CallingSSuserReference,
NULL);
return offset;
}
@ -366,7 +366,7 @@ static int dissect_additionalReferenceInformation_impl(proto_tree *tree _U_, tvb
}
static const ber_sequence_t SessionConnectionIdentifier_sequence[] = {
static const ber_old_sequence_t SessionConnectionIdentifier_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_callingSSuserReference },
{ BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_commonReference },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalReferenceInformation_impl },
@ -378,8 +378,8 @@ dissect_rtse_SessionConnectionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tv
#line 136 "rtse.cnf"
if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Recover");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SessionConnectionIdentifier_sequence, hf_index, ett_rtse_SessionConnectionIdentifier);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SessionConnectionIdentifier_sequence, hf_index, ett_rtse_SessionConnectionIdentifier);
@ -397,7 +397,7 @@ static const value_string rtse_ConnectionData_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ConnectionData_choice[] = {
static const ber_old_choice_t ConnectionData_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_open },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_recover_impl },
{ 0, 0, 0, 0, NULL }
@ -405,9 +405,9 @@ static const ber_choice_t ConnectionData_choice[] = {
static int
dissect_rtse_ConnectionData(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,
ConnectionData_choice, hf_index, ett_rtse_ConnectionData,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ConnectionData_choice, hf_index, ett_rtse_ConnectionData,
NULL);
return offset;
}
@ -441,7 +441,7 @@ static int dissect_applicationProtocol_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t RTORQapdu_set[] = {
static const ber_old_sequence_t RTORQapdu_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_checkpointSize_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_windowSize_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialogueMode_impl },
@ -457,8 +457,8 @@ dissect_rtse_RTORQapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
if((session = (struct SESSION_DATA_STRUCTURE*)(actx->pinfo->private_data)) != NULL)
session->ros_op = (ROS_OP_BIND | ROS_OP_ARGUMENT);
open_request=TRUE;
offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
RTORQapdu_set, hf_index, ett_rtse_RTORQapdu);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
RTORQapdu_set, hf_index, ett_rtse_RTORQapdu);
open_request=FALSE;
@ -471,7 +471,7 @@ static int dissect_rtorq_apdu_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t RTOACapdu_set[] = {
static const ber_old_sequence_t RTOACapdu_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_checkpointSize_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_windowSize_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_connectionDataAC },
@ -485,8 +485,8 @@ dissect_rtse_RTOACapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
if((session = (struct SESSION_DATA_STRUCTURE*)(actx->pinfo->private_data)) != NULL)
session->ros_op = (ROS_OP_BIND | ROS_OP_RESULT);
offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
RTOACapdu_set, hf_index, ett_rtse_RTOACapdu);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
RTOACapdu_set, hf_index, ett_rtse_RTOACapdu);
@ -557,7 +557,7 @@ static int dissect_userDataRJ(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t RTORJapdu_set[] = {
static const ber_old_sequence_t RTORJapdu_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_refuseReason_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_userDataRJ },
{ 0, 0, 0, NULL }
@ -565,8 +565,8 @@ static const ber_sequence_t RTORJapdu_set[] = {
int
dissect_rtse_RTORJapdu(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(implicit_tag, actx, tree, tvb, offset,
RTORJapdu_set, hf_index, ett_rtse_RTORJapdu);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
RTORJapdu_set, hf_index, ett_rtse_RTORJapdu);
return offset;
}
@ -674,7 +674,7 @@ static int dissect_userdataAB(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t RTABapdu_set[] = {
static const ber_old_sequence_t RTABapdu_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abortReason_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reflectedParameter_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_userdataAB },
@ -683,8 +683,8 @@ static const ber_sequence_t RTABapdu_set[] = {
int
dissect_rtse_RTABapdu(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(implicit_tag, actx, tree, tvb, offset,
RTABapdu_set, hf_index, ett_rtse_RTABapdu);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
RTABapdu_set, hf_index, ett_rtse_RTABapdu);
return offset;
}
@ -703,7 +703,7 @@ static const value_string rtse_RTSE_apdus_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RTSE_apdus_choice[] = {
static const ber_old_choice_t RTSE_apdus_choice[] = {
{ 0, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_rtorq_apdu_impl },
{ 1, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_rtoac_apdu_impl },
{ 2, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_rtorj_apdu_impl },
@ -715,9 +715,9 @@ static const ber_choice_t RTSE_apdus_choice[] = {
static int
dissect_rtse_RTSE_apdus(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,
RTSE_apdus_choice, hf_index, ett_rtse_RTSE_apdus,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RTSE_apdus_choice, hf_index, ett_rtse_RTSE_apdus,
NULL);
return offset;
}
@ -797,7 +797,7 @@ static const value_string rtse_T_encoding_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_encoding_choice[] = {
static const ber_old_choice_t T_encoding_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@ -806,9 +806,9 @@ static const ber_choice_t T_encoding_choice[] = {
static int
dissect_rtse_T_encoding(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_encoding_choice, hf_index, ett_rtse_T_encoding,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_encoding_choice, hf_index, ett_rtse_T_encoding,
NULL);
return offset;
}
@ -817,7 +817,7 @@ static int dissect_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t EXTERNALt_sequence[] = {
static const ber_old_sequence_t EXTERNALt_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
@ -842,7 +842,7 @@ dissect_rtse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
}
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt);

116
epan/dissectors/packet-s4406.c
View File

@ -193,7 +193,7 @@ static const value_string s4406_InformationObject_vals[] = {
{ 0, NULL }
};
static const ber_choice_t InformationObject_choice[] = {
static const ber_old_choice_t InformationObject_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mm_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mn_impl },
{ 0, 0, 0, 0, NULL }
@ -201,9 +201,9 @@ static const ber_choice_t InformationObject_choice[] = {
static int
dissect_s4406_InformationObject(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,
InformationObject_choice, hf_index, ett_s4406_InformationObject,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
InformationObject_choice, hf_index, ett_s4406_InformationObject,
NULL);
return offset;
}
@ -270,14 +270,14 @@ static int dissect_sics_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SEQUENCE_OF_Sic_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Sic_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_sics_item },
};
static int
dissect_s4406_SEQUENCE_OF_Sic(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_Sic_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_Sic);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Sic_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_Sic);
return offset;
}
@ -313,7 +313,7 @@ static int dissect_dist_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t DistributionExtensionField_sequence[] = {
static const ber_old_sequence_t DistributionExtensionField_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_dist_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_dist_value },
{ 0, 0, 0, NULL }
@ -321,8 +321,8 @@ static const ber_sequence_t DistributionExtensionField_sequence[] = {
static int
dissect_s4406_DistributionExtensionField(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,
DistributionExtensionField_sequence, hf_index, ett_s4406_DistributionExtensionField);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DistributionExtensionField_sequence, hf_index, ett_s4406_DistributionExtensionField);
return offset;
}
@ -331,14 +331,14 @@ static int dissect_dist_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t SEQUENCE_OF_DistributionExtensionField_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_DistributionExtensionField_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dist_Extensions_item },
};
static int
dissect_s4406_SEQUENCE_OF_DistributionExtensionField(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_DistributionExtensionField_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_DistributionExtensionField);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_DistributionExtensionField_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_DistributionExtensionField);
return offset;
}
@ -347,7 +347,7 @@ static int dissect_dist_Extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t DistributionCodes_set[] = {
static const ber_old_sequence_t DistributionCodes_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sics_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dist_Extensions_impl },
{ 0, 0, 0, NULL }
@ -355,8 +355,8 @@ static const ber_sequence_t DistributionCodes_set[] = {
static int
dissect_s4406_DistributionCodes(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(implicit_tag, actx, tree, tvb, offset,
DistributionCodes_set, hf_index, ett_s4406_DistributionCodes);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
DistributionCodes_set, hf_index, ett_s4406_DistributionCodes);
return offset;
}
@ -385,27 +385,27 @@ static int dissect_pilotHandling_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t HandlingInstructions_sequence_of[1] = {
static const ber_old_sequence_t HandlingInstructions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_HandlingInstructions_item },
};
static int
dissect_s4406_HandlingInstructions(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,
HandlingInstructions_sequence_of, hf_index, ett_s4406_HandlingInstructions);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
HandlingInstructions_sequence_of, hf_index, ett_s4406_HandlingInstructions);
return offset;
}
static const ber_sequence_t MessageInstructions_sequence_of[1] = {
static const ber_old_sequence_t MessageInstructions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_MessageInstructions_item },
};
static int
dissect_s4406_MessageInstructions(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,
MessageInstructions_sequence_of, hf_index, ett_s4406_MessageInstructions);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
MessageInstructions_sequence_of, hf_index, ett_s4406_MessageInstructions);
return offset;
}
@ -522,7 +522,7 @@ static int dissect_identifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t MessageType_set[] = {
static const ber_old_sequence_t MessageType_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_type_type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_identifier_impl },
{ 0, 0, 0, NULL }
@ -530,8 +530,8 @@ static const ber_sequence_t MessageType_set[] = {
static int
dissect_s4406_MessageType(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(implicit_tag, actx, tree, tvb, offset,
MessageType_set, hf_index, ett_s4406_MessageType);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
MessageType_set, hf_index, ett_s4406_MessageType);
return offset;
}
@ -579,7 +579,7 @@ static int dissect_replyRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t AddressListDesignator_set[] = {
static const ber_old_sequence_t AddressListDesignator_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address_list_type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listName_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationRequest_impl },
@ -589,8 +589,8 @@ static const ber_sequence_t AddressListDesignator_set[] = {
static int
dissect_s4406_AddressListDesignator(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(implicit_tag, actx, tree, tvb, offset,
AddressListDesignator_set, hf_index, ett_s4406_AddressListDesignator);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
AddressListDesignator_set, hf_index, ett_s4406_AddressListDesignator);
return offset;
}
@ -599,14 +599,14 @@ static int dissect_AddressListDesignatorSeq_item(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t AddressListDesignatorSeq_sequence_of[1] = {
static const ber_old_sequence_t AddressListDesignatorSeq_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_AddressListDesignatorSeq_item },
};
static int
dissect_s4406_AddressListDesignatorSeq(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,
AddressListDesignatorSeq_sequence_of, hf_index, ett_s4406_AddressListDesignatorSeq);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AddressListDesignatorSeq_sequence_of, hf_index, ett_s4406_AddressListDesignatorSeq);
return offset;
}
@ -631,7 +631,7 @@ static int dissect_other_recipient_type_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t OtherRecipientDesignator_set[] = {
static const ber_old_sequence_t OtherRecipientDesignator_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_other_recipient_type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_designator_impl },
{ 0, 0, 0, NULL }
@ -639,8 +639,8 @@ static const ber_sequence_t OtherRecipientDesignator_set[] = {
static int
dissect_s4406_OtherRecipientDesignator(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(implicit_tag, actx, tree, tvb, offset,
OtherRecipientDesignator_set, hf_index, ett_s4406_OtherRecipientDesignator);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
OtherRecipientDesignator_set, hf_index, ett_s4406_OtherRecipientDesignator);
return offset;
}
@ -649,14 +649,14 @@ static int dissect_OtherRecipientDesignatorSeq_item(proto_tree *tree _U_, tvbuff
}
static const ber_sequence_t OtherRecipientDesignatorSeq_sequence_of[1] = {
static const ber_old_sequence_t OtherRecipientDesignatorSeq_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_OtherRecipientDesignatorSeq_item },
};
static int
dissect_s4406_OtherRecipientDesignatorSeq(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,
OtherRecipientDesignatorSeq_sequence_of, hf_index, ett_s4406_OtherRecipientDesignatorSeq);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
OtherRecipientDesignatorSeq_sequence_of, hf_index, ett_s4406_OtherRecipientDesignatorSeq);
return offset;
}
@ -688,14 +688,14 @@ static int dissect_pilotPrecedence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t SEQUENCE_OF_ORDescriptor_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_ORDescriptor_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_pilotRecipient_item },
};
static int
dissect_s4406_SEQUENCE_OF_ORDescriptor(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_ORDescriptor_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_ORDescriptor);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_ORDescriptor_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_ORDescriptor);
return offset;
}
@ -704,14 +704,14 @@ static int dissect_pilotRecipient_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t SEQUENCE_OF_MilitaryString_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_MilitaryString_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_pilotHandling_item },
};
static int
dissect_s4406_SEQUENCE_OF_MilitaryString(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_MilitaryString_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_MilitaryString);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_MilitaryString_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_MilitaryString);
return offset;
}
@ -720,7 +720,7 @@ static int dissect_pilotHandling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t PilotInformation_sequence[] = {
static const ber_old_sequence_t PilotInformation_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotPrecedence_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotRecipient_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotSecurity_impl },
@ -730,8 +730,8 @@ static const ber_sequence_t PilotInformation_sequence[] = {
static int
dissect_s4406_PilotInformation(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,
PilotInformation_sequence, hf_index, ett_s4406_PilotInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PilotInformation_sequence, hf_index, ett_s4406_PilotInformation);
return offset;
}
@ -740,14 +740,14 @@ static int dissect_PilotInformationSeq_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PilotInformationSeq_sequence_of[1] = {
static const ber_old_sequence_t PilotInformationSeq_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PilotInformationSeq_item },
};
static int
dissect_s4406_PilotInformationSeq(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,
PilotInformationSeq_sequence_of, hf_index, ett_s4406_PilotInformationSeq);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PilotInformationSeq_sequence_of, hf_index, ett_s4406_PilotInformationSeq);
return offset;
}
@ -801,7 +801,7 @@ static int dissect_body_part_sequence_number_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t BodyPartSecurityLabel_set[] = {
static const ber_old_sequence_t BodyPartSecurityLabel_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_body_part_security_label_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_sequence_number_impl },
{ 0, 0, 0, NULL }
@ -809,8 +809,8 @@ static const ber_sequence_t BodyPartSecurityLabel_set[] = {
static int
dissect_s4406_BodyPartSecurityLabel(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(implicit_tag, actx, tree, tvb, offset,
BodyPartSecurityLabel_set, hf_index, ett_s4406_BodyPartSecurityLabel);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
BodyPartSecurityLabel_set, hf_index, ett_s4406_BodyPartSecurityLabel);
return offset;
}
@ -819,14 +819,14 @@ static int dissect_body_part_security_labels_item(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_body_part_security_labels_item },
};
static int
dissect_s4406_SEQUENCE_OF_BodyPartSecurityLabel(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_BodyPartSecurityLabel_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_BodyPartSecurityLabel_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel);
return offset;
}
@ -835,7 +835,7 @@ static int dissect_body_part_security_labels_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t SecurityInformationLabels_sequence[] = {
static const ber_old_sequence_t SecurityInformationLabels_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_content_security_label_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_heading_security_label_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_security_labels_impl },
@ -844,8 +844,8 @@ static const ber_sequence_t SecurityInformationLabels_sequence[] = {
static int
dissect_s4406_SecurityInformationLabels(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,
SecurityInformationLabels_sequence, hf_index, ett_s4406_SecurityInformationLabels);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SecurityInformationLabels_sequence, hf_index, ett_s4406_SecurityInformationLabels);
return offset;
}

68
epan/dissectors/packet-smrse.c
View File

@ -220,16 +220,16 @@ static const value_string smrse_T_address_value_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_address_value_choice[] = {
static const ber_old_choice_t T_address_value_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_format },
{ 0, 0, 0, 0, NULL }
};
static int
dissect_smrse_T_address_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_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
T_address_value_choice, hf_index, ett_smrse_T_address_value,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_address_value_choice, hf_index, ett_smrse_T_address_value,
NULL);
return offset;
}
@ -238,7 +238,7 @@ static int dissect_address_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SMS_Address_sequence[] = {
static const ber_old_sequence_t SMS_Address_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_address_type },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numbering_plan },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value },
@ -247,8 +247,8 @@ static const ber_sequence_t SMS_Address_sequence[] = {
static int
dissect_smrse_SMS_Address(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,
SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
return offset;
}
@ -292,7 +292,7 @@ static int dissect_password(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t SMR_Bind_sequence[] = {
static const ber_old_sequence_t SMR_Bind_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sc_address },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_password },
{ 0, 0, 0, NULL }
@ -300,8 +300,8 @@ static const ber_sequence_t SMR_Bind_sequence[] = {
static int
dissect_smrse_SMR_Bind(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,
SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
return offset;
}
@ -320,14 +320,14 @@ static int dissect_moimsi_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SMR_Bind_Confirm_sequence[] = {
static const ber_old_sequence_t SMR_Bind_Confirm_sequence[] = {
{ 0, 0, 0, NULL }
};
static int
dissect_smrse_SMR_Bind_Confirm(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,
SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
return offset;
}
@ -356,28 +356,28 @@ static int dissect_connect_fail_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t SMR_Bind_Failure_sequence[] = {
static const ber_old_sequence_t SMR_Bind_Failure_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason },
{ 0, 0, 0, NULL }
};
static int
dissect_smrse_SMR_Bind_Failure(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,
SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
return offset;
}
static const ber_sequence_t SMR_Unbind_sequence[] = {
static const ber_old_sequence_t SMR_Unbind_sequence[] = {
{ 0, 0, 0, NULL }
};
static int
dissect_smrse_SMR_Unbind(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,
SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
return offset;
}
@ -452,7 +452,7 @@ static int dissect_mt_tariffClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t RPDataMT_sequence[] = {
static const ber_old_sequence_t RPDataMT_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_priority_request },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_mms },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mt_message_reference },
@ -466,14 +466,14 @@ static const ber_sequence_t RPDataMT_sequence[] = {
static int
dissect_smrse_RPDataMT(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,
RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
return offset;
}
static const ber_sequence_t RPDataMO_sequence[] = {
static const ber_old_sequence_t RPDataMO_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mo_message_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mo_originating_address },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mo_user_data },
@ -484,22 +484,22 @@ static const ber_sequence_t RPDataMO_sequence[] = {
static int
dissect_smrse_RPDataMO(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,
RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
return offset;
}
static const ber_sequence_t RPAck_sequence[] = {
static const ber_old_sequence_t RPAck_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
{ 0, 0, 0, NULL }
};
static int
dissect_smrse_RPAck(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,
RPAck_sequence, hf_index, ett_smrse_RPAck);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RPAck_sequence, hf_index, ett_smrse_RPAck);
return offset;
}
@ -541,7 +541,7 @@ static int dissect_error_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t RPError_sequence[] = {
static const ber_old_sequence_t RPError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_reason },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_msg_waiting_set },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
@ -552,14 +552,14 @@ static const ber_sequence_t RPError_sequence[] = {
static int
dissect_smrse_RPError(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,
RPError_sequence, hf_index, ett_smrse_RPError);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RPError_sequence, hf_index, ett_smrse_RPError);
return offset;
}
static const ber_sequence_t RPAlertSC_sequence[] = {
static const ber_old_sequence_t RPAlertSC_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ms_address },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
{ 0, 0, 0, NULL }
@ -567,8 +567,8 @@ static const ber_sequence_t RPAlertSC_sequence[] = {
static int
dissect_smrse_RPAlertSC(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,
RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
return offset;
}

166
epan/dissectors/packet-snmp.c
View File

@ -1737,7 +1737,7 @@ static const value_string snmp_SimpleSyntax_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SimpleSyntax_choice[] = {
static const ber_old_choice_t SimpleSyntax_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_integer_value },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_string_value },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_objectID_value },
@ -1747,9 +1747,9 @@ static const ber_choice_t SimpleSyntax_choice[] = {
static int
dissect_snmp_SimpleSyntax(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,
SimpleSyntax_choice, hf_index, ett_snmp_SimpleSyntax,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SimpleSyntax_choice, hf_index, ett_snmp_SimpleSyntax,
NULL);
return offset;
}
@ -1849,7 +1849,7 @@ static const value_string snmp_ApplicationSyntax_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ApplicationSyntax_choice[] = {
static const ber_old_choice_t ApplicationSyntax_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_ipAddress_value },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_counter_value },
{ 3, BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_timeticks_value },
@ -1861,9 +1861,9 @@ static const ber_choice_t ApplicationSyntax_choice[] = {
static int
dissect_snmp_ApplicationSyntax(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,
ApplicationSyntax_choice, hf_index, ett_snmp_ApplicationSyntax,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ApplicationSyntax_choice, hf_index, ett_snmp_ApplicationSyntax,
NULL);
return offset;
}
@ -1878,7 +1878,7 @@ static const value_string snmp_ObjectSyntax_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ObjectSyntax_choice[] = {
static const ber_old_choice_t ObjectSyntax_choice[] = {
{ -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_simple },
{ -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_application_wide },
{ 0, 0, 0, 0, NULL }
@ -1886,9 +1886,9 @@ static const ber_choice_t ObjectSyntax_choice[] = {
static int
dissect_snmp_ObjectSyntax(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,
ObjectSyntax_choice, hf_index, ett_snmp_ObjectSyntax,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ObjectSyntax_choice, hf_index, ett_snmp_ObjectSyntax,
NULL);
return offset;
}
@ -1959,16 +1959,16 @@ static const value_string snmp_NetworkAddress_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NetworkAddress_choice[] = {
static const ber_old_choice_t NetworkAddress_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_internet },
{ 0, 0, 0, 0, NULL }
};
static int
dissect_snmp_NetworkAddress(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,
NetworkAddress_choice, hf_index, ett_snmp_NetworkAddress,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NetworkAddress_choice, hf_index, ett_snmp_NetworkAddress,
NULL);
return offset;
}
@ -2135,7 +2135,7 @@ static const value_string snmp_ValueType_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ValueType_choice[] = {
static const ber_old_choice_t ValueType_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_value },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unSpecified },
{ 2, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_noSuchObject_impl },
@ -2146,9 +2146,9 @@ static const ber_choice_t ValueType_choice[] = {
static int
dissect_snmp_ValueType(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,
ValueType_choice, hf_index, ett_snmp_ValueType,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ValueType_choice, hf_index, ett_snmp_ValueType,
NULL);
return offset;
}
@ -2157,7 +2157,7 @@ static int dissect_valueType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t VarBind_sequence[] = {
static const ber_old_sequence_t VarBind_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_name },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_valueType },
{ 0, 0, 0, NULL }
@ -2168,8 +2168,8 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
#line 323 "snmp.cnf"
oid_tvb = NULL;
value_tvb = NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
VarBind_sequence, hf_index, ett_snmp_VarBind);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
VarBind_sequence, hf_index, ett_snmp_VarBind);
if (oid_tvb && value_tvb) {
next_tvb_add_string(&var_list, value_tvb, (snmp_var_in_tree) ? tree : NULL,
@ -2186,14 +2186,14 @@ static int dissect_VarBindList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t VarBindList_sequence_of[1] = {
static const ber_old_sequence_t VarBindList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_VarBindList_item },
};
static int
dissect_snmp_VarBindList(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,
VarBindList_sequence_of, hf_index, ett_snmp_VarBindList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
VarBindList_sequence_of, hf_index, ett_snmp_VarBindList);
return offset;
}
@ -2202,7 +2202,7 @@ static int dissect_variable_bindings(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t PDU_sequence[] = {
static const ber_old_sequence_t PDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_request_id },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_status },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_index },
@ -2212,8 +2212,8 @@ static const ber_sequence_t PDU_sequence[] = {
static int
dissect_snmp_PDU(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,
PDU_sequence, hf_index, ett_snmp_PDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PDU_sequence, hf_index, ett_snmp_PDU);
return offset;
}
@ -2371,7 +2371,7 @@ static int dissect_generic_trap(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t Trap_PDU_sequence[] = {
static const ber_old_sequence_t Trap_PDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_enterprise },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_agent_addr },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_generic_trap },
@ -2383,8 +2383,8 @@ static const ber_sequence_t Trap_PDU_sequence[] = {
static int
dissect_snmp_Trap_PDU(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,
Trap_PDU_sequence, hf_index, ett_snmp_Trap_PDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Trap_PDU_sequence, hf_index, ett_snmp_Trap_PDU);
return offset;
}
@ -2436,7 +2436,7 @@ static int dissect_max_repetitions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t BulkPDU_sequence[] = {
static const ber_old_sequence_t BulkPDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_bulkPDU_request_id },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_non_repeaters },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max_repetitions },
@ -2446,8 +2446,8 @@ static const ber_sequence_t BulkPDU_sequence[] = {
static int
dissect_snmp_BulkPDU(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,
BulkPDU_sequence, hf_index, ett_snmp_BulkPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BulkPDU_sequence, hf_index, ett_snmp_BulkPDU);
return offset;
}
@ -2610,7 +2610,7 @@ static const value_string snmp_PDUs_vals[] = {
{ 0, NULL }
};
static const ber_choice_t PDUs_choice[] = {
static const ber_old_choice_t PDUs_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_NOOWNTAG, dissect_get_request },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_NOOWNTAG, dissect_get_next_request },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_NOOWNTAG, dissect_get_response },
@ -2628,9 +2628,9 @@ dissect_snmp_PDUs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
#line 30 "snmp.cnf"
gint pdu_type;
offset = dissect_ber_choice(actx, tree, tvb, offset,
PDUs_choice, hf_index, ett_snmp_PDUs,
&pdu_type);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
PDUs_choice, hf_index, ett_snmp_PDUs,
&pdu_type);
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str(pdu_type, snmp_PDUs_vals,"Unknown PDU type (%u)"));
@ -2650,7 +2650,7 @@ static int dissect_pDUs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t Message_sequence[] = {
static const ber_old_sequence_t Message_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_community },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_data },
@ -2659,8 +2659,8 @@ static const ber_sequence_t Message_sequence[] = {
static int
dissect_snmp_Message(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,
Message_sequence, hf_index, ett_snmp_Message);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Message_sequence, hf_index, ett_snmp_Message);
return offset;
}
@ -2672,7 +2672,7 @@ static const value_string snmp_T_datav2u_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_datav2u_choice[] = {
static const ber_old_choice_t T_datav2u_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_v2u_plaintext },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
{ 0, 0, 0, 0, NULL }
@ -2680,9 +2680,9 @@ static const ber_choice_t T_datav2u_choice[] = {
static int
dissect_snmp_T_datav2u(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_datav2u_choice, hf_index, ett_snmp_T_datav2u,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_datav2u_choice, hf_index, ett_snmp_T_datav2u,
NULL);
return offset;
}
@ -2691,7 +2691,7 @@ static int dissect_datav2u(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t Messagev2u_sequence[] = {
static const ber_old_sequence_t Messagev2u_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_parameters },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_datav2u },
@ -2700,8 +2700,8 @@ static const ber_sequence_t Messagev2u_sequence[] = {
static int
dissect_snmp_Messagev2u(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,
Messagev2u_sequence, hf_index, ett_snmp_Messagev2u);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Messagev2u_sequence, hf_index, ett_snmp_Messagev2u);
return offset;
}
@ -2800,7 +2800,7 @@ static int dissect_msgPrivacyParameters(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t UsmSecurityParameters_sequence[] = {
static const ber_old_sequence_t UsmSecurityParameters_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineID },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineBoots },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineTime },
@ -2812,8 +2812,8 @@ static const ber_sequence_t UsmSecurityParameters_sequence[] = {
static int
dissect_snmp_UsmSecurityParameters(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,
UsmSecurityParameters_sequence, hf_index, ett_snmp_UsmSecurityParameters);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UsmSecurityParameters_sequence, hf_index, ett_snmp_UsmSecurityParameters);
return offset;
}
@ -2875,7 +2875,7 @@ static int dissect_msgSecurityModel(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t HeaderData_sequence[] = {
static const ber_old_sequence_t HeaderData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgID },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgMaxSize },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgFlags },
@ -2885,8 +2885,8 @@ static const ber_sequence_t HeaderData_sequence[] = {
static int
dissect_snmp_HeaderData(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,
HeaderData_sequence, hf_index, ett_snmp_HeaderData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
HeaderData_sequence, hf_index, ett_snmp_HeaderData);
return offset;
}
@ -2924,7 +2924,7 @@ static int dissect_msgSecurityParameters(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t ScopedPDU_sequence[] = {
static const ber_old_sequence_t ScopedPDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_contextEngineID },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_contextName },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_data },
@ -2933,8 +2933,8 @@ static const ber_sequence_t ScopedPDU_sequence[] = {
static int
dissect_snmp_ScopedPDU(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,
ScopedPDU_sequence, hf_index, ett_snmp_ScopedPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ScopedPDU_sequence, hf_index, ett_snmp_ScopedPDU);
return offset;
}
@ -3004,7 +3004,7 @@ static const value_string snmp_ScopedPduData_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ScopedPduData_choice[] = {
static const ber_old_choice_t ScopedPduData_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_plaintext },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedPDU },
{ 0, 0, 0, 0, NULL }
@ -3012,9 +3012,9 @@ static const ber_choice_t ScopedPduData_choice[] = {
static int
dissect_snmp_ScopedPduData(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,
ScopedPduData_choice, hf_index, ett_snmp_ScopedPduData,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ScopedPduData_choice, hf_index, ett_snmp_ScopedPduData,
NULL);
return offset;
}
@ -3023,7 +3023,7 @@ static int dissect_msgData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t SNMPv3Message_sequence[] = {
static const ber_old_sequence_t SNMPv3Message_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgVersion },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_msgGlobalData },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgSecurityParameters },
@ -3033,8 +3033,8 @@ static const ber_sequence_t SNMPv3Message_sequence[] = {
static int
dissect_snmp_SNMPv3Message(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,
SNMPv3Message_sequence, hf_index, ett_snmp_SNMPv3Message);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SNMPv3Message_sequence, hf_index, ett_snmp_SNMPv3Message);
#line 265 "snmp.cnf"
@ -3110,7 +3110,7 @@ static int dissect_description(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SimpleOpen_sequence[] = {
static const ber_old_sequence_t SimpleOpen_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_smux_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_identity },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_description },
@ -3120,8 +3120,8 @@ static const ber_sequence_t SimpleOpen_sequence[] = {
static int
dissect_snmp_SimpleOpen(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,
SimpleOpen_sequence, hf_index, ett_snmp_SimpleOpen);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SimpleOpen_sequence, hf_index, ett_snmp_SimpleOpen);
return offset;
}
@ -3135,16 +3135,16 @@ static const value_string snmp_OpenPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OpenPDU_choice[] = {
static const ber_old_choice_t OpenPDU_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_smux_simple },
{ 0, 0, 0, 0, NULL }
};
static int
dissect_snmp_OpenPDU(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,
OpenPDU_choice, hf_index, ett_snmp_OpenPDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OpenPDU_choice, hf_index, ett_snmp_OpenPDU,
NULL);
return offset;
}
@ -3209,7 +3209,7 @@ static int dissect_operation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t RReqPDU_sequence[] = {
static const ber_old_sequence_t RReqPDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subtree },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_priority },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_operation },
@ -3218,8 +3218,8 @@ static const ber_sequence_t RReqPDU_sequence[] = {
static int
dissect_snmp_RReqPDU(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,
RReqPDU_sequence, hf_index, ett_snmp_RReqPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RReqPDU_sequence, hf_index, ett_snmp_RReqPDU);
return offset;
}
@ -3252,7 +3252,7 @@ static const value_string snmp_RegisterResponse_vals[] = {
{ 0, NULL }
};
static const ber_choice_t RegisterResponse_choice[] = {
static const ber_old_choice_t RegisterResponse_choice[] = {
{ 0, BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_rRspPDU },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_pDUs },
{ 0, 0, 0, 0, NULL }
@ -3260,9 +3260,9 @@ static const ber_choice_t RegisterResponse_choice[] = {
static int
dissect_snmp_RegisterResponse(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,
RegisterResponse_choice, hf_index, ett_snmp_RegisterResponse,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
RegisterResponse_choice, hf_index, ett_snmp_RegisterResponse,
NULL);
return offset;
}
@ -3299,7 +3299,7 @@ static const value_string snmp_SMUX_PDUs_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SMUX_PDUs_choice[] = {
static const ber_old_choice_t SMUX_PDUs_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_open },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_close },
{ 2, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_registerRequest },
@ -3310,9 +3310,9 @@ static const ber_choice_t SMUX_PDUs_choice[] = {
static int
dissect_snmp_SMUX_PDUs(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,
SMUX_PDUs_choice, hf_index, ett_snmp_SMUX_PDUs,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SMUX_PDUs_choice, hf_index, ett_snmp_SMUX_PDUs,
NULL);
return offset;
}

38
epan/dissectors/packet-spnego.c
View File

@ -193,7 +193,7 @@ static int dissect_thisMech(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t MechTypeList_sequence_of[1] = {
static const ber_old_sequence_t MechTypeList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_MechTypeList_item },
};
@ -205,8 +205,8 @@ dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
saw_mechanism = FALSE;
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
MechTypeList_sequence_of, hf_index, ett_spnego_MechTypeList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
MechTypeList_sequence_of, hf_index, ett_spnego_MechTypeList);
/*
@ -338,7 +338,7 @@ static int dissect_negTokenInit_mechListMIC(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t NegTokenInit_sequence[] = {
static const ber_old_sequence_t NegTokenInit_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mechTypes },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_reqFlags },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mechToken },
@ -348,8 +348,8 @@ static const ber_sequence_t NegTokenInit_sequence[] = {
static int
dissect_spnego_NegTokenInit(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,
NegTokenInit_sequence, hf_index, ett_spnego_NegTokenInit);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NegTokenInit_sequence, hf_index, ett_spnego_NegTokenInit);
return offset;
}
@ -491,7 +491,7 @@ static int dissect_mechListMIC(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t NegTokenTarg_sequence[] = {
static const ber_old_sequence_t NegTokenTarg_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_negResult },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_supportedMech },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_responseToken },
@ -501,8 +501,8 @@ static const ber_sequence_t NegTokenTarg_sequence[] = {
static int
dissect_spnego_NegTokenTarg(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,
NegTokenTarg_sequence, hf_index, ett_spnego_NegTokenTarg);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NegTokenTarg_sequence, hf_index, ett_spnego_NegTokenTarg);
return offset;
}
@ -517,7 +517,7 @@ static const value_string spnego_NegotiationToken_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NegotiationToken_choice[] = {
static const ber_old_choice_t NegotiationToken_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_negTokenInit },
{ 1, BER_CLASS_CON, 1, 0, dissect_negTokenTarg },
{ 0, 0, 0, 0, NULL }
@ -525,9 +525,9 @@ static const ber_choice_t NegotiationToken_choice[] = {
static int
dissect_spnego_NegotiationToken(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,
NegotiationToken_choice, hf_index, ett_spnego_NegotiationToken,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NegotiationToken_choice, hf_index, ett_spnego_NegotiationToken,
NULL);
return offset;
}
@ -547,15 +547,15 @@ static int dissect_principal(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PrincipalSeq_sequence[] = {
static const ber_old_sequence_t PrincipalSeq_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_principal },
{ 0, 0, 0, NULL }
};
static int
dissect_spnego_PrincipalSeq(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,
PrincipalSeq_sequence, hf_index, ett_spnego_PrincipalSeq);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PrincipalSeq_sequence, hf_index, ett_spnego_PrincipalSeq);
return offset;
}
@ -616,7 +616,7 @@ static int dissect_innerContextToken(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t InitialContextToken_sequence[] = {
static const ber_old_sequence_t InitialContextToken_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_thisMech },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_innerContextToken },
{ 0, 0, 0, NULL }
@ -624,8 +624,8 @@ static const ber_sequence_t InitialContextToken_sequence[] = {
static int
dissect_spnego_InitialContextToken(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,
InitialContextToken_sequence, hf_index, ett_spnego_InitialContextToken);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InitialContextToken_sequence, hf_index, ett_spnego_InitialContextToken);
return offset;
}

308
epan/dissectors/packet-tcap.c
View File

@ -407,7 +407,7 @@ static int dissect_user_information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t AARQ_apdu_sequence[] = {
static const ber_old_sequence_t AARQ_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_versionrq_impl },
{ BER_CLASS_CON, 1, 0, dissect_application_context_name },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
@ -416,8 +416,8 @@ static const ber_sequence_t AARQ_apdu_sequence[] = {
static int
dissect_tcap_AARQ_apdu(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,
AARQ_apdu_sequence, hf_index, ett_tcap_AARQ_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AARQ_apdu_sequence, hf_index, ett_tcap_AARQ_apdu);
return offset;
}
@ -509,7 +509,7 @@ static const value_string tcap_Associate_source_diagnostic_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Associate_source_diagnostic_choice[] = {
static const ber_old_choice_t Associate_source_diagnostic_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_dialogue_service_user },
{ 2, BER_CLASS_CON, 2, 0, dissect_dialogue_service_provider },
{ 0, 0, 0, 0, NULL }
@ -517,9 +517,9 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = {
static int
dissect_tcap_Associate_source_diagnostic(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,
Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic,
NULL);
return offset;
}
@ -528,7 +528,7 @@ static int dissect_result_source_diagnostic(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t AARE_apdu_sequence[] = {
static const ber_old_sequence_t AARE_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_versionre_impl },
{ BER_CLASS_CON, 1, 0, dissect_application_context_name },
{ BER_CLASS_CON, 2, 0, dissect_result },
@ -539,8 +539,8 @@ static const ber_sequence_t AARE_apdu_sequence[] = {
static int
dissect_tcap_AARE_apdu(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,
AARE_apdu_sequence, hf_index, ett_tcap_AARE_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AARE_apdu_sequence, hf_index, ett_tcap_AARE_apdu);
return offset;
}
@ -568,7 +568,7 @@ static int dissect_abort_source_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t ABRT_apdu_sequence[] = {
static const ber_old_sequence_t ABRT_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abort_source_impl },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
{ 0, 0, 0, NULL }
@ -576,8 +576,8 @@ static const ber_sequence_t ABRT_apdu_sequence[] = {
static int
dissect_tcap_ABRT_apdu(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,
ABRT_apdu_sequence, hf_index, ett_tcap_ABRT_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ABRT_apdu_sequence, hf_index, ett_tcap_ABRT_apdu);
return offset;
}
@ -593,7 +593,7 @@ const value_string tcap_DialoguePDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DialoguePDU_choice[] = {
static const ber_old_choice_t DialoguePDU_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_dialogueRequest },
{ 1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_dialogueResponse },
{ 4, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_dialogueAbort },
@ -602,9 +602,9 @@ static const ber_choice_t DialoguePDU_choice[] = {
int
dissect_tcap_DialoguePDU(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,
DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU,
NULL);
return offset;
}
@ -658,7 +658,7 @@ static int dissect_dialog_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t ExternalPDU_sequence[] = {
static const ber_old_sequence_t ExternalPDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_oid },
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dialog_impl },
{ 0, 0, 0, NULL }
@ -675,8 +675,8 @@ gint8 class;
/* Workaround for tagged fields */
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind_field);
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ExternalPDU_sequence, hf_index, ett_tcap_ExternalPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ExternalPDU_sequence, hf_index, ett_tcap_ExternalPDU);
@ -712,7 +712,7 @@ static int dissect_externuserinfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t UserInformation_sequence[] = {
static const ber_old_sequence_t UserInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_useroid },
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_externuserinfo_impl },
{ 0, 0, 0, NULL }
@ -720,8 +720,8 @@ static const ber_sequence_t UserInformation_sequence[] = {
static int
dissect_tcap_UserInformation(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,
UserInformation_sequence, hf_index, ett_tcap_UserInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UserInformation_sequence, hf_index, ett_tcap_UserInformation);
return offset;
}
@ -750,7 +750,7 @@ static int dissect_reasonrq_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t RLRQ_apdu_sequence[] = {
static const ber_old_sequence_t RLRQ_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasonrq_impl },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
{ 0, 0, 0, NULL }
@ -758,8 +758,8 @@ static const ber_sequence_t RLRQ_apdu_sequence[] = {
static int
dissect_tcap_RLRQ_apdu(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,
RLRQ_apdu_sequence, hf_index, ett_tcap_RLRQ_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RLRQ_apdu_sequence, hf_index, ett_tcap_RLRQ_apdu);
return offset;
}
@ -785,7 +785,7 @@ static int dissect_reasonre_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t RLRE_apdu_sequence[] = {
static const ber_old_sequence_t RLRE_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasonre_impl },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
{ 0, 0, 0, NULL }
@ -793,8 +793,8 @@ static const ber_sequence_t RLRE_apdu_sequence[] = {
static int
dissect_tcap_RLRE_apdu(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,
RLRE_apdu_sequence, hf_index, ett_tcap_RLRE_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RLRE_apdu_sequence, hf_index, ett_tcap_RLRE_apdu);
return offset;
}
@ -818,7 +818,7 @@ static int dissect_protocol_version3_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t AUDT_apdu_sequence[] = {
static const ber_old_sequence_t AUDT_apdu_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version3_impl },
{ BER_CLASS_CON, 1, 0, dissect_application_context_name },
{ BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
@ -827,8 +827,8 @@ static const ber_sequence_t AUDT_apdu_sequence[] = {
static int
dissect_tcap_AUDT_apdu(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,
AUDT_apdu_sequence, hf_index, ett_tcap_AUDT_apdu);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AUDT_apdu_sequence, hf_index, ett_tcap_AUDT_apdu);
return offset;
}
@ -842,16 +842,16 @@ const value_string tcap_UniDialoguePDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t UniDialoguePDU_choice[] = {
static const ber_old_choice_t UniDialoguePDU_choice[] = {
{ 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_unidialoguePDU },
{ 0, 0, 0, 0, NULL }
};
int
dissect_tcap_UniDialoguePDU(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,
UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU,
NULL);
return offset;
}
@ -953,7 +953,7 @@ static const value_string tcap_OPERATION_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OPERATION_choice[] = {
static const ber_old_choice_t OPERATION_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
{ 0, 0, 0, 0, NULL }
@ -961,9 +961,9 @@ static const ber_choice_t OPERATION_choice[] = {
static int
dissect_tcap_OPERATION(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,
OPERATION_choice, hf_index, ett_tcap_OPERATION,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OPERATION_choice, hf_index, ett_tcap_OPERATION,
NULL);
return offset;
}
@ -1004,7 +1004,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Invoke_sequence[] = {
static const ber_old_sequence_t Invoke_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@ -1014,8 +1014,8 @@ static const ber_sequence_t Invoke_sequence[] = {
static int
dissect_tcap_Invoke(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,
Invoke_sequence, hf_index, ett_tcap_Invoke);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Invoke_sequence, hf_index, ett_tcap_Invoke);
return offset;
}
@ -1024,7 +1024,7 @@ static int dissect_invoke_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t T_resultretres_sequence[] = {
static const ber_old_sequence_t T_resultretres_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
{ 0, 0, 0, NULL }
@ -1032,8 +1032,8 @@ static const ber_sequence_t T_resultretres_sequence[] = {
static int
dissect_tcap_T_resultretres(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_resultretres_sequence, hf_index, ett_tcap_T_resultretres);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_resultretres_sequence, hf_index, ett_tcap_T_resultretres);
return offset;
}
@ -1042,7 +1042,7 @@ static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t ReturnResult_sequence[] = {
static const ber_old_sequence_t ReturnResult_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
{ 0, 0, 0, NULL }
@ -1050,8 +1050,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
static int
dissect_tcap_ReturnResult(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,
ReturnResult_sequence, hf_index, ett_tcap_ReturnResult);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResult_sequence, hf_index, ett_tcap_ReturnResult);
return offset;
}
@ -1085,7 +1085,7 @@ static const value_string tcap_ErrorCode_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ErrorCode_choice[] = {
static const ber_old_choice_t ErrorCode_choice[] = {
{ 19, BER_CLASS_PRI, 19, BER_FLAGS_IMPLTAG, dissect_nationaler_impl },
{ 20, BER_CLASS_PRI, 20, BER_FLAGS_IMPLTAG, dissect_privateer_impl },
{ 0, 0, 0, 0, NULL }
@ -1093,9 +1093,9 @@ static const ber_choice_t ErrorCode_choice[] = {
static int
dissect_tcap_ErrorCode(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,
ErrorCode_choice, hf_index, ett_tcap_ErrorCode,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ErrorCode_choice, hf_index, ett_tcap_ErrorCode,
NULL);
return offset;
}
@ -1104,7 +1104,7 @@ static int dissect_errorCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ReturnError_sequence[] = {
static const ber_old_sequence_t ReturnError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@ -1113,8 +1113,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
static int
dissect_tcap_ReturnError(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,
ReturnError_sequence, hf_index, ett_tcap_ReturnError);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnError_sequence, hf_index, ett_tcap_ReturnError);
return offset;
}
@ -1141,7 +1141,7 @@ static const value_string tcap_T_invokeIDRej_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_invokeIDRej_choice[] = {
static const ber_old_choice_t T_invokeIDRej_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
{ 0, 0, 0, 0, NULL }
@ -1149,9 +1149,9 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
static int
dissect_tcap_T_invokeIDRej(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_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej,
NULL);
return offset;
}
@ -1255,7 +1255,7 @@ static const value_string tcap_T_problem_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_problem_choice[] = {
static const ber_old_choice_t T_problem_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@ -1265,9 +1265,9 @@ static const ber_choice_t T_problem_choice[] = {
static int
dissect_tcap_T_problem(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_problem_choice, hf_index, ett_tcap_T_problem,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_problem_choice, hf_index, ett_tcap_T_problem,
NULL);
return offset;
}
@ -1276,7 +1276,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t Reject_sequence[] = {
static const ber_old_sequence_t Reject_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
{ 0, 0, 0, NULL }
@ -1284,8 +1284,8 @@ static const ber_sequence_t Reject_sequence[] = {
static int
dissect_tcap_Reject(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,
Reject_sequence, hf_index, ett_tcap_Reject);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Reject_sequence, hf_index, ett_tcap_Reject);
return offset;
}
@ -1303,7 +1303,7 @@ static const value_string tcap_Component_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Component_choice[] = {
static const ber_old_choice_t Component_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@ -1326,14 +1326,14 @@ static int dissect_ComponentPortion_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t ComponentPortion_sequence_of[1] = {
static const ber_old_sequence_t ComponentPortion_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ComponentPortion_item },
};
static int
dissect_tcap_ComponentPortion(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,
ComponentPortion_sequence_of, hf_index, ett_tcap_ComponentPortion);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ComponentPortion_sequence_of, hf_index, ett_tcap_ComponentPortion);
return offset;
}
@ -1342,7 +1342,7 @@ static int dissect_components(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t Unidirectional_sequence[] = {
static const ber_old_sequence_t Unidirectional_sequence[] = {
{ BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
{ BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_components },
{ 0, 0, 0, NULL }
@ -1350,8 +1350,8 @@ static const ber_sequence_t Unidirectional_sequence[] = {
static int
dissect_tcap_Unidirectional(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,
Unidirectional_sequence, hf_index, ett_tcap_Unidirectional);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Unidirectional_sequence, hf_index, ett_tcap_Unidirectional);
return offset;
}
@ -1410,7 +1410,7 @@ static int dissect_otid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t Begin_sequence[] = {
static const ber_old_sequence_t Begin_sequence[] = {
{ BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_otid },
{ BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
{ BER_CLASS_APP, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_components },
@ -1425,8 +1425,8 @@ gp_tcapsrt_info->ope=TC_BEGIN;
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Begin ");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Begin_sequence, hf_index, ett_tcap_Begin);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Begin_sequence, hf_index, ett_tcap_Begin);
@ -1485,7 +1485,7 @@ static int dissect_dtid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t End_sequence[] = {
static const ber_old_sequence_t End_sequence[] = {
{ BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
{ BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
{ BER_CLASS_APP, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_components },
@ -1500,8 +1500,8 @@ gp_tcapsrt_info->ope=TC_END;
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " End ");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
End_sequence, hf_index, ett_tcap_End);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
End_sequence, hf_index, ett_tcap_End);
@ -1513,7 +1513,7 @@ static int dissect_end_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Continue_sequence[] = {
static const ber_old_sequence_t Continue_sequence[] = {
{ BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_otid },
{ BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
{ BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
@ -1529,8 +1529,8 @@ gp_tcapsrt_info->ope=TC_CONT;
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Continue ");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Continue_sequence, hf_index, ett_tcap_Continue);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Continue_sequence, hf_index, ett_tcap_Continue);
@ -1570,7 +1570,7 @@ static const value_string tcap_Reason_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Reason_choice[] = {
static const ber_old_choice_t Reason_choice[] = {
{ 10, BER_CLASS_APP, 10, BER_FLAGS_NOOWNTAG, dissect_p_abortCause },
{ 11, BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_u_abortCause },
{ 0, 0, 0, 0, NULL }
@ -1578,9 +1578,9 @@ static const ber_choice_t Reason_choice[] = {
static int
dissect_tcap_Reason(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,
Reason_choice, hf_index, ett_tcap_Reason,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Reason_choice, hf_index, ett_tcap_Reason,
NULL);
return offset;
}
@ -1589,7 +1589,7 @@ static int dissect_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t Abort_sequence[] = {
static const ber_old_sequence_t Abort_sequence[] = {
{ BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_reason },
{ 0, 0, 0, NULL }
@ -1603,8 +1603,8 @@ gp_tcapsrt_info->ope=TC_ABORT;
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Abort ");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Abort_sequence, hf_index, ett_tcap_Abort);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Abort_sequence, hf_index, ett_tcap_Abort);
@ -1683,7 +1683,7 @@ static const value_string tcap_T_applicationContext_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_applicationContext_choice[] = {
static const ber_old_choice_t T_applicationContext_choice[] = {
{ 27, BER_CLASS_PRI, 27, BER_FLAGS_NOOWNTAG, dissect_integerApplicationId },
{ 28, BER_CLASS_PRI, 28, BER_FLAGS_NOOWNTAG, dissect_objectApplicationId },
{ 0, 0, 0, 0, NULL }
@ -1691,9 +1691,9 @@ static const ber_choice_t T_applicationContext_choice[] = {
static int
dissect_tcap_T_applicationContext(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_applicationContext_choice, hf_index, ett_tcap_T_applicationContext,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext,
NULL);
return offset;
}
@ -1708,7 +1708,7 @@ static const value_string tcap_T_securityContext_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_securityContext_choice[] = {
static const ber_old_choice_t T_securityContext_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerSecurityId_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectSecurityId_impl },
{ 0, 0, 0, 0, NULL }
@ -1716,9 +1716,9 @@ static const ber_choice_t T_securityContext_choice[] = {
static int
dissect_tcap_T_securityContext(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_securityContext_choice, hf_index, ett_tcap_T_securityContext,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_securityContext_choice, hf_index, ett_tcap_T_securityContext,
NULL);
return offset;
}
@ -1733,7 +1733,7 @@ static const value_string tcap_T_confidentialityId_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_confidentialityId_choice[] = {
static const ber_old_choice_t T_confidentialityId_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerConfidentialityId_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectConfidentialityId_impl },
{ 0, 0, 0, 0, NULL }
@ -1741,9 +1741,9 @@ static const ber_choice_t T_confidentialityId_choice[] = {
static int
dissect_tcap_T_confidentialityId(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_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId,
NULL);
return offset;
}
@ -1752,15 +1752,15 @@ static int dissect_confidentialityId(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Confidentiality_sequence[] = {
static const ber_old_sequence_t Confidentiality_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confidentialityId },
{ 0, 0, 0, NULL }
};
static int
dissect_tcap_Confidentiality(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,
Confidentiality_sequence, hf_index, ett_tcap_Confidentiality);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Confidentiality_sequence, hf_index, ett_tcap_Confidentiality);
return offset;
}
@ -1769,7 +1769,7 @@ static int dissect_confidentiality_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t DialoguePortionANSI_sequence[] = {
static const ber_old_sequence_t DialoguePortionANSI_sequence[] = {
{ BER_CLASS_PRI, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_applicationContext },
{ BER_CLASS_UNI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_userInformation },
@ -1780,8 +1780,8 @@ static const ber_sequence_t DialoguePortionANSI_sequence[] = {
static int
dissect_tcap_DialoguePortionANSI(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,
DialoguePortionANSI_sequence, hf_index, ett_tcap_DialoguePortionANSI);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DialoguePortionANSI_sequence, hf_index, ett_tcap_DialoguePortionANSI);
return offset;
}
@ -1809,7 +1809,7 @@ static const value_string tcap_OperationCode_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OperationCode_choice[] = {
static const ber_old_choice_t OperationCode_choice[] = {
{ 16, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_national_impl },
{ 17, BER_CLASS_PRI, 17, BER_FLAGS_IMPLTAG, dissect_private_impl },
{ 0, 0, 0, 0, NULL }
@ -1817,9 +1817,9 @@ static const ber_choice_t OperationCode_choice[] = {
static int
dissect_tcap_OperationCode(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,
OperationCode_choice, hf_index, ett_tcap_OperationCode,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OperationCode_choice, hf_index, ett_tcap_OperationCode,
NULL);
return offset;
}
@ -1914,7 +1914,7 @@ static int dissect_ansiparams21(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t ANSIparamch_sequence[] = {
static const ber_old_sequence_t ANSIparamch_sequence[] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams1 },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams2 },
@ -1942,8 +1942,8 @@ static const ber_sequence_t ANSIparamch_sequence[] = {
static int
dissect_tcap_ANSIparamch(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,
ANSIparamch_sequence, hf_index, ett_tcap_ANSIparamch);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ANSIparamch_sequence, hf_index, ett_tcap_ANSIparamch);
return offset;
}
@ -1961,7 +1961,7 @@ static int dissect_parameterrj(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t InvokePDU_sequence[] = {
static const ber_old_sequence_t InvokePDU_sequence[] = {
{ BER_CLASS_PRI, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentIDs_impl },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_operationCode },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterinv },
@ -1970,8 +1970,8 @@ static const ber_sequence_t InvokePDU_sequence[] = {
static int
dissect_tcap_InvokePDU(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,
InvokePDU_sequence, hf_index, ett_tcap_InvokePDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
InvokePDU_sequence, hf_index, ett_tcap_InvokePDU);
return offset;
}
@ -1996,7 +1996,7 @@ static int dissect_componentID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t ReturnResultPDU_sequence[] = {
static const ber_old_sequence_t ReturnResultPDU_sequence[] = {
{ BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterrr },
{ 0, 0, 0, NULL }
@ -2004,8 +2004,8 @@ static const ber_sequence_t ReturnResultPDU_sequence[] = {
static int
dissect_tcap_ReturnResultPDU(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,
ReturnResultPDU_sequence, hf_index, ett_tcap_ReturnResultPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnResultPDU_sequence, hf_index, ett_tcap_ReturnResultPDU);
return offset;
}
@ -2017,7 +2017,7 @@ static int dissect_returnResultNotLastansi_impl(proto_tree *tree _U_, tvbuff_t *
}
static const ber_sequence_t ReturnErrorPDU_sequence[] = {
static const ber_old_sequence_t ReturnErrorPDU_sequence[] = {
{ BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterre },
@ -2026,8 +2026,8 @@ static const ber_sequence_t ReturnErrorPDU_sequence[] = {
static int
dissect_tcap_ReturnErrorPDU(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,
ReturnErrorPDU_sequence, hf_index, ett_tcap_ReturnErrorPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ReturnErrorPDU_sequence, hf_index, ett_tcap_ReturnErrorPDU);
return offset;
}
@ -2056,7 +2056,7 @@ static int dissect_rejectProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t RejectPDU_sequence[] = {
static const ber_old_sequence_t RejectPDU_sequence[] = {
{ BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
{ BER_CLASS_PRI, 21, BER_FLAGS_IMPLTAG, dissect_rejectProblem_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterrj },
@ -2065,8 +2065,8 @@ static const ber_sequence_t RejectPDU_sequence[] = {
static int
dissect_tcap_RejectPDU(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,
RejectPDU_sequence, hf_index, ett_tcap_RejectPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
RejectPDU_sequence, hf_index, ett_tcap_RejectPDU);
return offset;
}
@ -2085,7 +2085,7 @@ static const value_string tcap_ComponentPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ComponentPDU_choice[] = {
static const ber_old_choice_t ComponentPDU_choice[] = {
{ 9, BER_CLASS_PRI, 9, BER_FLAGS_IMPLTAG, dissect_invokeLastansi_impl },
{ 10, BER_CLASS_PRI, 10, BER_FLAGS_IMPLTAG, dissect_returnResultLastansi_impl },
{ 11, BER_CLASS_PRI, 11, BER_FLAGS_IMPLTAG, dissect_returnErroransi_impl },
@ -2111,7 +2111,7 @@ if (! (subdissector_handle = get_ansi_tcap_subdissector(actx->pinfo->match_port)
call_dissector(subdissector_handle, next_tvb, actx->pinfo, tcap_top_tree);
offset = dissect_ber_choice(actx, tree, tvb, offset,
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU,NULL);
@ -2123,14 +2123,14 @@ static int dissect_ComponentSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t ComponentSequence_sequence_of[1] = {
static const ber_old_sequence_t ComponentSequence_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ComponentSequence_item },
};
static int
dissect_tcap_ComponentSequence(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,
ComponentSequence_sequence_of, hf_index, ett_tcap_ComponentSequence);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ComponentSequence_sequence_of, hf_index, ett_tcap_ComponentSequence);
return offset;
}
@ -2139,7 +2139,7 @@ static int dissect_componentPortion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t UniTransactionPDU_sequence[] = {
static const ber_old_sequence_t UniTransactionPDU_sequence[] = {
{ BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
{ BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
{ BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_componentPortion },
@ -2148,8 +2148,8 @@ static const ber_sequence_t UniTransactionPDU_sequence[] = {
static int
dissect_tcap_UniTransactionPDU(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,
UniTransactionPDU_sequence, hf_index, ett_tcap_UniTransactionPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
UniTransactionPDU_sequence, hf_index, ett_tcap_UniTransactionPDU);
return offset;
}
@ -2158,7 +2158,7 @@ static int dissect_ansiunidirectional_impl(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t TransactionPDU_sequence[] = {
static const ber_old_sequence_t TransactionPDU_sequence[] = {
{ BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
{ BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
{ BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_componentPortion },
@ -2183,8 +2183,8 @@ if ((hf_index == hf_tcap_ansiconversationWithPerm)&&(check_col(actx->pinfo->cinf
if ((hf_index == hf_tcap_ansiconversationWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ConversationWithoutPerm");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
@ -2241,7 +2241,7 @@ static const value_string tcap_T_causeInformation_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_causeInformation_choice[] = {
static const ber_old_choice_t T_causeInformation_choice[] = {
{ 0, BER_CLASS_PRI, 23, BER_FLAGS_NOOWNTAG, dissect_abortCause },
{ 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_userInformation },
{ 0, 0, 0, 0, NULL }
@ -2249,9 +2249,9 @@ static const ber_choice_t T_causeInformation_choice[] = {
static int
dissect_tcap_T_causeInformation(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_causeInformation_choice, hf_index, ett_tcap_T_causeInformation,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation,
NULL);
return offset;
}
@ -2260,7 +2260,7 @@ static int dissect_causeInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t AbortPDU_sequence[] = {
static const ber_old_sequence_t AbortPDU_sequence[] = {
{ BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
{ BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_causeInformation },
@ -2273,8 +2273,8 @@ dissect_tcap_AbortPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Abort ");
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
@ -2302,7 +2302,7 @@ static const value_string tcap_TCMessage_vals[] = {
{ 0, NULL }
};
static const ber_choice_t TCMessage_choice[] = {
static const ber_old_choice_t TCMessage_choice[] = {
{ 0, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_unidirectional_impl },
{ 1, BER_CLASS_APP, 2, BER_FLAGS_IMPLTAG, dissect_begin_impl },
{ 2, BER_CLASS_APP, 4, BER_FLAGS_IMPLTAG, dissect_end_impl },
@ -2320,9 +2320,9 @@ static const ber_choice_t TCMessage_choice[] = {
static int
dissect_tcap_TCMessage(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,
TCMessage_choice, hf_index, ett_tcap_TCMessage,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
TCMessage_choice, hf_index, ett_tcap_TCMessage,
NULL);
return offset;
}
@ -2334,7 +2334,7 @@ static const value_string tcap_ERROR_vals[] = {
{ 0, NULL }
};
static const ber_choice_t ERROR_choice[] = {
static const ber_old_choice_t ERROR_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
{ 0, 0, 0, 0, NULL }
@ -2342,9 +2342,9 @@ static const ber_choice_t ERROR_choice[] = {
static int
dissect_tcap_ERROR(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,
ERROR_choice, hf_index, ett_tcap_ERROR,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
ERROR_choice, hf_index, ett_tcap_ERROR,
NULL);
return offset;
}
@ -3291,7 +3291,7 @@ dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (!next_tvb)
return offset+len;
dissect_ber_choice(actx, tree, next_tvb, 0,
dissect_ber_old_choice(actx, tree, next_tvb, 0,
Component_choice, hf_index, ett_tcap_Component,NULL);

6
epan/dissectors/packet-wlancertextn.c
View File

@ -94,14 +94,14 @@ static int dissect_SSIDList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SSIDList_sequence_of[1] = {
static const ber_old_sequence_t SSIDList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SSIDList_item },
};
static int
dissect_wlancertextn_SSIDList(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,
SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
return offset;
}

1010
epan/dissectors/packet-x411.c
View File

File diff suppressed because it is too large Load Diff

432
epan/dissectors/packet-x420.c
View File

File diff suppressed because it is too large Load Diff

200
epan/dissectors/packet-x509af.c
View File

@ -302,7 +302,7 @@ static int dissect_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
static const ber_old_sequence_t AlgorithmIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_algorithmId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters },
{ 0, 0, 0, NULL }
@ -310,8 +310,8 @@ static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
int
dissect_x509af_AlgorithmIdentifier(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,
AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
return offset;
}
@ -367,7 +367,7 @@ const value_string x509af_Time_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Time_choice[] = {
static const ber_old_choice_t Time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
{ 0, 0, 0, 0, NULL }
@ -375,9 +375,9 @@ static const ber_choice_t Time_choice[] = {
int
dissect_x509af_Time(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,
Time_choice, hf_index, ett_x509af_Time,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Time_choice, hf_index, ett_x509af_Time,
NULL);
return offset;
}
@ -398,7 +398,7 @@ static int dissect_revocationDate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t Validity_sequence[] = {
static const ber_old_sequence_t Validity_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
{ 0, 0, 0, NULL }
@ -406,8 +406,8 @@ static const ber_sequence_t Validity_sequence[] = {
int
dissect_x509af_Validity(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,
Validity_sequence, hf_index, ett_x509af_Validity);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Validity_sequence, hf_index, ett_x509af_Validity);
return offset;
}
@ -421,7 +421,7 @@ static const value_string x509af_SubjectName_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SubjectName_choice[] = {
static const ber_old_choice_t SubjectName_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
{ 0, 0, 0, 0, NULL }
};
@ -431,9 +431,9 @@ dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
#line 107 "x509af.cnf"
const char* str;
offset = dissect_ber_choice(actx, tree, tvb, offset,
SubjectName_choice, hf_index, ett_x509af_SubjectName,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SubjectName_choice, hf_index, ett_x509af_SubjectName,
NULL);
str = x509if_get_last_dn();
@ -468,7 +468,7 @@ static int dissect_subjectPublicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = {
static const ber_old_sequence_t SubjectPublicKeyInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey },
{ 0, 0, 0, NULL }
@ -476,8 +476,8 @@ static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = {
int
dissect_x509af_SubjectPublicKeyInfo(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,
SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
return offset;
}
@ -544,7 +544,7 @@ static int dissect_extnValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t Extension_sequence[] = {
static const ber_old_sequence_t Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue },
@ -553,8 +553,8 @@ static const ber_sequence_t Extension_sequence[] = {
int
dissect_x509af_Extension(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,
Extension_sequence, hf_index, ett_x509af_Extension);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Extension_sequence, hf_index, ett_x509af_Extension);
return offset;
}
@ -563,14 +563,14 @@ static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t Extensions_sequence_of[1] = {
static const ber_old_sequence_t Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
int
dissect_x509af_Extensions(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,
Extensions_sequence_of, hf_index, ett_x509af_Extensions);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
Extensions_sequence_of, hf_index, ett_x509af_Extensions);
return offset;
}
@ -585,7 +585,7 @@ static int dissect_crlExtensions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t T_signedCertificate_sequence[] = {
static const ber_old_sequence_t T_signedCertificate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
@ -601,8 +601,8 @@ static const ber_sequence_t T_signedCertificate_sequence[] = {
static int
dissect_x509af_T_signedCertificate(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_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
return offset;
}
@ -611,7 +611,7 @@ static int dissect_signedCertificate(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Certificate_sequence[] = {
static const ber_old_sequence_t Certificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -620,8 +620,8 @@ static const ber_sequence_t Certificate_sequence[] = {
int
dissect_x509af_Certificate(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,
Certificate_sequence, hf_index, ett_x509af_Certificate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Certificate_sequence, hf_index, ett_x509af_Certificate);
return offset;
}
@ -642,14 +642,14 @@ static int dissect_certificate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t CrossCertificates_set_of[1] = {
static const ber_old_sequence_t CrossCertificates_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
};
int
dissect_x509af_CrossCertificates(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,
CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates);
return offset;
}
@ -658,14 +658,14 @@ static int dissect_ForwardCertificationPath_item(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = {
static const ber_old_sequence_t ForwardCertificationPath_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
};
int
dissect_x509af_ForwardCertificationPath(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,
ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath);
return offset;
}
@ -674,7 +674,7 @@ static int dissect_certificationPath(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t Certificates_sequence[] = {
static const ber_old_sequence_t Certificates_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath },
{ 0, 0, 0, NULL }
@ -682,14 +682,14 @@ static const ber_sequence_t Certificates_sequence[] = {
int
dissect_x509af_Certificates(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,
Certificates_sequence, hf_index, ett_x509af_Certificates);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Certificates_sequence, hf_index, ett_x509af_Certificates);
return offset;
}
static const ber_sequence_t CertificatePair_sequence[] = {
static const ber_old_sequence_t CertificatePair_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA },
{ 0, 0, 0, NULL }
@ -697,8 +697,8 @@ static const ber_sequence_t CertificatePair_sequence[] = {
int
dissect_x509af_CertificatePair(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,
CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
return offset;
}
@ -707,14 +707,14 @@ static int dissect_theCACertificates_item(proto_tree *tree _U_, tvbuff_t *tvb _U
}
static const ber_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
};
static int
dissect_x509af_SEQUENCE_OF_CertificatePair(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_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair);
return offset;
}
@ -723,7 +723,7 @@ static int dissect_theCACertificates(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t CertificationPath_sequence[] = {
static const ber_old_sequence_t CertificationPath_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates },
{ 0, 0, 0, NULL }
@ -731,14 +731,14 @@ static const ber_sequence_t CertificationPath_sequence[] = {
int
dissect_x509af_CertificationPath(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,
CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
return offset;
}
static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
static const ber_old_sequence_t T_revokedCertificates_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions },
@ -747,8 +747,8 @@ static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
static int
dissect_x509af_T_revokedCertificates_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_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
return offset;
}
@ -757,14 +757,14 @@ static int dissect_revokedCertificates_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t T_revokedCertificates_sequence_of[1] = {
static const ber_old_sequence_t T_revokedCertificates_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item },
};
static int
dissect_x509af_T_revokedCertificates(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_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates);
return offset;
}
@ -773,7 +773,7 @@ static int dissect_revokedCertificates(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t T_signedCertificateList_sequence[] = {
static const ber_old_sequence_t T_signedCertificateList_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
@ -786,8 +786,8 @@ static const ber_sequence_t T_signedCertificateList_sequence[] = {
static int
dissect_x509af_T_signedCertificateList(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_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
return offset;
}
@ -796,7 +796,7 @@ static int dissect_signedCertificateList(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t CertificateList_sequence[] = {
static const ber_old_sequence_t CertificateList_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -805,14 +805,14 @@ static const ber_sequence_t CertificateList_sequence[] = {
int
dissect_x509af_CertificateList(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,
CertificateList_sequence, hf_index, ett_x509af_CertificateList);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateList_sequence, hf_index, ett_x509af_CertificateList);
return offset;
}
static const ber_sequence_t IssuerSerial_sequence[] = {
static const ber_old_sequence_t IssuerSerial_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID },
@ -821,8 +821,8 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
int
dissect_x509af_IssuerSerial(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,
IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
return offset;
}
@ -837,7 +837,7 @@ static const value_string x509af_InfoSubject_vals[] = {
{ 0, NULL }
};
static const ber_choice_t InfoSubject_choice[] = {
static const ber_old_choice_t InfoSubject_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
{ 1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName },
{ 0, 0, 0, 0, NULL }
@ -845,9 +845,9 @@ static const ber_choice_t InfoSubject_choice[] = {
static int
dissect_x509af_InfoSubject(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,
InfoSubject_choice, hf_index, ett_x509af_InfoSubject,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
InfoSubject_choice, hf_index, ett_x509af_InfoSubject,
NULL);
return offset;
}
@ -856,7 +856,7 @@ static int dissect_info_subject(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t AttCertValidityPeriod_sequence[] = {
static const ber_old_sequence_t AttCertValidityPeriod_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime },
{ 0, 0, 0, NULL }
@ -864,8 +864,8 @@ static const ber_sequence_t AttCertValidityPeriod_sequence[] = {
int
dissect_x509af_AttCertValidityPeriod(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,
AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
return offset;
}
@ -874,14 +874,14 @@ static int dissect_attCertValidityPeriod(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
};
static int
dissect_x509af_SEQUENCE_OF_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_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute);
return offset;
}
@ -890,7 +890,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
static const ber_old_sequence_t AttributeCertificateInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
@ -905,8 +905,8 @@ static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
int
dissect_x509af_AttributeCertificateInfo(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,
AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
return offset;
}
@ -915,7 +915,7 @@ static int dissect_signedAttributeCertificateInfo(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t AttributeCertificate_sequence[] = {
static const ber_old_sequence_t AttributeCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -924,8 +924,8 @@ static const ber_sequence_t AttributeCertificate_sequence[] = {
int
dissect_x509af_AttributeCertificate(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,
AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
return offset;
}
@ -934,7 +934,7 @@ static int dissect_attributeCertificate(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t ACPathData_sequence[] = {
static const ber_old_sequence_t ACPathData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate },
{ 0, 0, 0, NULL }
@ -942,8 +942,8 @@ static const ber_sequence_t ACPathData_sequence[] = {
int
dissect_x509af_ACPathData(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,
ACPathData_sequence, hf_index, ett_x509af_ACPathData);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ACPathData_sequence, hf_index, ett_x509af_ACPathData);
return offset;
}
@ -952,14 +952,14 @@ static int dissect_acPath_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
};
static int
dissect_x509af_SEQUENCE_OF_ACPathData(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_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData);
return offset;
}
@ -968,7 +968,7 @@ static int dissect_acPath(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t AttributeCertificationPath_sequence[] = {
static const ber_old_sequence_t AttributeCertificationPath_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath },
{ 0, 0, 0, NULL }
@ -976,8 +976,8 @@ static const ber_sequence_t AttributeCertificationPath_sequence[] = {
int
dissect_x509af_AttributeCertificationPath(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,
AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
return offset;
}
@ -989,7 +989,7 @@ static const value_string x509af_AssertionSubject_vals[] = {
{ 0, NULL }
};
static const ber_choice_t AssertionSubject_choice[] = {
static const ber_old_choice_t AssertionSubject_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
{ 1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName },
{ 0, 0, 0, 0, NULL }
@ -997,9 +997,9 @@ static const ber_choice_t AssertionSubject_choice[] = {
static int
dissect_x509af_AssertionSubject(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,
AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject,
NULL);
return offset;
}
@ -1008,14 +1008,14 @@ static int dissect_assertion_subject(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
};
static int
dissect_x509af_SET_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_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType);
return offset;
}
@ -1024,7 +1024,7 @@ static int dissect_attType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
}
static const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
static const ber_old_sequence_t AttributeCertificateAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity },
@ -1034,8 +1034,8 @@ static const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
int
dissect_x509af_AttributeCertificateAssertion(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,
AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
return offset;
}
@ -1060,7 +1060,7 @@ static int dissect_g(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, as
}
static const ber_sequence_t DSS_Params_sequence[] = {
static const ber_old_sequence_t DSS_Params_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_q },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g },
@ -1069,8 +1069,8 @@ static const ber_sequence_t DSS_Params_sequence[] = {
static int
dissect_x509af_DSS_Params(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,
DSS_Params_sequence, hf_index, ett_x509af_DSS_Params);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DSS_Params_sequence, hf_index, ett_x509af_DSS_Params);
return offset;
}

260
epan/dissectors/packet-x509ce.c
View File

@ -367,7 +367,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t OtherName_sequence[] = {
static const ber_old_sequence_t OtherName_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type_id },
{ BER_CLASS_CON, 0, 0, dissect_value },
{ 0, 0, 0, NULL }
@ -375,8 +375,8 @@ static const ber_sequence_t OtherName_sequence[] = {
static int
dissect_x509ce_OtherName(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,
OtherName_sequence, hf_index, ett_x509ce_OtherName);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
OtherName_sequence, hf_index, ett_x509ce_OtherName);
return offset;
}
@ -410,7 +410,7 @@ static int dissect_uniformResourceIdentifier_impl(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t EDIPartyName_sequence[] = {
static const ber_old_sequence_t EDIPartyName_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
{ 0, 0, 0, NULL }
@ -418,8 +418,8 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
int
dissect_x509ce_EDIPartyName(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,
EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
return offset;
}
@ -478,7 +478,7 @@ const value_string x509ce_GeneralName_vals[] = {
{ 0, NULL }
};
static const ber_choice_t GeneralName_choice[] = {
static const ber_old_choice_t GeneralName_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_otherName_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl },
@ -493,9 +493,9 @@ static const ber_choice_t GeneralName_choice[] = {
int
dissect_x509ce_GeneralName(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,
GeneralName_choice, hf_index, ett_x509ce_GeneralName,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
GeneralName_choice, hf_index, ett_x509ce_GeneralName,
NULL);
return offset;
}
@ -519,14 +519,14 @@ static int dissect_deltaLocation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t GeneralNames_sequence_of[1] = {
static const ber_old_sequence_t GeneralNames_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
};
int
dissect_x509ce_GeneralNames(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,
GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames);
return offset;
}
@ -544,7 +544,7 @@ static int dissect_fullName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = {
static const ber_old_sequence_t AuthorityKeyIdentifier_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertSerialNumber_impl },
@ -553,8 +553,8 @@ static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = {
int
dissect_x509ce_AuthorityKeyIdentifier(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,
AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
return offset;
}
@ -613,14 +613,14 @@ static int dissect_KeyPurposeIDs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = {
static const ber_old_sequence_t KeyPurposeIDs_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item },
};
int
dissect_x509ce_KeyPurposeIDs(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,
KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs);
return offset;
}
@ -659,7 +659,7 @@ static int dissect_privateKeyValid_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = {
static const ber_old_sequence_t PrivateKeyUsagePeriod_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl },
{ 0, 0, 0, NULL }
@ -667,8 +667,8 @@ static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = {
int
dissect_x509ce_PrivateKeyUsagePeriod(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,
PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
return offset;
}
@ -722,7 +722,7 @@ static int dissect_qualifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
static const ber_old_sequence_t PolicyQualifierInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyQualifierId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_qualifier },
{ 0, 0, 0, NULL }
@ -730,8 +730,8 @@ static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
int
dissect_x509ce_PolicyQualifierInfo(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,
PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
return offset;
}
@ -740,14 +740,14 @@ static int dissect_policyQualifiers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
};
static int
dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(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_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
return offset;
}
@ -756,7 +756,7 @@ static int dissect_policyQualifiers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t PolicyInformation_sequence[] = {
static const ber_old_sequence_t PolicyInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers },
{ 0, 0, 0, NULL }
@ -764,8 +764,8 @@ static const ber_sequence_t PolicyInformation_sequence[] = {
int
dissect_x509ce_PolicyInformation(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,
PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
return offset;
}
@ -774,20 +774,20 @@ static int dissect_CertificatePoliciesSyntax_item(proto_tree *tree _U_, tvbuff_t
}
static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = {
static const ber_old_sequence_t CertificatePoliciesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item },
};
int
dissect_x509ce_CertificatePoliciesSyntax(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,
CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax);
return offset;
}
static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = {
static const ber_old_sequence_t PolicyMappingsSyntax_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy },
{ 0, 0, 0, NULL }
@ -795,8 +795,8 @@ static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = {
static int
dissect_x509ce_PolicyMappingsSyntax_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,
PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
return offset;
}
@ -805,27 +805,27 @@ static int dissect_PolicyMappingsSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = {
static const ber_old_sequence_t PolicyMappingsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item },
};
int
dissect_x509ce_PolicyMappingsSyntax(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,
PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax);
return offset;
}
static const ber_sequence_t AttributesSyntax_sequence_of[1] = {
static const ber_old_sequence_t AttributesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item },
};
int
dissect_x509ce_AttributesSyntax(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,
AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax);
return offset;
}
@ -889,7 +889,7 @@ static int dissect_templateMinorVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t BasicConstraintsSyntax_sequence[] = {
static const ber_old_sequence_t BasicConstraintsSyntax_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint },
{ 0, 0, 0, NULL }
@ -897,8 +897,8 @@ static const ber_sequence_t BasicConstraintsSyntax_sequence[] = {
int
dissect_x509ce_BasicConstraintsSyntax(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,
BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
return offset;
}
@ -920,7 +920,7 @@ static int dissect_maximum_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
}
static const ber_sequence_t GeneralSubtree_sequence[] = {
static const ber_old_sequence_t GeneralSubtree_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl },
@ -929,8 +929,8 @@ static const ber_sequence_t GeneralSubtree_sequence[] = {
int
dissect_x509ce_GeneralSubtree(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,
GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
return offset;
}
@ -939,14 +939,14 @@ static int dissect_GeneralSubtrees_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t GeneralSubtrees_sequence_of[1] = {
static const ber_old_sequence_t GeneralSubtrees_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item },
};
int
dissect_x509ce_GeneralSubtrees(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,
GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees);
return offset;
}
@ -958,7 +958,7 @@ static int dissect_excludedSubtrees_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
}
static const ber_sequence_t NameConstraintsSyntax_sequence[] = {
static const ber_old_sequence_t NameConstraintsSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl },
{ 0, 0, 0, NULL }
@ -966,8 +966,8 @@ static const ber_sequence_t NameConstraintsSyntax_sequence[] = {
int
dissect_x509ce_NameConstraintsSyntax(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,
NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
return offset;
}
@ -992,7 +992,7 @@ static int dissect_inhibitPolicyMapping_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = {
static const ber_old_sequence_t PolicyConstraintsSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl },
{ 0, 0, 0, NULL }
@ -1000,8 +1000,8 @@ static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = {
int
dissect_x509ce_PolicyConstraintsSyntax(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,
PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
return offset;
}
@ -1065,7 +1065,7 @@ const value_string x509ce_DistributionPointName_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DistributionPointName_choice[] = {
static const ber_old_choice_t DistributionPointName_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fullName_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_nameRelativeToCRLIssuer_impl },
{ 0, 0, 0, 0, NULL }
@ -1073,9 +1073,9 @@ static const ber_choice_t DistributionPointName_choice[] = {
int
dissect_x509ce_DistributionPointName(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,
DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName,
NULL);
return offset;
}
@ -1141,7 +1141,7 @@ static int dissect_reasonFlags(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t NumberRange_sequence[] = {
static const ber_old_sequence_t NumberRange_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_modulus },
@ -1150,8 +1150,8 @@ static const ber_sequence_t NumberRange_sequence[] = {
int
dissect_x509ce_NumberRange(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,
NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
return offset;
}
@ -1176,7 +1176,7 @@ static int dissect_cRLStreamIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t BaseRevocationInfo_sequence[] = {
static const ber_old_sequence_t BaseRevocationInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseThisUpdate_impl },
@ -1185,8 +1185,8 @@ static const ber_sequence_t BaseRevocationInfo_sequence[] = {
int
dissect_x509ce_BaseRevocationInfo(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,
BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
return offset;
}
@ -1195,7 +1195,7 @@ static int dissect_baseRevocationInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t PerAuthorityScope_sequence[] = {
static const ber_old_sequence_t PerAuthorityScope_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_onlyContains_impl },
@ -1209,8 +1209,8 @@ static const ber_sequence_t PerAuthorityScope_sequence[] = {
int
dissect_x509ce_PerAuthorityScope(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,
PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
return offset;
}
@ -1219,14 +1219,14 @@ static int dissect_CRLScopeSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = {
static const ber_old_sequence_t CRLScopeSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item },
};
int
dissect_x509ce_CRLScopeSyntax(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,
CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax);
return offset;
}
@ -1235,7 +1235,7 @@ static int dissect_cRLScope(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t DeltaRefInfo_sequence[] = {
static const ber_old_sequence_t DeltaRefInfo_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta },
{ 0, 0, 0, NULL }
@ -1243,8 +1243,8 @@ static const ber_sequence_t DeltaRefInfo_sequence[] = {
int
dissect_x509ce_DeltaRefInfo(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,
DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
return offset;
}
@ -1253,7 +1253,7 @@ static int dissect_deltaRefInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
}
static const ber_sequence_t CRLReferral_sequence[] = {
static const ber_old_sequence_t CRLReferral_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_crlr_issuer_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deltaRefInfo_impl },
@ -1265,8 +1265,8 @@ static const ber_sequence_t CRLReferral_sequence[] = {
int
dissect_x509ce_CRLReferral(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,
CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
return offset;
}
@ -1280,16 +1280,16 @@ const value_string x509ce_StatusReferral_vals[] = {
{ 0, NULL }
};
static const ber_choice_t StatusReferral_choice[] = {
static const ber_old_choice_t StatusReferral_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl },
{ 0, 0, 0, 0, NULL }
};
int
dissect_x509ce_StatusReferral(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,
StatusReferral_choice, hf_index, ett_x509ce_StatusReferral,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
StatusReferral_choice, hf_index, ett_x509ce_StatusReferral,
NULL);
return offset;
}
@ -1298,14 +1298,14 @@ static int dissect_StatusReferrals_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t StatusReferrals_sequence_of[1] = {
static const ber_old_sequence_t StatusReferrals_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
};
int
dissect_x509ce_StatusReferrals(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,
StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals);
return offset;
}
@ -1327,7 +1327,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
}
static const ber_sequence_t DeltaInformation_sequence[] = {
static const ber_old_sequence_t DeltaInformation_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta },
{ 0, 0, 0, NULL }
@ -1335,14 +1335,14 @@ static const ber_sequence_t DeltaInformation_sequence[] = {
int
dissect_x509ce_DeltaInformation(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,
DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
return offset;
}
static const ber_sequence_t DistributionPoint_sequence[] = {
static const ber_old_sequence_t DistributionPoint_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLIssuer_impl },
@ -1351,8 +1351,8 @@ static const ber_sequence_t DistributionPoint_sequence[] = {
int
dissect_x509ce_DistributionPoint(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,
DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
return offset;
}
@ -1361,20 +1361,20 @@ static int dissect_CRLDistPointsSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb
}
static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = {
static const ber_old_sequence_t CRLDistPointsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item },
};
int
dissect_x509ce_CRLDistPointsSyntax(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,
CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax);
return offset;
}
static const ber_sequence_t IssuingDistPointSyntax_sequence[] = {
static const ber_old_sequence_t IssuingDistPointSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsCACerts_impl },
@ -1388,8 +1388,8 @@ static const ber_sequence_t IssuingDistPointSyntax_sequence[] = {
int
dissect_x509ce_IssuingDistPointSyntax(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,
IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
return offset;
}
@ -1404,7 +1404,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
}
static const ber_sequence_t CertificateExactAssertion_sequence[] = {
static const ber_old_sequence_t CertificateExactAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ 0, 0, 0, NULL }
@ -1412,8 +1412,8 @@ static const ber_sequence_t CertificateExactAssertion_sequence[] = {
int
dissect_x509ce_CertificateExactAssertion(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,
CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
return offset;
}
@ -1456,7 +1456,7 @@ const value_string x509ce_AltNameType_vals[] = {
{ 0, NULL }
};
static const ber_choice_t AltNameType_choice[] = {
static const ber_old_choice_t AltNameType_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_builtinNameForm },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_otherNameForm },
{ 0, 0, 0, 0, NULL }
@ -1464,9 +1464,9 @@ static const ber_choice_t AltNameType_choice[] = {
int
dissect_x509ce_AltNameType(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,
AltNameType_choice, hf_index, ett_x509ce_AltNameType,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
AltNameType_choice, hf_index, ett_x509ce_AltNameType,
NULL);
return offset;
}
@ -1475,14 +1475,14 @@ static int dissect_subjectAltName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
}
static const ber_sequence_t CertPolicySet_sequence_of[1] = {
static const ber_old_sequence_t CertPolicySet_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_CertPolicySet_item },
};
int
dissect_x509ce_CertPolicySet(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,
CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet);
return offset;
}
@ -1491,7 +1491,7 @@ static int dissect_policy_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
}
static const ber_sequence_t CertificateAssertion_sequence[] = {
static const ber_old_sequence_t CertificateAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuer_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
@ -1509,8 +1509,8 @@ static const ber_sequence_t CertificateAssertion_sequence[] = {
int
dissect_x509ce_CertificateAssertion(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,
CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
return offset;
}
@ -1522,7 +1522,7 @@ static int dissect_issuedByThisCAAssertion_impl(proto_tree *tree _U_, tvbuff_t *
}
static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
static const ber_old_sequence_t CertificatePairExactAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedToThisCAAssertion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedByThisCAAssertion_impl },
{ 0, 0, 0, NULL }
@ -1530,14 +1530,14 @@ static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
int
dissect_x509ce_CertificatePairExactAssertion(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,
CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
return offset;
}
static const ber_sequence_t CertificatePairAssertion_sequence[] = {
static const ber_old_sequence_t CertificatePairAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion_impl },
{ 0, 0, 0, NULL }
@ -1545,14 +1545,14 @@ static const ber_sequence_t CertificatePairAssertion_sequence[] = {
int
dissect_x509ce_CertificatePairAssertion(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,
CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
return offset;
}
static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
static const ber_old_sequence_t CertificateListExactAssertion_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint },
{ 0, 0, 0, NULL }
@ -1560,14 +1560,14 @@ static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
int
dissect_x509ce_CertificateListExactAssertion(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,
CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
return offset;
}
static const ber_sequence_t CertificateListAssertion_sequence[] = {
static const ber_old_sequence_t CertificateListAssertion_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minCRLNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maxCRLNumber_impl },
@ -1579,14 +1579,14 @@ static const ber_sequence_t CertificateListAssertion_sequence[] = {
int
dissect_x509ce_CertificateListAssertion(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,
CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
return offset;
}
static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
static const ber_old_sequence_t PkiPathMatchSyntax_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject },
{ 0, 0, 0, NULL }
@ -1594,14 +1594,14 @@ static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
int
dissect_x509ce_PkiPathMatchSyntax(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,
PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
return offset;
}
static const ber_sequence_t CertificateTemplate_sequence[] = {
static const ber_old_sequence_t CertificateTemplate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_templateID },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_templateMajorVersion },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_templateMinorVersion },
@ -1610,8 +1610,8 @@ static const ber_sequence_t CertificateTemplate_sequence[] = {
static int
dissect_x509ce_CertificateTemplate(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,
CertificateTemplate_sequence, hf_index, ett_x509ce_CertificateTemplate);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
CertificateTemplate_sequence, hf_index, ett_x509ce_CertificateTemplate);
return offset;
}

426
epan/dissectors/packet-x509if.c
View File

File diff suppressed because it is too large Load Diff

284
epan/dissectors/packet-x509sat.c
View File

@ -424,7 +424,7 @@ const value_string x509sat_DirectoryString_vals[] = {
{ 0, NULL }
};
static const ber_choice_t DirectoryString_choice[] = {
static const ber_old_choice_t DirectoryString_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_teletexString },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printableString },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_UniversalString, BER_FLAGS_NOOWNTAG, dissect_universalString },
@ -435,9 +435,9 @@ static const ber_choice_t DirectoryString_choice[] = {
int
dissect_x509sat_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_choice(actx, tree, tvb, offset,
DirectoryString_choice, hf_index, ett_x509sat_DirectoryString,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
DirectoryString_choice, hf_index, ett_x509sat_DirectoryString,
NULL);
return offset;
}
@ -516,7 +516,7 @@ static const value_string x509sat_CriteriaItem_vals[] = {
{ 0, NULL }
};
static const ber_choice_t CriteriaItem_choice[] = {
static const ber_old_choice_t CriteriaItem_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_equality },
{ 1, BER_CLASS_CON, 1, 0, dissect_substrings },
{ 2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
@ -527,9 +527,9 @@ static const ber_choice_t CriteriaItem_choice[] = {
static int
dissect_x509sat_CriteriaItem(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,
CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem,
NULL);
return offset;
}
@ -538,14 +538,14 @@ static int dissect_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t SET_OF_Criteria_set_of[1] = {
static const ber_old_sequence_t SET_OF_Criteria_set_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
static int
dissect_x509sat_SET_OF_Criteria(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_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria);
return offset;
}
@ -565,7 +565,7 @@ const value_string x509sat_Criteria_vals[] = {
{ 0, NULL }
};
static const ber_choice_t Criteria_choice[] = {
static const ber_old_choice_t Criteria_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_type },
{ 1, BER_CLASS_CON, 1, 0, dissect_and },
{ 2, BER_CLASS_CON, 2, 0, dissect_or },
@ -575,15 +575,15 @@ static const ber_choice_t Criteria_choice[] = {
int
dissect_x509sat_Criteria(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,
Criteria_choice, hf_index, ett_x509sat_Criteria,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
Criteria_choice, hf_index, ett_x509sat_Criteria,
NULL);
return offset;
}
static const ber_sequence_t Guide_set[] = {
static const ber_old_sequence_t Guide_set[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_objectClass },
{ BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
{ 0, 0, 0, NULL }
@ -591,8 +591,8 @@ static const ber_sequence_t Guide_set[] = {
static int
dissect_x509sat_Guide(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(implicit_tag, actx, tree, tvb, offset,
Guide_set, hf_index, ett_x509sat_Guide);
offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
Guide_set, hf_index, ett_x509sat_Guide);
return offset;
}
@ -618,7 +618,7 @@ static int dissect_subset(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t EnhancedGuide_sequence[] = {
static const ber_old_sequence_t EnhancedGuide_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_objectClass },
{ BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_subset },
@ -627,21 +627,21 @@ static const ber_sequence_t EnhancedGuide_sequence[] = {
int
dissect_x509sat_EnhancedGuide(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,
EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
return offset;
}
static const ber_sequence_t PostalAddress_sequence_of[1] = {
static const ber_old_sequence_t PostalAddress_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_PostalAddress_item },
};
int
dissect_x509sat_PostalAddress(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,
PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress);
return offset;
}
@ -661,7 +661,7 @@ static int dissect_telephoneNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t TelexNumber_sequence[] = {
static const ber_old_sequence_t TelexNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback },
@ -670,22 +670,22 @@ static const ber_sequence_t TelexNumber_sequence[] = {
static int
dissect_x509sat_TelexNumber(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,
TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
return offset;
}
static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
static const ber_old_sequence_t FacsimileTelephoneNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber },
{ 0, 0, 0, NULL }
};
int
dissect_x509sat_FacsimileTelephoneNumber(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,
FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
return offset;
}
@ -751,14 +751,14 @@ static int dissect_PreferredDeliveryMethod_item(proto_tree *tree _U_, tvbuff_t *
}
static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
static const ber_old_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item },
};
int
dissect_x509sat_PreferredDeliveryMethod(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,
PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod);
return offset;
}
@ -798,14 +798,14 @@ static int dissect_finall_substring(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t T_nAddresses_set_of[1] = {
static const ber_old_sequence_t T_nAddresses_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item },
};
static int
dissect_x509sat_T_nAddresses(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_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
return offset;
}
@ -814,7 +814,7 @@ static int dissect_nAddresses(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t PresentationAddress_sequence[] = {
static const ber_old_sequence_t PresentationAddress_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_tSelector },
@ -824,21 +824,21 @@ static const ber_sequence_t PresentationAddress_sequence[] = {
int
dissect_x509sat_PresentationAddress(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,
PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
return offset;
}
static const ber_sequence_t T_profiles_set_of[1] = {
static const ber_old_sequence_t T_profiles_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item },
};
static int
dissect_x509sat_T_profiles(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_profiles_set_of, hf_index, ett_x509sat_T_profiles);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_profiles_set_of, hf_index, ett_x509sat_T_profiles);
return offset;
}
@ -847,7 +847,7 @@ static int dissect_profiles(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t ProtocolInformation_sequence[] = {
static const ber_old_sequence_t ProtocolInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles },
{ 0, 0, 0, NULL }
@ -855,14 +855,14 @@ static const ber_sequence_t ProtocolInformation_sequence[] = {
int
dissect_x509sat_ProtocolInformation(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,
ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
return offset;
}
static const ber_sequence_t NameAndOptionalUID_sequence[] = {
static const ber_old_sequence_t NameAndOptionalUID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid },
{ 0, 0, 0, NULL }
@ -870,21 +870,21 @@ static const ber_sequence_t NameAndOptionalUID_sequence[] = {
int
dissect_x509sat_NameAndOptionalUID(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,
NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
return offset;
}
static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
static const ber_old_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
};
static int
dissect_x509sat_SEQUENCE_OF_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_) {
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
return offset;
}
@ -893,7 +893,7 @@ static int dissect_attributeList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
static const ber_old_sequence_t MultipleMatchingLocalities_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList },
{ 0, 0, 0, NULL }
@ -901,8 +901,8 @@ static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
int
dissect_x509sat_MultipleMatchingLocalities(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,
MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
return offset;
}
@ -916,7 +916,7 @@ static const value_string x509sat_SubstringAssertion_item_vals[] = {
{ 0, NULL }
};
static const ber_choice_t SubstringAssertion_item_choice[] = {
static const ber_old_choice_t SubstringAssertion_item_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_initial },
{ 1, BER_CLASS_CON, 1, 0, dissect_any },
{ 2, BER_CLASS_CON, 2, 0, dissect_final },
@ -926,9 +926,9 @@ static const ber_choice_t SubstringAssertion_item_choice[] = {
static int
dissect_x509sat_SubstringAssertion_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,
SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item,
NULL);
return offset;
}
@ -937,27 +937,27 @@ static int dissect_SubstringAssertion_item(proto_tree *tree _U_, tvbuff_t *tvb _
}
static const ber_sequence_t SubstringAssertion_sequence_of[1] = {
static const ber_old_sequence_t SubstringAssertion_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
};
int
dissect_x509sat_SubstringAssertion(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,
SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion);
return offset;
}
static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
static const ber_old_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CaseIgnoreListMatch_item },
};
int
dissect_x509sat_CaseIgnoreListMatch(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,
CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch);
return offset;
}
@ -970,7 +970,7 @@ static const value_string x509sat_OctetSubstringAssertion_item_vals[] = {
{ 0, NULL }
};
static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
static const ber_old_choice_t OctetSubstringAssertion_item_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_initial_substring },
{ 1, BER_CLASS_CON, 1, 0, dissect_any_substring },
{ 2, BER_CLASS_CON, 2, 0, dissect_finall_substring },
@ -979,9 +979,9 @@ static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
static int
dissect_x509sat_OctetSubstringAssertion_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,
OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item,
NULL);
return offset;
}
@ -990,27 +990,27 @@ static int dissect_OctetSubstringAssertion_item(proto_tree *tree _U_, tvbuff_t *
}
static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = {
static const ber_old_sequence_t OctetSubstringAssertion_sequence_of[1] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
};
int
dissect_x509sat_OctetSubstringAssertion(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,
OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion);
return offset;
}
static const ber_sequence_t ZonalSelect_sequence_of[1] = {
static const ber_old_sequence_t ZonalSelect_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item },
};
int
dissect_x509sat_ZonalSelect(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,
ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect);
offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect);
return offset;
}
@ -1062,7 +1062,7 @@ static int dissect_at(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
}
static const ber_sequence_t T_absolute_sequence[] = {
static const ber_old_sequence_t T_absolute_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
{ 0, 0, 0, NULL }
@ -1070,8 +1070,8 @@ static const ber_sequence_t T_absolute_sequence[] = {
static int
dissect_x509sat_T_absolute(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_absolute_sequence, hf_index, ett_x509sat_T_absolute);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_absolute_sequence, hf_index, ett_x509sat_T_absolute);
return offset;
}
@ -1111,7 +1111,7 @@ static int dissect_second(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t DayTime_sequence[] = {
static const ber_old_sequence_t DayTime_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_hour },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_second },
@ -1120,8 +1120,8 @@ static const ber_sequence_t DayTime_sequence[] = {
int
dissect_x509sat_DayTime(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,
DayTime_sequence, hf_index, ett_x509sat_DayTime);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DayTime_sequence, hf_index, ett_x509sat_DayTime);
return offset;
}
@ -1133,7 +1133,7 @@ static int dissect_endDayTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t DayTimeBand_sequence[] = {
static const ber_old_sequence_t DayTimeBand_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime },
{ 0, 0, 0, NULL }
@ -1141,8 +1141,8 @@ static const ber_sequence_t DayTimeBand_sequence[] = {
int
dissect_x509sat_DayTimeBand(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,
DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
return offset;
}
@ -1151,14 +1151,14 @@ static int dissect_timesOfDay_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
}
static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = {
static const ber_old_sequence_t SET_OF_DayTimeBand_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item },
};
static int
dissect_x509sat_SET_OF_DayTimeBand(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_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand);
return offset;
}
@ -1167,14 +1167,14 @@ static int dissect_timesOfDay(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
}
static const ber_sequence_t T_intDay_set_of[1] = {
static const ber_old_sequence_t T_intDay_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item },
};
static int
dissect_x509sat_T_intDay(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_intDay_set_of, hf_index, ett_x509sat_T_intDay);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_intDay_set_of, hf_index, ett_x509sat_T_intDay);
return offset;
}
@ -1261,7 +1261,7 @@ const value_string x509sat_NamedDay_vals[] = {
{ 0, NULL }
};
static const ber_choice_t NamedDay_choice[] = {
static const ber_old_choice_t NamedDay_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intNamedDays },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitNamedDays },
{ 0, 0, 0, 0, NULL }
@ -1269,9 +1269,9 @@ static const ber_choice_t NamedDay_choice[] = {
int
dissect_x509sat_NamedDay(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,
NamedDay_choice, hf_index, ett_x509sat_NamedDay,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
NamedDay_choice, hf_index, ett_x509sat_NamedDay,
NULL);
return offset;
}
@ -1301,7 +1301,7 @@ const value_string x509sat_XDayOf_vals[] = {
{ 0, NULL }
};
static const ber_choice_t XDayOf_choice[] = {
static const ber_old_choice_t XDayOf_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_first_dayof },
{ 2, BER_CLASS_CON, 2, 0, dissect_second_dayof },
{ 3, BER_CLASS_CON, 3, 0, dissect_third_dayof },
@ -1312,9 +1312,9 @@ static const ber_choice_t XDayOf_choice[] = {
int
dissect_x509sat_XDayOf(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,
XDayOf_choice, hf_index, ett_x509sat_XDayOf,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
XDayOf_choice, hf_index, ett_x509sat_XDayOf,
NULL);
return offset;
}
@ -1330,7 +1330,7 @@ static const value_string x509sat_T_days_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_days_choice[] = {
static const ber_old_choice_t T_days_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay },
{ 2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
@ -1339,9 +1339,9 @@ static const ber_choice_t T_days_choice[] = {
static int
dissect_x509sat_T_days(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_days_choice, hf_index, ett_x509sat_T_days,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_days_choice, hf_index, ett_x509sat_T_days,
NULL);
return offset;
}
@ -1368,14 +1368,14 @@ static int dissect_now(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
}
static const ber_sequence_t T_intWeek_set_of[1] = {
static const ber_old_sequence_t T_intWeek_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intWeek_item },
};
static int
dissect_x509sat_T_intWeek(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_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
return offset;
}
@ -1413,7 +1413,7 @@ static const value_string x509sat_T_weeks_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_weeks_choice[] = {
static const ber_old_choice_t T_weeks_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allWeeks },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intWeek },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitWeek },
@ -1422,9 +1422,9 @@ static const ber_choice_t T_weeks_choice[] = {
static int
dissect_x509sat_T_weeks(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_weeks_choice, hf_index, ett_x509sat_T_weeks,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_weeks_choice, hf_index, ett_x509sat_T_weeks,
NULL);
return offset;
}
@ -1433,14 +1433,14 @@ static int dissect_weeks(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t T_intMonth_set_of[1] = {
static const ber_old_sequence_t T_intMonth_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intMonth_item },
};
static int
dissect_x509sat_T_intMonth(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_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
return offset;
}
@ -1485,7 +1485,7 @@ static const value_string x509sat_T_months_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_months_choice[] = {
static const ber_old_choice_t T_months_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allMonths },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intMonth },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitMonth },
@ -1494,9 +1494,9 @@ static const ber_choice_t T_months_choice[] = {
static int
dissect_x509sat_T_months(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_months_choice, hf_index, ett_x509sat_T_months,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_months_choice, hf_index, ett_x509sat_T_months,
NULL);
return offset;
}
@ -1505,14 +1505,14 @@ static int dissect_months(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
}
static const ber_sequence_t T_years_set_of[1] = {
static const ber_old_sequence_t T_years_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_years_item },
};
static int
dissect_x509sat_T_years(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_years_set_of, hf_index, ett_x509sat_T_years);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
T_years_set_of, hf_index, ett_x509sat_T_years);
return offset;
}
@ -1521,7 +1521,7 @@ static int dissect_years(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
}
static const ber_sequence_t Period_sequence[] = {
static const ber_old_sequence_t Period_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_weeks },
@ -1532,8 +1532,8 @@ static const ber_sequence_t Period_sequence[] = {
int
dissect_x509sat_Period(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,
Period_sequence, hf_index, ett_x509sat_Period);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
Period_sequence, hf_index, ett_x509sat_Period);
return offset;
}
@ -1542,14 +1542,14 @@ static int dissect_periodic_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
}
static const ber_sequence_t SET_OF_Period_set_of[1] = {
static const ber_old_sequence_t SET_OF_Period_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item },
};
static int
dissect_x509sat_SET_OF_Period(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_Period_set_of, hf_index, ett_x509sat_SET_OF_Period);
offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_Period_set_of, hf_index, ett_x509sat_SET_OF_Period);
return offset;
}
@ -1564,7 +1564,7 @@ static const value_string x509sat_T_time_vals[] = {
{ 0, NULL }
};
static const ber_choice_t T_time_choice[] = {
static const ber_old_choice_t T_time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_absolute },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_periodic },
{ 0, 0, 0, 0, NULL }
@ -1572,9 +1572,9 @@ static const ber_choice_t T_time_choice[] = {
static int
dissect_x509sat_T_time(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_time_choice, hf_index, ett_x509sat_T_time,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
T_time_choice, hf_index, ett_x509sat_T_time,
NULL);
return offset;
}
@ -1611,7 +1611,7 @@ static int dissect_timeZone(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
}
static const ber_sequence_t TimeSpecification_sequence[] = {
static const ber_old_sequence_t TimeSpecification_sequence[] = {
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone },
@ -1620,14 +1620,14 @@ static const ber_sequence_t TimeSpecification_sequence[] = {
int
dissect_x509sat_TimeSpecification(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,
TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
return offset;
}
static const ber_sequence_t T_between_sequence[] = {
static const ber_old_sequence_t T_between_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entirely },
@ -1636,8 +1636,8 @@ static const ber_sequence_t T_between_sequence[] = {
static int
dissect_x509sat_T_between(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_between_sequence, hf_index, ett_x509sat_T_between);
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
T_between_sequence, hf_index, ett_x509sat_T_between);
return offset;
}
@ -1653,7 +1653,7 @@ const value_string x509sat_TimeAssertion_vals[] = {
{ 0, NULL }
};
static const ber_choice_t TimeAssertion_choice[] = {
static const ber_old_choice_t TimeAssertion_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_now },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_at },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_between },
@ -1662,9 +1662,9 @@ static const ber_choice_t TimeAssertion_choice[] = {
int
dissect_x509sat_TimeAssertion(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,
TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion,
NULL);
return offset;
}
@ -1676,7 +1676,7 @@ const value_string x509sat_LocaleContextSyntax_vals[] = {
{ 0, NULL }
};
static const ber_choice_t LocaleContextSyntax_choice[] = {
static const ber_old_choice_t LocaleContextSyntax_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_localeID1 },
{ 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_localeID2 },
{ 0, 0, 0, 0, NULL }
@ -1684,9 +1684,9 @@ static const ber_choice_t LocaleContextSyntax_choice[] = {
int
dissect_x509sat_LocaleContextSyntax(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,
LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax,
NULL);
offset = dissect_ber_old_choice(actx, tree, tvb, offset,
LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax,
NULL);
return offset;
}

60
tools/asn2wrs.py
View File

@ -3050,7 +3050,13 @@ class SeqType (SqType):
def eth_type_default_table(self, ectx, tname):
#print "eth_type_default_table(tname='%s')" % (tname)
fname = ectx.eth_type[tname]['ref'][0]
table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n"
if (ectx.Ber()):
if (ectx.NewBer()):
table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n"
else:
table = "static const %(ER)s_old_sequence_t %(TABLE)s[] = {\n"
else:
table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n"
if hasattr(self, 'ext_list'):
ext = 'ASN1_EXTENSION_ROOT'
else:
@ -3080,7 +3086,13 @@ class SeqOfType (SqType):
f = fname + '/' + self.val.name
else:
f = fname + '/' + '_item'
table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n"
if (ectx.Ber()):
if (ectx.NewBer()):
table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n"
else:
table = "static const %(ER)s_old_sequence_t %(TABLE)s[1] = {\n"
else:
table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n"
table += self.out_item(f, self.val, False, 'ASN1_NO_EXTENSIONS', ectx)
table += "};\n"
return table
@ -3130,7 +3142,12 @@ class SequenceOfType (SeqOfType):
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset',
if (ectx.NewBer()):
body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_old_sequence_of', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
elif (ectx.Per() and not self.HasConstraint()):
@ -3182,7 +3199,12 @@ class SetOfType (SeqOfType):
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset',
if (ectx.NewBer()):
body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_old_set_of', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
elif (ectx.Per() and not self.HasConstraint()):
@ -3273,7 +3295,12 @@ class SequenceType (SeqType):
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset',
if(ectx.NewBer()):
body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_old_sequence', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
elif (ectx.Per()):
@ -3306,7 +3333,12 @@ class SetType(SeqType):
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_set', ret='offset',
if(ectx.NewBer()):
body = ectx.eth_fn_call('dissect_%(ER)s_set', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_old_set', ret='offset',
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),))
elif (ectx.Per()):
@ -3489,7 +3521,13 @@ class ChoiceType (Type):
for e in (lst):
if (e.GetTag(ectx)[0] != t):
tagval = False
table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n"
if (ectx.Ber()):
if (ectx.NewBer()):
table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n"
else:
table = "static const %(ER)s_old_choice_t %(TABLE)s[] = {\n"
else:
table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n"
cnt = 0
if hasattr(self, 'ext_list'):
ext = 'ASN1_EXTENSION_ROOT'
@ -3517,7 +3555,13 @@ class ChoiceType (Type):
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset',
if (ectx.NewBer()):
body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset',
par=(('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s'),
('%(VAL_PTR)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_old_choice', ret='offset',
par=(('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s'),
('%(VAL_PTR)s',),))