osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

update of the asn2eth compiler to use the types ber_[choice|sequence]_t instead of ber_[choice|sequence] 

regenerated all dissectors


fixed the choice/sequence struct to use unsigned entities for class and tag
(to reduce some compiler warning and because it should be signed quantities)



svn path=/trunk/; revision=12740
This commit is contained in:
Ronnie Sahlberg 2004-12-13 08:15:34 +00:00
parent 084055c895
commit 8afae320de
47 changed files with 916 additions and 908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/MAP_Dialogue/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-MAP_DialoguePDU.c : ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
python ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
python ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
cp packet-MAP_DialoguePDU.* ../../epan/dissectors

1
asn1/cmip/cmip.cnf
View File

@ -12,6 +12,7 @@ InformationFramework x509if
CMIPAbortInfo
CMIPUserInfo
ROS
InvokeIDType
#.NO_EMIT

1
asn1/cmip/packet-cmip-template.c
View File

@ -35,6 +35,7 @@
#include <string.h>
#include "packet-ber.h"
#include "packet-x509if.h"
#include "packet-cmip.h"
#define PNAME "X711 CMIP"

2
asn1/cms/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-cms.c : ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf
python ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
python ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
cp packet-cms.* ../../epan/dissectors

2
asn1/cms/cms-exp.cnf
View File

@ -11,6 +11,7 @@ SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET
UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET
SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
#.END
#.TYPE_ATTR
@ -26,5 +27,6 @@ SignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL
UnsignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0
IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Countersignature TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
#.END

1
asn1/cms/cms.cnf
View File

@ -13,6 +13,7 @@ InformationFramework x509if
#.EXPORTS
ContentInfo
ContentType
Countersignature
DigestAlgorithmIdentifiers
EncapsulatedContentInfo
IssuerAndSerialNumber

3
asn1/cms/packet-cms-template.c
View File

@ -51,6 +51,9 @@ static int hf_cms_ci_contentType = -1;
/* Initialize the subtree pointers */
#include "packet-cms-ett.c"
static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */
static char object_identifier_id[64]; /*64 chars should be long enough? */
#include "packet-cms-fn.c"

2
asn1/gsmmap/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-gsm_map.c : ../../tools/asn2eth.py GSMMAP.asn packet-gsm_map-template.c packet-gsm_map-template.h gsmmap.cnf
python ../../tools/asn2eth.py -X -b -k -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn
python ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn
cp packet-gsm_map.* ../../epan/dissectors

10
asn1/gsmmap/packet-gsm_map-template.c
View File

@ -558,7 +558,7 @@ static int dissect_absent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
}
static const ber_choice InvokeId_choice[] = {
static const ber_choice_t InvokeId_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeid },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
{ 0, 0, 0, 0, NULL }
@ -575,7 +575,7 @@ static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_gsm_map_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_invokeId);
}
static const ber_sequence InvokePDU_sequence[] = {
static const ber_sequence_t InvokePDU_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
{ BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData },
@ -593,7 +593,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_gsm_map_InvokePDU(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_invoke);
}
static const ber_sequence ReturnResult_result_sequence[] = {
static const ber_sequence_t ReturnResult_result_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
{ BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_returnResultData },
{ 0, 0, 0, NULL }
@ -606,7 +606,7 @@ dissect_returnResult_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return offset;
}
static const ber_sequence ReturnResultPDU_sequence[] = {
static const ber_sequence_t ReturnResultPDU_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_returnResult_result },
{ 0, 0, 0, NULL }
@ -631,7 +631,7 @@ static const value_string GSMMAPPDU_vals[] = {
{ 0, NULL }
};
static const ber_choice GSMMAPPDU_choice[] = {
static const ber_choice_t GSMMAPPDU_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
#ifdef REMOVED

2
asn1/h248/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-h248.c : ../../tools/asn2eth.py MEGACO.asn packet-h248-template.c packet-h248-template.h h248.cnf
python ../../tools/asn2eth.py -X -b -k -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn
python ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn
cp packet-h248.* ../../epan/dissectors

4
asn1/logotype-cert-extn/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-ess.c : ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf
python ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn
../../epan/dissectors/packet-logotypecertextn.c : ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf
python ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn
cp packet-logotypecertextn.* ../../epan/dissectors

2
asn1/ocsp/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-ocsp.c : ../../tools/asn2eth.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf
python ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn
python ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn
cp packet-ocsp.* ../../epan/dissectors

2
asn1/pkixproxy/Makefile
View File

@ -1,5 +1,5 @@
../../epan/dissectors/packet-pkixproxy.c : ../../tools/asn2eth.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf
python ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn
python ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn
cp packet-pkixproxy.* ../../epan/dissectors

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

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-MAP_DialoguePDU.c */
/* ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* Input file: packet-MAP-DialoguePDU-template.c */
@ -122,7 +122,7 @@ static int dissect_originationReference_impl(packet_info *pinfo, proto_tree *tre
return dissect_MAP_DialoguePDU_OriginationReference(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_originationReference);
}
static const ber_sequence T_map_open_sequence[] = {
static const ber_sequence_t T_map_open_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 },
{ 0, 0, 0, NULL }
@ -139,7 +139,7 @@ static int dissect_map_open_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_MAP_DialoguePDU_T_map_open(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_open);
}
static const ber_sequence T_map_accept_sequence[] = {
static const ber_sequence_t T_map_accept_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -154,7 +154,7 @@ static int dissect_map_accept_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_MAP_DialoguePDU_T_map_accept(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_accept);
}
static const ber_sequence T_map_close_sequence[] = {
static const ber_sequence_t T_map_close_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -188,7 +188,7 @@ static int dissect_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_MAP_DialoguePDU_Reason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_reason);
}
static const ber_sequence T_map_refuse_sequence[] = {
static const ber_sequence_t T_map_refuse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason },
{ 0, 0, 0, NULL }
};
@ -271,7 +271,7 @@ static const value_string MAP_UserAbortChoice_vals[] = {
{ 0, NULL }
};
static const ber_choice MAP_UserAbortChoice_choice[] = {
static const ber_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 },
@ -290,7 +290,7 @@ static int dissect_map_UserAbortChoice(packet_info *pinfo, proto_tree *tree, tvb
return dissect_MAP_DialoguePDU_MAP_UserAbortChoice(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_UserAbortChoice);
}
static const ber_sequence T_map_userAbort_sequence[] = {
static const ber_sequence_t T_map_userAbort_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
{ 0, 0, 0, NULL }
};
@ -324,7 +324,7 @@ static int dissect_map_ProviderAbortReason(packet_info *pinfo, proto_tree *tree,
return dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_ProviderAbortReason);
}
static const ber_sequence T_map_providerAbort_sequence[] = {
static const ber_sequence_t T_map_providerAbort_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason },
{ 0, 0, 0, NULL }
};
@ -351,7 +351,7 @@ static const value_string MAP_DialoguePDU_vals[] = {
{ 0, NULL }
};
static const ber_choice MAP_DialoguePDU_choice[] = {
static const ber_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 },
@ -369,7 +369,7 @@ dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb
return offset;
}
static const ber_sequence MAP_OpenInfo_sequence[] = {
static const ber_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 },
{ 0, 0, 0, NULL }
@ -383,7 +383,7 @@ dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, i
return offset;
}
static const ber_sequence MAP_AcceptInfo_sequence[] = {
static const ber_sequence_t MAP_AcceptInfo_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -395,7 +395,7 @@ dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb,
return offset;
}
static const ber_sequence MAP_CloseInfo_sequence[] = {
static const ber_sequence_t MAP_CloseInfo_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -407,7 +407,7 @@ dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb,
return offset;
}
static const ber_sequence MAP_RefuseInfo_sequence[] = {
static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason },
{ 0, 0, 0, NULL }
};
@ -420,7 +420,7 @@ dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb,
return offset;
}
static const ber_sequence MAP_UserAbortInfo_sequence[] = {
static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
{ 0, 0, 0, NULL }
};
@ -468,7 +468,7 @@ dissect_MAP_DialoguePDU_ProcedureCancellationReason(gboolean implicit_tag _U_, t
return offset;
}
static const ber_sequence MAP_ProviderAbortInfo_sequence[] = {
static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason },
{ 0, 0, 0, NULL }
};

2
epan/dissectors/packet-MAP_DialoguePDU.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-MAP_DialoguePDU.h */
/* ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* Input file: packet-MAP-DialoguePDU-template.h */

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

@ -182,7 +182,7 @@ dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *t
offset=dissect_ber_identifier(pinfo, NULL, tvb, offset, &class, &pc, &tag);
offset=dissect_ber_length(pinfo, NULL, tvb, offset, &len, &ind);
if(len>tvb_length_remaining(tvb, offset)){
if(len>(guint32)tvb_length_remaining(tvb, offset)){
/* hmm maybe something bad happened or the frame is short,
since these are not vital outputs just return instead of
throwing en exception.
@ -241,7 +241,7 @@ dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *t
}
/* were there more data to eat? */
if(offset<tvb_length(tvb)){
if(offset<(int)tvb_length(tvb)){
offset=dissect_unknown_ber(pinfo, tvb, offset, tree);
}
@ -276,16 +276,16 @@ call_ber_oid_callback(char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo,
}
static int dissect_ber_sq_of(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
/* 8.1 General rules for encoding */
/* 8.1.2 Identifier octets */
int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag) {
int get_ber_identifier(tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag) {
guint8 id, t;
guint8 tmp_class;
gint8 tmp_class;
gboolean tmp_pc;
guint32 tmp_tag;
gint32 tmp_tag;
id = tvb_get_guint8(tvb, offset);
offset += 1;
@ -316,12 +316,12 @@ int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, g
return offset;
}
int dissect_ber_identifier(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag)
int dissect_ber_identifier(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag)
{
int old_offset = offset;
guint8 tmp_class;
gint8 tmp_class;
gboolean tmp_pc;
guint32 tmp_tag;
gint32 tmp_tag;
offset = get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag);
@ -472,7 +472,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
ber_last_created_item = it;
}
if (out_tvb) {
if(len<=tvb_length_remaining(tvb, offset)){
if(len<=(guint32)tvb_length_remaining(tvb, offset)){
*out_tvb = tvb_new_subset(tvb, offset, len, len);
} else {
*out_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_length_remaining(tvb, offset));
@ -628,10 +628,10 @@ dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off
/* this function dissects a BER sequence
*/
int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) {
guint8 class;
int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
gint8 class;
gboolean pc, ind, ind_field;
guint32 tag;
gint32 tag;
guint32 len;
proto_tree *tree = parent_tree;
proto_item *item = NULL;
@ -691,9 +691,9 @@ printf("SEQUENCE dissect_ber_sequence(%s) entered\n",name);
/* loop over all entries until we reach the end of the sequence */
while (offset < end_offset){
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int hoffset, eoffset, count;
@ -839,13 +839,13 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n",name,coun
* in case it was a CHOICE { } OPTIONAL
*/
int
dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *choice, gint hf_id, gint ett_id)
dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id)
{
guint8 class;
gint8 class;
gboolean pc, ind;
guint32 tag;
gint32 tag;
guint32 len;
const ber_choice *ch;
const ber_choice_t *ch;
proto_tree *tree=parent_tree;
proto_item *item=NULL;
int end_offset, start_offset, count;
@ -1010,9 +1010,9 @@ printf("CHOICE dissect_ber_choice(%s) subdissector ate %d bytes\n",name,count);
int
dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, int name_len)
{
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int end_offset;
char str_arr[256];
@ -1053,10 +1053,10 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
}
#endif
int
dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
guint8 class;
dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int eoffset;
int hoffset = offset;
@ -1118,9 +1118,9 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
/* 8.19 Encoding of an object identifier value */
int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *value_string) {
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 i, len;
int eoffset;
guint8 byte;
@ -1209,10 +1209,10 @@ printf("OBJECT IDENTIFIER dissect_ber_object_identifier(%s) entered\n",name);
return eoffset;
}
static int dissect_ber_sq_of(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) {
guint8 class;
static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
gint8 class;
gboolean pc, ind, ind_field;
guint32 tag;
gint32 tag;
guint32 len;
proto_tree *tree = parent_tree;
proto_item *item = NULL;
@ -1300,9 +1300,9 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name);
/* loop over all entries until we reach the end of the sequence */
while (offset < end_offset){
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int eoffset;
int hoffset, count;
@ -1370,11 +1370,11 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name);
return end_offset;
}
int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) {
int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
return dissect_ber_sq_of(implicit_tag, BER_UNI_TAG_SEQUENCE, pinfo, parent_tree, tvb, offset, seq, hf_id, ett_id);
}
int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) {
int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
return dissect_ber_sq_of(implicit_tag, BER_UNI_TAG_SET, pinfo, parent_tree, tvb, offset, seq, hf_id, ett_id);
}
@ -1383,9 +1383,9 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre
{
char str[32];
const guint8 *tmpstr;
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int end_offset;
@ -1424,9 +1424,9 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre
/* 8.6 Encoding of a bitstring value */
int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb)
{
guint8 class;
gint8 class;
gboolean pc, ind;
guint32 tag;
gint32 tag;
guint32 len;
guint8 pad=0, b0, b1, val;
int end_offset;
@ -1476,7 +1476,7 @@ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree
}
}
if (out_tvb) {
if(len<=tvb_length_remaining(tvb, offset)){
if(len<=(guint32)tvb_length_remaining(tvb, offset)){
*out_tvb = tvb_new_subset(tvb, offset, len, len);
} else {
*out_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_length_remaining(tvb, offset));

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

@ -74,8 +74,8 @@ typedef int (*ber_callback)(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
/* this function dissects the identifier octer of the BER TLV.
* We only handle TAGs (and LENGTHs) that fit inside 32 bit integers.
*/
extern int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag);
extern int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag);
extern int get_ber_identifier(tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag);
extern int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag);
/* this function dissects the identifier octer of the BER TLV.
* We only handle (TAGs and) LENGTHs that fit inside 32 bit integers.
@ -96,35 +96,35 @@ extern int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
#define BER_FLAGS_IMPLTAG 0x00000002
#define BER_FLAGS_NOOWNTAG 0x00000004
#define BER_FLAGS_NOTCHKTAG 0x00000008
typedef struct _ber_sequence {
guint8 class;
guint32 tag;
typedef struct _ber_sequence_t {
gint8 class;
gint32 tag;
guint32 flags;
ber_callback func;
} ber_sequence;
} ber_sequence_t;
/* this function dissects a BER sequence
*/
extern int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
extern int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
typedef struct _ber_choice {
typedef struct _ber_choice_t {
guint32 value;
guint8 class;
guint32 tag;
gint8 class;
gint32 tag;
guint32 flags;
ber_callback func;
} ber_choice;
} ber_choice_t;
/* this function dissects a BER choice
*/
extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *ch, gint hf_id, gint ett_id);
extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id);
/* this function dissects a BER strings
*/
extern int dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
extern int dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len);
@ -134,9 +134,9 @@ extern int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pin
/* this function dissects a BER sequence of
*/
extern int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
extern int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, 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_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
extern int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);

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

@ -42,6 +42,7 @@
#include <string.h>
#include "packet-ber.h"
#include "packet-x509if.h"
#include "packet-cmip.h"
#define PNAME "X711 CMIP"
@ -367,7 +368,7 @@ static int dissect_attributeValue(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cmip_T_attributeValue(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeValue);
}
static const ber_sequence ModificationItem_sequence[] = {
static const ber_sequence_t ModificationItem_sequence[] = {
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributeValue },
@ -420,7 +421,7 @@ static const value_string ObjectClass_vals[] = {
{ 0, NULL }
};
static const ber_choice ObjectClass_choice[] = {
static const ber_choice_t ObjectClass_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ocglobalForm_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_oclocalForm_impl },
{ 0, 0, 0, 0, NULL }
@ -460,7 +461,7 @@ static const value_string ObjectInstance_vals[] = {
{ 0, NULL }
};
static const ber_choice ObjectInstance_choice[] = {
static const ber_choice_t ObjectInstance_choice[] = {
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_distinguishedName_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_nonSpecificForm_impl },
{ 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_localDistinguishedName_impl },
@ -554,7 +555,7 @@ static const value_string AttributeId_vals[] = {
{ 0, NULL }
};
static const ber_choice AttributeId_choice[] = {
static const ber_choice_t AttributeId_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_globalForm_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_localForm_impl },
{ 0, 0, 0, 0, NULL }
@ -580,7 +581,7 @@ static int dissect_attributeIdList_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_cmip_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeIdList_item);
}
static const ber_sequence AttributeIdError_sequence[] = {
static const ber_sequence_t AttributeIdError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeId1 },
{ 0, 0, 0, NULL }
@ -613,7 +614,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_cmip_T_value(FALSE, tvb, offset, pinfo, tree, hf_cmip_value);
}
static const ber_sequence Attribute_sequence[] = {
static const ber_sequence_t Attribute_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_id },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
{ 0, 0, 0, NULL }
@ -667,7 +668,7 @@ static const value_string GetInfoStatus_vals[] = {
{ 0, NULL }
};
static const ber_choice GetInfoStatus_choice[] = {
static const ber_choice_t GetInfoStatus_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeIdError_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl },
{ 0, 0, 0, 0, NULL }
@ -684,7 +685,7 @@ static int dissect_getInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_GetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_getInfoList_item);
}
static const ber_sequence SET_OF_GetInfoStatus_set_of[1] = {
static const ber_sequence_t SET_OF_GetInfoStatus_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_getInfoList_item },
};
@ -699,7 +700,7 @@ static int dissect_getInfoList_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_SET_OF_GetInfoStatus(TRUE, tvb, offset, pinfo, tree, hf_cmip_getInfoList);
}
static const ber_sequence GetListError_sequence[] = {
static const ber_sequence_t GetListError_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -766,7 +767,7 @@ static int dissect_attributeValue1(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_cmip_T_attributeValue1(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeValue1);
}
static const ber_sequence AttributeError_sequence[] = {
static const ber_sequence_t AttributeError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus2 },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId2 },
@ -792,7 +793,7 @@ static const value_string SetInfoStatus_vals[] = {
{ 0, NULL }
};
static const ber_choice SetInfoStatus_choice[] = {
static const ber_choice_t SetInfoStatus_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeError_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl },
{ 0, 0, 0, 0, NULL }
@ -809,7 +810,7 @@ static int dissect_setInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_SetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_setInfoList_item);
}
static const ber_sequence SET_OF_SetInfoStatus_set_of[1] = {
static const ber_sequence_t SET_OF_SetInfoStatus_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_setInfoList_item },
};
@ -824,7 +825,7 @@ static int dissect_setInfoList_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_SET_OF_SetInfoStatus(TRUE, tvb, offset, pinfo, tree, hf_cmip_setInfoList);
}
static const ber_sequence SetListError_sequence[] = {
static const ber_sequence_t SetListError_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -889,7 +890,7 @@ static int dissect_actionType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cmip_T_actionType(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionType);
}
static const ber_sequence NoSuchArgumentAction_sequence[] = {
static const ber_sequence_t NoSuchArgumentAction_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType },
{ 0, 0, 0, NULL }
@ -919,7 +920,7 @@ static int dissect_eventType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cmip_T_eventType(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventType);
}
static const ber_sequence NoSuchArgumentEvent_sequence[] = {
static const ber_sequence_t NoSuchArgumentEvent_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType },
{ 0, 0, 0, NULL }
@ -943,7 +944,7 @@ static const value_string NoSuchArgument_vals[] = {
{ 0, NULL }
};
static const ber_choice NoSuchArgument_choice[] = {
static const ber_choice_t NoSuchArgument_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionId_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventId_impl },
{ 0, 0, 0, 0, NULL }
@ -986,7 +987,7 @@ static int dissect_actionInfoArg(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cmip_T_actionInfoArg(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionInfoArg);
}
static const ber_sequence ActionInfo_sequence[] = {
static const ber_sequence_t ActionInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType3 },
{ BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_actionInfoArg },
{ 0, 0, 0, NULL }
@ -1033,7 +1034,7 @@ static int dissect_eventInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cmip_T_eventInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventInfo);
}
static const ber_sequence InvalidArgumentValueEventValue_sequence[] = {
static const ber_sequence_t InvalidArgumentValueEventValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType1 },
{ BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventInfo },
{ 0, 0, 0, NULL }
@ -1057,7 +1058,7 @@ static const value_string InvalidArgumentValue_vals[] = {
{ 0, NULL }
};
static const ber_choice InvalidArgumentValue_choice[] = {
static const ber_choice_t InvalidArgumentValue_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionValue_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventValue_impl },
{ 0, 0, 0, 0, NULL }
@ -1082,7 +1083,7 @@ static const value_string ErrorInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice ErrorInfo_choice[] = {
static const ber_choice_t ErrorInfo_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType1 },
{ 1, BER_CLASS_CON, 0, 0, dissect_actionArgument },
{ 2, BER_CLASS_CON, 1, 0, dissect_argumentValue },
@ -1100,7 +1101,7 @@ static int dissect_errorInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cmip_ErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_errorInfo1);
}
static const ber_sequence ActionErrorInfo_sequence[] = {
static const ber_sequence_t ActionErrorInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus1 },
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorInfo1 },
{ 0, 0, 0, NULL }
@ -1117,7 +1118,7 @@ static int dissect_actionErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_cmip_ActionErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionErrorInfo);
}
static const ber_sequence ActionError_sequence[] = {
static const ber_sequence_t ActionError_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1162,7 +1163,7 @@ static int dissect_errorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cmip_T_errorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_errorInfo);
}
static const ber_sequence SpecificErrorInfo_sequence[] = {
static const ber_sequence_t SpecificErrorInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_errorId },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_errorInfo },
{ 0, 0, 0, NULL }
@ -1179,7 +1180,7 @@ static int dissect_specificErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_cmip_SpecificErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_specificErrorInfo);
}
static const ber_sequence ProcessingFailure_sequence[] = {
static const ber_sequence_t ProcessingFailure_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, 0, dissect_specificErrorInfo },
@ -1214,7 +1215,7 @@ static int dissect_deleteErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_cmip_T_deleteErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_deleteErrorInfo);
}
static const ber_sequence DeleteError_sequence[] = {
static const ber_sequence_t DeleteError_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1233,7 +1234,7 @@ static int dissect_deleteError_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_DeleteError(TRUE, tvb, offset, pinfo, tree, hf_cmip_deleteError);
}
static const ber_sequence SET_OF_Attribute_set_of[1] = {
static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
};
@ -1248,7 +1249,7 @@ static int dissect_attributeList_impl(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_cmip_SET_OF_Attribute(TRUE, tvb, offset, pinfo, tree, hf_cmip_attributeList);
}
static const ber_sequence SetResult_sequence[] = {
static const ber_sequence_t SetResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1339,7 +1340,7 @@ static const value_string Scope_vals[] = {
{ 0, NULL }
};
static const ber_choice Scope_choice[] = {
static const ber_choice_t Scope_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_namedNumbers },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_individualLevels_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseToNthLevel_impl },
@ -1365,7 +1366,7 @@ static const value_string T_substrings_item_vals[] = {
{ 0, NULL }
};
static const ber_choice T_substrings_item_choice[] = {
static const ber_choice_t T_substrings_item_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initialString_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_anyString_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_finalString_impl },
@ -1383,7 +1384,7 @@ static int dissect_substrings_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_cmip_T_substrings_item(FALSE, tvb, offset, pinfo, tree, hf_cmip_substrings_item);
}
static const ber_sequence T_substrings_sequence_of[1] = {
static const ber_sequence_t T_substrings_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substrings_item },
};
@ -1411,7 +1412,7 @@ static const value_string FilterItem_vals[] = {
{ 0, NULL }
};
static const ber_choice FilterItem_choice[] = {
static const ber_choice_t FilterItem_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_substrings_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_greaterOrEqual_impl },
@ -1434,7 +1435,7 @@ static int dissect_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmip_FilterItem(FALSE, tvb, offset, pinfo, tree, hf_cmip_item);
}
static const ber_sequence SET_OF_CMISFilter_set_of[1] = {
static const ber_sequence_t SET_OF_CMISFilter_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
@ -1461,7 +1462,7 @@ static const value_string CMISFilter_vals[] = {
{ 0, NULL }
};
static const ber_choice CMISFilter_choice[] = {
static const ber_choice_t CMISFilter_choice[] = {
{ 8, BER_CLASS_CON, 8, 0, dissect_item },
{ 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_and_impl },
{ 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_or_impl },
@ -1477,7 +1478,7 @@ dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
return offset;
}
static const ber_sequence SET_OF_ModificationItem_set_of[1] = {
static const ber_sequence_t SET_OF_ModificationItem_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modificationList_item },
};
@ -1492,7 +1493,7 @@ static int dissect_modificationList_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_cmip_SET_OF_ModificationItem(TRUE, tvb, offset, pinfo, tree, hf_cmip_modificationList);
}
static const ber_sequence SetArgument_sequence[] = {
static const ber_sequence_t SetArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@ -1511,7 +1512,7 @@ dissect_cmip_SetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
return offset;
}
static const ber_sequence GetResult_sequence[] = {
static const ber_sequence_t GetResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1556,7 +1557,7 @@ static int dissect_actionReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_cmip_T_actionReplyInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionReplyInfo);
}
static const ber_sequence ActionReply_sequence[] = {
static const ber_sequence_t ActionReply_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType2 },
{ BER_CLASS_CON, 4, 0, dissect_actionReplyInfo },
{ 0, 0, 0, NULL }
@ -1573,7 +1574,7 @@ static int dissect_actionReply_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_ActionReply(TRUE, tvb, offset, pinfo, tree, hf_cmip_actionReply);
}
static const ber_sequence ActionResult_sequence[] = {
static const ber_sequence_t ActionResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1592,7 +1593,7 @@ static int dissect_actionResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_cmip_ActionResult(TRUE, tvb, offset, pinfo, tree, hf_cmip_actionResult);
}
static const ber_sequence DeleteResult_sequence[] = {
static const ber_sequence_t DeleteResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1624,7 +1625,7 @@ static const value_string LinkedReplyArgument_vals[] = {
{ 0, NULL }
};
static const ber_choice LinkedReplyArgument_choice[] = {
static const ber_choice_t LinkedReplyArgument_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_getResult_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getListError_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_setResult_impl },
@ -1671,7 +1672,7 @@ static int dissect_eventReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cmip_T_eventReplyInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventReplyInfo);
}
static const ber_sequence EventReply_sequence[] = {
static const ber_sequence_t EventReply_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType2 },
{ BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventReplyInfo },
{ 0, 0, 0, NULL }
@ -1688,7 +1689,7 @@ static int dissect_eventReply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cmip_EventReply(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventReply);
}
static const ber_sequence EventReportResult_sequence[] = {
static const ber_sequence_t EventReportResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1731,7 +1732,7 @@ static int dissect_eventInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cmip_T_eventInfo1(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventInfo1);
}
static const ber_sequence EventReportArgument_sequence[] = {
static const ber_sequence_t EventReportArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventTime_impl },
@ -1748,7 +1749,7 @@ dissect_cmip_EventReportArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence DeleteArgument_sequence[] = {
static const ber_sequence_t DeleteArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@ -1773,7 +1774,7 @@ static const value_string T_managedOrSuperiorObjectInstance_vals[] = {
{ 0, NULL }
};
static const ber_choice T_managedOrSuperiorObjectInstance_choice[] = {
static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = {
{ -1/*choice*/, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_managedObjectInstance },
{ 8, BER_CLASS_CON, 8, 0, dissect_superiorObjectInstance },
{ 0, 0, 0, 0, NULL }
@ -1790,7 +1791,7 @@ static int dissect_managedOrSuperiorObjectInstance(packet_info *pinfo, proto_tre
return dissect_cmip_T_managedOrSuperiorObjectInstance(FALSE, tvb, offset, pinfo, tree, hf_cmip_managedOrSuperiorObjectInstance);
}
static const ber_sequence CreateArgument_sequence[] = {
static const ber_sequence_t CreateArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedOrSuperiorObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@ -1807,7 +1808,7 @@ dissect_cmip_CreateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence CreateResult_sequence[] = {
static const ber_sequence_t CreateResult_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@ -1823,7 +1824,7 @@ dissect_cmip_CreateResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
return offset;
}
static const ber_sequence ActionArgument_sequence[] = {
static const ber_sequence_t ActionArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@ -1842,7 +1843,7 @@ dissect_cmip_ActionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence BaseManagedObjectId_sequence[] = {
static const ber_sequence_t BaseManagedObjectId_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ 0, 0, 0, NULL }
@ -1856,7 +1857,7 @@ dissect_cmip_BaseManagedObjectId(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence SET_OF_AttributeId_set_of[1] = {
static const ber_sequence_t SET_OF_AttributeId_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeIdList_item },
};
@ -1871,7 +1872,7 @@ static int dissect_attributeIdList_impl(packet_info *pinfo, proto_tree *tree, tv
return dissect_cmip_SET_OF_AttributeId(TRUE, tvb, offset, pinfo, tree, hf_cmip_attributeIdList);
}
static const ber_sequence GetArgument_sequence[] = {
static const ber_sequence_t GetArgument_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@ -2004,7 +2005,7 @@ static int dissect_opcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cmip_Opcode(FALSE, tvb, offset, pinfo, tree, hf_cmip_opcode);
}
static const ber_sequence ReturnResultBody_sequence[] = {
static const ber_sequence_t ReturnResultBody_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_argument },
{ 0, 0, 0, NULL }
@ -2057,7 +2058,7 @@ static const value_string InvokeId_vals[] = {
{ 0, NULL }
};
static const ber_choice InvokeId_choice[] = {
static const ber_choice_t InvokeId_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present2 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
{ 0, 0, 0, 0, NULL }
@ -2084,7 +2085,7 @@ static const value_string InvokeLinkedId_vals[] = {
{ 0, NULL }
};
static const ber_choice InvokeLinkedId_choice[] = {
static const ber_choice_t InvokeLinkedId_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_present1_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_absent_impl },
{ 0, 0, 0, 0, NULL }
@ -2102,14 +2103,14 @@ static int dissect_linkedId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
int
dissect_cmip_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_cmip_InvokeId(implicit_tag, tvb, offset, pinfo, tree, hf_index);
return offset;
}
static const ber_sequence Invoke_sequence[] = {
static const ber_sequence_t Invoke_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_linkedId },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
@ -2132,7 +2133,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_cmip_Invoke(TRUE, tvb, offset, pinfo, tree, hf_cmip_invoke);
}
static const ber_sequence ReturnResult_sequence[] = {
static const ber_sequence_t ReturnResult_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_rRBody },
{ 0, 0, 0, NULL }
@ -2153,7 +2154,7 @@ static int dissect_returnResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_cmip_ReturnResult(TRUE, tvb, offset, pinfo, tree, hf_cmip_returnResult);
}
static const ber_sequence ReturnError_sequence[] = {
static const ber_sequence_t ReturnError_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ 0, 0, 0, NULL }
};
@ -2297,7 +2298,7 @@ static const value_string RejectProb_vals[] = {
{ 0, NULL }
};
static const ber_choice RejectProb_choice[] = {
static const ber_choice_t RejectProb_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 },
@ -2316,7 +2317,7 @@ static int dissect_rejectProblem(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cmip_RejectProb(FALSE, tvb, offset, pinfo, tree, hf_cmip_rejectProblem);
}
static const ber_sequence Reject_sequence[] = {
static const ber_sequence_t Reject_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectProblem },
{ 0, 0, 0, NULL }
@ -2346,7 +2347,7 @@ const value_string ROS_vals[] = {
{ 0, NULL }
};
static const ber_choice ROS_choice[] = {
static const ber_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 },
@ -2384,7 +2385,7 @@ static int dissect_abortSource_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmip_CMIPAbortSource(TRUE, tvb, offset, pinfo, tree, hf_cmip_abortSource);
}
static const ber_sequence CMIPAbortInfo_sequence[] = {
static const ber_sequence_t CMIPAbortInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abortSource_impl },
{ 0, 0, 0, NULL }
};
@ -2439,7 +2440,7 @@ static int dissect_protocolVersion_impl(packet_info *pinfo, proto_tree *tree, tv
return dissect_cmip_ProtocolVersion(TRUE, tvb, offset, pinfo, tree, hf_cmip_protocolVersion);
}
static const ber_sequence CMIPUserInfo_sequence[] = {
static const ber_sequence_t CMIPUserInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocolVersion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_functionalUnits_impl },
{ 0, 0, 0, NULL }

1
epan/dissectors/packet-cmip.h
View File

@ -37,6 +37,7 @@
/*--- Included file: packet-cmip-exp.h ---*/
extern const value_string ROS_vals[];
int dissect_cmip_InvokeIDType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cmip_ROS(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cmip_CMIPUserInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);

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

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-cms.c */
/* ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* Input file: packet-cms-template.c */
@ -183,6 +183,9 @@ static gint ett_cms_ExtendedCertificateInfo = -1;
/*--- End of included file: packet-cms-ett.c ---*/
static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */
static char object_identifier_id[64]; /*64 chars should be long enough? */
@ -247,7 +250,7 @@ static int dissect_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_content(FALSE, tvb, offset, pinfo, tree, hf_cms_content);
}
static const ber_sequence ContentInfo_sequence[] = {
static const ber_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 }
@ -299,7 +302,7 @@ static int dissect_digestAlgorithm_impl(packet_info *pinfo, proto_tree *tree, tv
return dissect_cms_DigestAlgorithmIdentifier(TRUE, tvb, offset, pinfo, tree, hf_cms_digestAlgorithm);
}
static const ber_sequence DigestAlgorithmIdentifiers_set_of[1] = {
static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DigestAlgorithmIdentifiers_item },
};
@ -349,7 +352,7 @@ static int dissect_eContent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_eContent(FALSE, tvb, offset, pinfo, tree, hf_cms_eContent);
}
static const ber_sequence EncapsulatedContentInfo_sequence[] = {
static const ber_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 }
@ -378,7 +381,7 @@ static int dissect_attrType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_cms_attrType);
}
static const ber_sequence Attribute_sequence[] = {
static const ber_sequence_t Attribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrType },
{ 0, 0, 0, NULL }
};
@ -406,7 +409,7 @@ static int dissect_UnauthAttributes_item(packet_info *pinfo, proto_tree *tree, t
return dissect_cms_Attribute(FALSE, tvb, offset, pinfo, tree, hf_cms_UnauthAttributes_item);
}
static const ber_sequence UnauthAttributes_set_of[1] = {
static const ber_sequence_t UnauthAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnauthAttributes_item },
};
@ -424,7 +427,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cms_UnauthAttributes(FALSE, tvb, offset, pinfo, tree, hf_cms_attributes);
}
static const ber_sequence ExtendedCertificateInfo_sequence[] = {
static const ber_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 },
@ -466,7 +469,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_Signature(FALSE, tvb, offset, pinfo, tree, hf_cms_signature);
}
static const ber_sequence ExtendedCertificate_sequence[] = {
static const ber_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 },
@ -492,7 +495,7 @@ static const value_string CertificateChoices_vals[] = {
{ 0, NULL }
};
static const ber_choice CertificateChoices_choice[] = {
static const ber_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 },
@ -510,7 +513,7 @@ static int dissect_CertificateSet_item(packet_info *pinfo, proto_tree *tree, tvb
return dissect_cms_CertificateChoices(FALSE, tvb, offset, pinfo, tree, hf_cms_CertificateSet_item);
}
static const ber_sequence CertificateSet_set_of[1] = {
static const ber_sequence_t CertificateSet_set_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item },
};
@ -528,7 +531,7 @@ static int dissect_certs_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cms_CertificateSet(TRUE, tvb, offset, pinfo, tree, hf_cms_certs);
}
static const ber_sequence CertificateRevocationLists_set_of[1] = {
static const ber_sequence_t CertificateRevocationLists_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificateRevocationLists_item },
};
@ -543,7 +546,7 @@ static int dissect_crls_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_CertificateRevocationLists(TRUE, tvb, offset, pinfo, tree, hf_cms_crls);
}
static const ber_sequence IssuerAndSerialNumber_sequence[] = {
static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
@ -582,7 +585,7 @@ const value_string SignerIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice SignerIdentifier_choice[] = {
static const ber_choice_t SignerIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl },
{ 0, 0, 0, 0, NULL }
@ -599,7 +602,7 @@ static int dissect_sid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cms_SignerIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_sid);
}
static const ber_sequence SignedAttributes_set_of[1] = {
static const ber_sequence_t SignedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignedAttributes_item },
};
@ -626,7 +629,7 @@ static int dissect_signatureValue(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cms_SignatureValue(FALSE, tvb, offset, pinfo, tree, hf_cms_signatureValue);
}
static const ber_sequence UnsignedAttributes_set_of[1] = {
static const ber_sequence_t UnsignedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnsignedAttributes_item },
};
@ -641,7 +644,7 @@ static int dissect_unsignedAttrs_impl(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_cms_UnsignedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unsignedAttrs);
}
static const ber_sequence SignerInfo_sequence[] = {
static const ber_sequence_t SignerInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
@ -663,7 +666,7 @@ static int dissect_SignerInfos_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cms_SignerInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_SignerInfos_item);
}
static const ber_sequence SignerInfos_set_of[1] = {
static const ber_sequence_t SignerInfos_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignerInfos_item },
};
@ -678,7 +681,7 @@ static int dissect_signerInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_cms_SignerInfos(FALSE, tvb, offset, pinfo, tree, hf_cms_signerInfos);
}
static const ber_sequence SignedData_sequence[] = {
static const ber_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 },
@ -696,7 +699,7 @@ dissect_cms_SignedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
return offset;
}
static const ber_sequence OriginatorInfo_sequence[] = {
static const ber_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 }
@ -720,7 +723,7 @@ static const value_string RecipientIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice RecipientIdentifier_choice[] = {
static const ber_choice_t RecipientIdentifier_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl },
{ 0, 0, 0, 0, NULL }
@ -760,7 +763,7 @@ static int dissect_encryptedKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_cms_EncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedKey);
}
static const ber_sequence KeyTransRecipientInfo_sequence[] = {
static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
@ -792,7 +795,7 @@ static int dissect_publicKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_publicKey);
}
static const ber_sequence OriginatorPublicKey_sequence[] = {
static const ber_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 }
@ -817,7 +820,7 @@ static const value_string OriginatorIdentifierOrKey_vals[] = {
{ 0, NULL }
};
static const ber_choice OriginatorIdentifierOrKey_choice[] = {
static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
{ 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl },
{ 2, BER_CLASS_CON, 1, 0, dissect_originatorKey_impl },
@ -884,7 +887,7 @@ static int dissect_keyAttr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_keyAttr(FALSE, tvb, offset, pinfo, tree, hf_cms_keyAttr);
}
static const ber_sequence OtherKeyAttribute_sequence[] = {
static const ber_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 }
@ -901,7 +904,7 @@ static int dissect_other(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_cms_OtherKeyAttribute(FALSE, tvb, offset, pinfo, tree, hf_cms_other);
}
static const ber_sequence RecipientKeyIdentifier_sequence[] = {
static const ber_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 },
@ -926,7 +929,7 @@ static const value_string KeyAgreeRecipientIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice KeyAgreeRecipientIdentifier_choice[] = {
static const ber_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 }
@ -943,7 +946,7 @@ static int dissect_rekRid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cms_KeyAgreeRecipientIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_rekRid);
}
static const ber_sequence RecipientEncryptedKey_sequence[] = {
static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
{ -1/*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 }
@ -960,7 +963,7 @@ static int dissect_RecipientEncryptedKeys_item(packet_info *pinfo, proto_tree *t
return dissect_cms_RecipientEncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientEncryptedKeys_item);
}
static const ber_sequence RecipientEncryptedKeys_sequence_of[1] = {
static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientEncryptedKeys_item },
};
@ -975,7 +978,7 @@ static int dissect_recipientEncryptedKeys(packet_info *pinfo, proto_tree *tree,
return dissect_cms_RecipientEncryptedKeys(FALSE, tvb, offset, pinfo, tree, hf_cms_recipientEncryptedKeys);
}
static const ber_sequence KeyAgreeRecipientInfo_sequence[] = {
static const ber_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 },
@ -1007,7 +1010,7 @@ static int dissect_keyIdentifier(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_keyIdentifier);
}
static const ber_sequence KEKIdentifier_sequence[] = {
static const ber_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 },
@ -1025,7 +1028,7 @@ static int dissect_kekid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_cms_KEKIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_kekid);
}
static const ber_sequence KEKRecipientInfo_sequence[] = {
static const ber_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 },
@ -1052,7 +1055,7 @@ static const value_string RecipientInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice RecipientInfo_choice[] = {
static const ber_choice_t RecipientInfo_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri },
{ 1, BER_CLASS_CON, 1, 0, dissect_kari_impl },
{ 2, BER_CLASS_CON, 2, 0, dissect_kekri_impl },
@ -1070,7 +1073,7 @@ static int dissect_RecipientInfos_item(packet_info *pinfo, proto_tree *tree, tvb
return dissect_cms_RecipientInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientInfos_item);
}
static const ber_sequence RecipientInfos_set_of[1] = {
static const ber_sequence_t RecipientInfos_set_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item },
};
@ -1108,7 +1111,7 @@ static int dissect_encryptedContent_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_cms_EncryptedContent(TRUE, tvb, offset, pinfo, tree, hf_cms_encryptedContent);
}
static const ber_sequence EncryptedContentInfo_sequence[] = {
static const ber_sequence_t EncryptedContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType1 },
{ 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 },
@ -1126,7 +1129,7 @@ static int dissect_encryptedContentInfo(packet_info *pinfo, proto_tree *tree, tv
return dissect_cms_EncryptedContentInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedContentInfo);
}
static const ber_sequence UnprotectedAttributes_set_of[1] = {
static const ber_sequence_t UnprotectedAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnprotectedAttributes_item },
};
@ -1141,7 +1144,7 @@ static int dissect_unprotectedAttrs_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_cms_UnprotectedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unprotectedAttrs);
}
static const ber_sequence EnvelopedData_sequence[] = {
static const ber_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 },
@ -1170,7 +1173,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cms_Digest(FALSE, tvb, offset, pinfo, tree, hf_cms_digest);
}
static const ber_sequence DigestedData_sequence[] = {
static const ber_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 },
@ -1186,7 +1189,7 @@ dissect_cms_DigestedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
return offset;
}
static const ber_sequence EncryptedData_sequence[] = {
static const ber_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 },
@ -1212,7 +1215,7 @@ static int dissect_macAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_cms_MessageAuthenticationCodeAlgorithm(FALSE, tvb, offset, pinfo, tree, hf_cms_macAlgorithm);
}
static const ber_sequence AuthAttributes_set_of[1] = {
static const ber_sequence_t AuthAttributes_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthAttributes_item },
};
@ -1239,7 +1242,7 @@ static int dissect_mac(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cms_MessageAuthenticationCode(FALSE, tvb, offset, pinfo, tree, hf_cms_mac);
}
static const ber_sequence AuthenticatedData_sequence[] = {
static const ber_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 },
@ -1261,7 +1264,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
}
static int
int
dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_cms_SignerInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index);

3
epan/dissectors/packet-cms.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-cms.h */
/* ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* Input file: packet-cms-template.h */
@ -49,6 +49,7 @@ int dissect_cms_SignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offse
int dissect_cms_UnsignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cms_SignatureValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_cms_Countersignature(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
/*--- End of included file: packet-cms-exp.h ---*/

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

@ -197,7 +197,7 @@ static int dissect_allOrFirstTier_impl(packet_info *pinfo, proto_tree *tree, tvb
return dissect_ess_AllOrFirstTier(TRUE, tvb, offset, pinfo, tree, hf_ess_allOrFirstTier);
}
static const ber_sequence SEQUNCE_OF_GeneralNames_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_GeneralNames_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item },
};
@ -228,7 +228,7 @@ static const value_string ReceiptsFrom_vals[] = {
{ 0, NULL }
};
static const ber_choice ReceiptsFrom_choice[] = {
static const ber_choice_t ReceiptsFrom_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_allOrFirstTier_impl },
{ 1, BER_CLASS_CON, 1, 0, dissect_receiptList_impl },
{ 0, 0, 0, 0, NULL }
@ -245,7 +245,7 @@ static int dissect_receiptsFrom(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_ess_ReceiptsFrom(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsFrom);
}
static const ber_sequence ReceiptRequest_sequence[] = {
static const ber_sequence_t ReceiptRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo },
@ -289,7 +289,7 @@ static int dissect_originatorSignatureValue(packet_info *pinfo, proto_tree *tree
return dissect_ess_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ess_originatorSignatureValue);
}
static const ber_sequence Receipt_sequence[] = {
static const ber_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 },
@ -321,7 +321,7 @@ static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ess_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_ess_utf8String);
}
static const ber_sequence ContentHints_sequence[] = {
static const ber_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 }
@ -344,7 +344,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
return offset;
}
static const ber_sequence ContentReference_sequence[] = {
static const ber_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 },
@ -407,7 +407,7 @@ static const value_string ESSPrivacyMark_vals[] = {
{ 0, NULL }
};
static const ber_choice ESSPrivacyMark_choice[] = {
static const ber_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 }
@ -447,7 +447,7 @@ static int dissect_value_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ess_T_value(TRUE, tvb, offset, pinfo, tree, hf_ess_value);
}
static const ber_sequence SecurityCategory_sequence[] = {
static const ber_sequence_t SecurityCategory_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
{ 0, 0, 0, NULL }
@ -464,7 +464,7 @@ static int dissect_SecurityCategories_item(packet_info *pinfo, proto_tree *tree,
return dissect_ess_SecurityCategory(FALSE, tvb, offset, pinfo, tree, hf_ess_SecurityCategories_item);
}
static const ber_sequence SecurityCategories_set_of[1] = {
static const ber_sequence_t SecurityCategories_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item },
};
@ -483,7 +483,7 @@ static const value_string EntityIdentifier_vals[] = {
{ 0, NULL }
};
static const ber_choice EntityIdentifier_choice[] = {
static const ber_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 }
@ -533,7 +533,7 @@ static const value_string MLReceiptPolicy_vals[] = {
{ 0, NULL }
};
static const ber_choice MLReceiptPolicy_choice[] = {
static const ber_choice_t MLReceiptPolicy_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_none_impl },
{ 1, BER_CLASS_CON, 1, 0, dissect_insteadOf_impl },
{ 2, BER_CLASS_CON, 2, 0, dissect_inAdditionTo_impl },
@ -551,7 +551,7 @@ static int dissect_mlReceiptPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_ess_MLReceiptPolicy(FALSE, tvb, offset, pinfo, tree, hf_ess_mlReceiptPolicy);
}
static const ber_sequence MLData_sequence[] = {
static const ber_sequence_t MLData_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy },
@ -569,7 +569,7 @@ static int dissect_MLExpansionHistory_item(packet_info *pinfo, proto_tree *tree,
return dissect_ess_MLData(FALSE, tvb, offset, pinfo, tree, hf_ess_MLExpansionHistory_item);
}
static const ber_sequence MLExpansionHistory_sequence_of[1] = {
static const ber_sequence_t MLExpansionHistory_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MLExpansionHistory_item },
};
@ -593,7 +593,7 @@ static int dissect_certHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ess_Hash(FALSE, tvb, offset, pinfo, tree, hf_ess_certHash);
}
static const ber_sequence IssuerSerial_sequence[] = {
static const ber_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 }
@ -610,7 +610,7 @@ static int dissect_issuerSerial(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_ess_IssuerSerial(FALSE, tvb, offset, pinfo, tree, hf_ess_issuerSerial);
}
static const ber_sequence ESSCertID_sequence[] = {
static const ber_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 }
@ -627,7 +627,7 @@ static int dissect_certs_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ess_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs_item);
}
static const ber_sequence SEQUNCE_OF_ESSCertID_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ESSCertID_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
};
@ -642,7 +642,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_ess_SEQUNCE_OF_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs);
}
static const ber_sequence SEQUNCE_OF_PolicyInformation_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_PolicyInformation_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item },
};
@ -657,7 +657,7 @@ static int dissect_policies(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ess_SEQUNCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies);
}
static const ber_sequence SigningCertificate_sequence[] = {
static const ber_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 }

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

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-gsm_map.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-gsm_map.h */
/* ../../tools/asn2eth.py -X -b -k -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
/* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
/* Input file: packet-gsm_map-template.h */

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

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-h248.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-h248.h */
/* ../../tools/asn2eth.py -X -b -k -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
/* Input file: packet-h248-template.h */

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

@ -1332,7 +1332,7 @@ static int dissect_krb5_SAFE(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
static int dissect_krb5_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
static int dissect_krb5_ERROR(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
static const ber_choice kerberos_applications_choice[] = {
static const ber_choice_t kerberos_applications_choice[] = {
{ KRB5_MSG_AUTHENTICATOR, BER_CLASS_APP, KRB5_MSG_AUTHENTICATOR, 0, dissect_krb5_Authenticator },
{ KRB5_MSG_ENC_TICKET_PART, BER_CLASS_APP, KRB5_MSG_ENC_TICKET_PART, 0, dissect_krb5_EncTicketPart },
{ KRB5_MSG_AS_REQ, BER_CLASS_APP, KRB5_MSG_AS_REQ, 0, dissect_krb5_KDC_REQ },
@ -1548,7 +1548,7 @@ dissect_krb5_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
}
return offset;
}
static ber_sequence etype_sequence_of[1] = {
static ber_sequence_t etype_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_krb5_etype },
};
static int
@ -1665,7 +1665,7 @@ static int dissect_krb5_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *
offset+=len;
return offset;
}
static ber_sequence HostAddress_sequence[] = {
static ber_sequence_t HostAddress_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_krb5_addr_type },
{ BER_CLASS_CON, 1, 0, dissect_krb5_address },
{ 0, 0, 0, NULL }
@ -1694,7 +1694,7 @@ dissect_krb5_s_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
* }
*
*/
static ber_sequence HostAddresses_sequence_of[1] = {
static ber_sequence_t HostAddresses_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_HostAddress },
};
static int
@ -1771,7 +1771,7 @@ dissect_krb5_name_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return offset;
}
static ber_sequence name_stringe_sequence_of[1] = {
static ber_sequence_t name_stringe_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_NOOWNTAG, dissect_krb5_name_string },
};
static int
@ -1782,7 +1782,7 @@ dissect_krb5_name_strings(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return offset;
}
static ber_sequence PrincipalName_sequence[] = {
static ber_sequence_t PrincipalName_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_krb5_name_type },
{ BER_CLASS_CON, 1, 0, dissect_krb5_name_strings },
{ 0, 0, 0, NULL }
@ -1829,7 +1829,7 @@ dissect_krb5_PA_PAC_REQUEST_flag(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
static ber_sequence PA_PAC_REQUEST_sequence[] = {
static ber_sequence_t PA_PAC_REQUEST_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_krb5_PA_PAC_REQUEST_flag },
{ 0, 0, 0, NULL }
};
@ -1888,7 +1888,7 @@ dissect_krb5_patimestamp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_patimestamp);
return offset;
}
static const ber_sequence PA_ENC_TS_ENC_sequence[] = {
static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_krb5_patimestamp },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_pausec },
{ 0, 0, 0, NULL }
@ -1939,7 +1939,7 @@ dissect_krb5_encrypted_PA_ENC_TIMESTAMP(packet_info *pinfo, proto_tree *tree, tv
#endif
return offset;
}
static ber_sequence PA_ENC_TIMESTAMP_sequence[] = {
static ber_sequence_t PA_ENC_TIMESTAMP_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_PA_ENC_TIMESTAMP_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -1965,7 +1965,7 @@ dissect_krb5_etype_info_salt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return offset;
}
static ber_sequence PA_ENCTYPE_INFO_ENTRY_sequence[] = {
static ber_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -1980,7 +1980,7 @@ dissect_krb5_PA_ENCTYPE_INFO_ENTRY(packet_info *pinfo, proto_tree *tree, tvbuff_
return offset;
}
static ber_sequence PA_ENCTYPE_INFO_sequence_of[1] = {
static ber_sequence_t PA_ENCTYPE_INFO_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO_ENTRY },
};
static int
@ -2051,7 +2051,7 @@ dissect_krb5_PA_DATA_value(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t
/*qqq*/
}
static ber_sequence PA_DATA_sequence[] = {
static ber_sequence_t PA_DATA_sequence[] = {
{ BER_CLASS_CON, 1, 0, dissect_krb5_PA_DATA_type },
{ BER_CLASS_CON, 2, 0, dissect_krb5_PA_DATA_value },
{ 0, 0, 0, NULL }
@ -2071,7 +2071,7 @@ dissect_krb5_PA_DATA(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of
* padata[3] SEQUENCE OF PA-DATA OPTIONAL,
*
*/
static ber_sequence PA_DATA_sequence_of[1] = {
static ber_sequence_t PA_DATA_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_DATA },
};
static int
@ -2197,7 +2197,7 @@ dissect_krb5_keyvalue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
* keytype [0] int32
* keyvalue [1] octet string
*/
static ber_sequence EncryptionKey_sequence[] = {
static ber_sequence_t EncryptionKey_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_keytype },
{ BER_CLASS_CON, 1, 0,
@ -2449,7 +2449,7 @@ dissect_krb5_IF_RELEVANT_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
}
return offset;
}
static ber_sequence IF_RELEVANT_item_sequence[] = {
static ber_sequence_t IF_RELEVANT_item_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_IF_RELEVANT_type },
{ BER_CLASS_CON, 1, 0,
@ -2464,7 +2464,7 @@ dissect_krb5_IF_RELEVANT_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return offset;
}
static ber_sequence IF_RELEVANT_sequence_of[1] = {
static ber_sequence_t IF_RELEVANT_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_IF_RELEVANT_item },
};
@ -2505,7 +2505,7 @@ dissect_krb5_advalue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of
* ad-type [0] int32
* ad-data [1] octet string
*/
static ber_sequence AuthorizationData_item_sequence[] = {
static ber_sequence_t AuthorizationData_item_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_adtype },
{ BER_CLASS_CON, 1, 0,
@ -2520,7 +2520,7 @@ dissect_krb5_AuthorizationData_item(packet_info *pinfo, proto_tree *tree, tvbuff
return offset;
}
static ber_sequence AuthorizationData_sequence_of[1] = {
static ber_sequence_t AuthorizationData_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_AuthorizationData_item },
};
static int
@ -2558,7 +2558,7 @@ dissect_krb5_transited_contents(packet_info *pinfo, proto_tree *tree, tvbuff_t *
* tr-type [0] int32
* contents [1] octet string
*/
static ber_sequence TransitedEncoding_sequence[] = {
static ber_sequence_t TransitedEncoding_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_transited_type },
{ BER_CLASS_CON, 1, 0,
@ -2614,7 +2614,7 @@ dissect_krb5_renew_till(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
* authorization-data [10] AuthorizationData OPTIONAL
* }
*/
static ber_sequence EncTicketPart_sequence[] = {
static ber_sequence_t EncTicketPart_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_TicketFlags },
{ BER_CLASS_CON, 1, 0,
@ -2660,7 +2660,7 @@ dissect_krb5_EncTicketPart(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
* seq-number [3] uint32 OPTIONAL
* }
*/
static ber_sequence EncAPRepPart_sequence[] = {
static ber_sequence_t EncAPRepPart_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_ctime },
{ BER_CLASS_CON, 1, 0,
@ -2708,7 +2708,7 @@ dissect_krb5_lr_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
return offset;
}
static ber_sequence LastReq_sequence[] = {
static ber_sequence_t LastReq_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_lr_type },
{ BER_CLASS_CON, 1, 0,
@ -2722,7 +2722,7 @@ dissect_krb5_LastReq(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of
return offset;
}
static ber_sequence LastReq_sequence_of[1] = {
static ber_sequence_t LastReq_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_LastReq },
};
static int
@ -2740,7 +2740,7 @@ dissect_krb5_key_expiration(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return offset;
}
static ber_sequence EncKDCRepPart_sequence[] = {
static ber_sequence_t EncKDCRepPart_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_key },
{ BER_CLASS_CON, 1, 0,
@ -2803,7 +2803,7 @@ dissect_krb5_checksum_checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
* Checksum ::= SEQUENCE {
* }
*/
static ber_sequence Checksum_sequence[] = {
static ber_sequence_t Checksum_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_checksum_type },
{ BER_CLASS_CON, 1, 0,
@ -2831,7 +2831,7 @@ dissect_krb5_Checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
* authorization-data [8] AuthorizationData OPTIONAL
* }
*/
static ber_sequence Authenticator_sequence[] = {
static ber_sequence_t Authenticator_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_authenticator_vno },
{ BER_CLASS_CON, 1, 0,
@ -2875,7 +2875,7 @@ dissect_krb5_encrypted_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
offset=dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
return offset;
}
static ber_sequence ENC_PRIV_sequence[] = {
static ber_sequence_t ENC_PRIV_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -2890,7 +2890,7 @@ dissect_krb5_ENC_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc);
return offset;
}
static ber_sequence PRIV_BODY_sequence[] = {
static ber_sequence_t PRIV_BODY_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,
@ -2931,7 +2931,7 @@ dissect_krb5_SAFE_BODY_usec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return offset;
}
static ber_sequence SAFE_BODY_sequence[] = {
static ber_sequence_t SAFE_BODY_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_SAFE_BODY_user_data },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -2958,7 +2958,7 @@ dissect_krb5_SAFE_BODY(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
static ber_sequence SAFE_sequence[] = {
static ber_sequence_t SAFE_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,
@ -3000,7 +3000,7 @@ dissect_krb5_SAFE(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
* }
*
*/
static ber_sequence KDC_REQ_BODY_sequence[] = {
static ber_sequence_t KDC_REQ_BODY_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_KDCOptions },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -3067,7 +3067,7 @@ dissect_krb5_KDC_REQ_BODY(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
* req-body[4] KDC-REQ-BODY
* }
*/
static ber_sequence KDC_REQ_sequence[] = {
static ber_sequence_t KDC_REQ_sequence[] = {
{ BER_CLASS_CON, 1, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 2, 0,
@ -3145,7 +3145,7 @@ dissect_krb5_encrypted_authenticator_data(packet_info *pinfo, proto_tree *tree,
#endif
return offset;
}
static ber_sequence encrypted_authenticator_sequence[] = {
static ber_sequence_t encrypted_authenticator_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_authenticator_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -3214,7 +3214,7 @@ dissect_krb5_encrypted_Ticket_data(packet_info *pinfo, proto_tree *tree, tvbuff_
#endif
return offset;
}
static ber_sequence encrypted_Ticket_sequence[] = {
static ber_sequence_t encrypted_Ticket_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_Ticket_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -3231,7 +3231,7 @@ dissect_krb5_Ticket_encrypted(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return offset;
}
static ber_sequence Application_1_sequence[] = {
static ber_sequence_t Application_1_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_tkt_vno },
{ BER_CLASS_CON, 1, 0,
@ -3252,7 +3252,7 @@ dissect_krb5_Application_1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
static const ber_choice Ticket_choice[] = {
static const ber_choice_t Ticket_choice[] = {
{ 1, BER_CLASS_APP, 1, 0,
dissect_krb5_Application_1 },
{ 0, 0, 0, 0, NULL }
@ -3277,7 +3277,7 @@ dissect_krb5_Ticket(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off
* authenticator[4] EncryptedData
* }
*/
static ber_sequence AP_REQ_sequence[] = {
static ber_sequence_t AP_REQ_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,
@ -3349,7 +3349,7 @@ dissect_krb5_encrypted_AP_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff_
#endif
return offset;
}
static ber_sequence encrypted_AP_REP_sequence[] = {
static ber_sequence_t encrypted_AP_REP_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_AP_REP_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -3373,7 +3373,7 @@ dissect_krb5_encrypted_AP_REP(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
* enc-part[2] EncryptedData
* }
*/
static ber_sequence AP_REP_sequence[] = {
static ber_sequence_t AP_REP_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,
@ -3462,7 +3462,7 @@ dissect_krb5_encrypted_KDC_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff
#endif
return offset;
}
static ber_sequence encrypted_KDC_REP_sequence[] = {
static ber_sequence_t encrypted_KDC_REP_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_KDC_REP_etype },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@ -3490,7 +3490,7 @@ dissect_krb5_encrypted_KDC_REP(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
* enc-part[6] EncryptedData
* }
*/
static ber_sequence KDC_REP_sequence[] = {
static ber_sequence_t KDC_REP_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,
@ -3577,7 +3577,7 @@ dissect_krb5_e_checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
* authentication method and optionally containing data for
* the method:
*/
static ber_sequence ERROR_sequence[] = {
static ber_sequence_t ERROR_sequence[] = {
{ BER_CLASS_CON, 0, 0,
dissect_krb5_pvno },
{ BER_CLASS_CON, 1, 0,

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

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-logotypecertextn.c */
/* ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
/* Input file: packet-logotype-cert-extn-template.c */
@ -168,7 +168,7 @@ static int dissect_hashValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_hashValue);
}
static const ber_sequence HashAlgAndValue_sequence[] = {
static const ber_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 }
@ -188,7 +188,7 @@ static int dissect_refStructHash_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_logotypecertextn_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash_item);
}
static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item },
};
@ -206,7 +206,7 @@ static int dissect_refStructHash(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash);
}
static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item },
};
@ -224,7 +224,7 @@ static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI);
}
static const ber_sequence LogotypeDetails_sequence[] = {
static const ber_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 },
@ -303,7 +303,7 @@ static const value_string LogotypeImageResolution_vals[] = {
{ 0, NULL }
};
static const ber_choice LogotypeImageResolution_choice[] = {
static const ber_choice_t LogotypeImageResolution_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_numBits_impl },
{ 2, BER_CLASS_CON, 2, 0, dissect_tableSize_impl },
{ 0, 0, 0, 0, NULL }
@ -320,7 +320,7 @@ static int dissect_resolution(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_LogotypeImageResolution(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_resolution);
}
static const ber_sequence LogotypeImageInfo_sequence[] = {
static const ber_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 },
@ -341,7 +341,7 @@ static int dissect_imageInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_LogotypeImageInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_imageInfo);
}
static const ber_sequence LogotypeImage_sequence[] = {
static const ber_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 }
@ -358,7 +358,7 @@ static int dissect_image_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image_item);
}
static const ber_sequence SEQUNCE_OF_LogotypeImage_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_LogotypeImage_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item },
};
@ -373,7 +373,7 @@ static int dissect_image(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_logotypecertextn_SEQUNCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image);
}
static const ber_sequence LogotypeAudioInfo_sequence[] = {
static const ber_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 },
@ -393,7 +393,7 @@ static int dissect_audioInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_LogotypeAudioInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audioInfo);
}
static const ber_sequence LogotypeAudio_sequence[] = {
static const ber_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 }
@ -410,7 +410,7 @@ static int dissect_audio_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_LogotypeAudio(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio_item);
}
static const ber_sequence SEQUNCE_OF_LogotypeAudio_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_LogotypeAudio_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item },
};
@ -425,7 +425,7 @@ static int dissect_audio_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_SEQUNCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio);
}
static const ber_sequence LogotypeData_sequence[] = {
static const ber_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 }
@ -442,7 +442,7 @@ static int dissect_direct_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_logotypecertextn_LogotypeData(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_direct);
}
static const ber_sequence LogotypeReference_sequence[] = {
static const ber_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 }
@ -466,7 +466,7 @@ static const value_string LogotypeInfo_vals[] = {
{ 0, NULL }
};
static const ber_choice LogotypeInfo_choice[] = {
static const ber_choice_t LogotypeInfo_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_direct_impl },
{ 1, BER_CLASS_CON, 1, 0, dissect_indirect_impl },
{ 0, 0, 0, 0, NULL }
@ -492,7 +492,7 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_logotypecertextn_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_info);
}
static const ber_sequence SEQUNCE_OF_LogotypeInfo_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_LogotypeInfo_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item },
};
@ -519,7 +519,7 @@ static int dissect_logotypeType(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_logotypecertextn_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeType);
}
static const ber_sequence OtherLogotypeInfo_sequence[] = {
static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info },
{ 0, 0, 0, NULL }
@ -536,7 +536,7 @@ static int dissect_otherLogos_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_logotypecertextn_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos_item);
}
static const ber_sequence SEQUNCE_OF_OtherLogotypeInfo_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_OtherLogotypeInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item },
};
@ -551,7 +551,7 @@ static int dissect_otherLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos);
}
static const ber_sequence LogotypeExtn_sequence[] = {
static const ber_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 },

2
epan/dissectors/packet-logotypecertextn.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-logotypecertextn.h */
/* ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
/* Input file: packet-logotype-cert-extn-template.h */

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

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-ocsp.c */
/* ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
/* Input file: packet-ocsp-template.c */
@ -219,7 +219,7 @@ static int dissect_issuerKeyHash(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_ocsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_issuerKeyHash);
}
static const ber_sequence CertID_sequence[] = {
static const ber_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 },
@ -241,7 +241,7 @@ static int dissect_certID(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_ocsp_CertID(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certID);
}
static const ber_sequence Request_sequence[] = {
static const ber_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 }
@ -258,7 +258,7 @@ static int dissect_requestList_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_ocsp_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList_item);
}
static const ber_sequence SEQUNCE_OF_Request_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_Request_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item },
};
@ -273,7 +273,7 @@ static int dissect_requestList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_ocsp_SEQUNCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList);
}
static const ber_sequence TBSRequest_sequence[] = {
static const ber_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 },
@ -305,7 +305,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_ocsp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_signature);
}
static const ber_sequence SEQUNCE_OF_Certificate_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_Certificate_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
};
@ -320,7 +320,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_ocsp_SEQUNCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs);
}
static const ber_sequence Signature_sequence[] = {
static const ber_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 },
@ -338,7 +338,7 @@ static int dissect_optionalSignature(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_ocsp_Signature(FALSE, tvb, offset, pinfo, tree, hf_ocsp_optionalSignature);
}
static const ber_sequence OCSPRequest_sequence[] = {
static const ber_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 }
@ -406,7 +406,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ocsp_T_response(FALSE, tvb, offset, pinfo, tree, hf_ocsp_response);
}
static const ber_sequence ResponseBytes_sequence[] = {
static const ber_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 }
@ -423,7 +423,7 @@ static int dissect_responseBytes(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_ocsp_ResponseBytes(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responseBytes);
}
static const ber_sequence OCSPResponse_sequence[] = {
static const ber_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 }
@ -456,7 +456,7 @@ static const value_string ResponderID_vals[] = {
{ 0, NULL }
};
static const ber_choice ResponderID_choice[] = {
static const ber_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 }
@ -510,7 +510,7 @@ static int dissect_good_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_ocsp_NULL(TRUE, tvb, offset, pinfo, tree, hf_ocsp_good);
}
static const ber_sequence RevokedInfo_sequence[] = {
static const ber_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 }
@ -549,7 +549,7 @@ static const value_string CertStatus_vals[] = {
{ 0, NULL }
};
static const ber_choice CertStatus_choice[] = {
static const ber_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 },
@ -567,7 +567,7 @@ static int dissect_certStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ocsp_CertStatus(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certStatus);
}
static const ber_sequence SingleResponse_sequence[] = {
static const ber_sequence_t SingleResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate },
@ -587,7 +587,7 @@ static int dissect_responses_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_ocsp_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses_item);
}
static const ber_sequence SEQUNCE_OF_SingleResponse_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_SingleResponse_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item },
};
@ -602,7 +602,7 @@ static int dissect_responses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_ocsp_SEQUNCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses);
}
static const ber_sequence ResponseData_sequence[] = {
static const ber_sequence_t ResponseData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt },
@ -622,7 +622,7 @@ static int dissect_tbsResponseData(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_ocsp_ResponseData(FALSE, tvb, offset, pinfo, tree, hf_ocsp_tbsResponseData);
}
static const ber_sequence BasicOCSPResponse_sequence[] = {
static const ber_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 },
@ -658,7 +658,7 @@ static int dissect_AcceptableResponses_item(packet_info *pinfo, proto_tree *tree
return dissect_ocsp_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_AcceptableResponses_item);
}
static const ber_sequence AcceptableResponses_sequence_of[1] = {
static const ber_sequence_t AcceptableResponses_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AcceptableResponses_item },
};
@ -670,7 +670,7 @@ dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence ServiceLocator_sequence[] = {
static const ber_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 }
@ -709,7 +709,7 @@ static int dissect_crlNum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_ocsp_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_crlNum);
}
static const ber_sequence CrlID_sequence[] = {
static const ber_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 },

2
epan/dissectors/packet-ocsp.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-ocsp.h */
/* ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
/* Input file: packet-ocsp-template.h */

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

@ -118,7 +118,7 @@ static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient);
}
static const ber_sequence RSAPublicKey_sequence[] = {
static const ber_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 }
@ -144,7 +144,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version);
}
static const ber_sequence RSAPrivateKey_sequence[] = {
static const ber_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 },
@ -188,7 +188,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest);
}
static const ber_sequence DigestInfo_sequence[] = {
static const ber_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 }

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

@ -146,7 +146,7 @@ static const value_string TrustedCA_vals[] = {
{ 0, NULL }
};
static const ber_choice TrustedCA_choice[] = {
static const ber_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 }
@ -163,7 +163,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree,
return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item);
}
static const ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_TrustedCA_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
};
@ -178,7 +178,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers);
}
static const ber_sequence PaPkAsReq_sequence[] = {
static const ber_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 },
@ -220,7 +220,7 @@ static int dissect_paNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkinit_INTEGER_0_4294967295(FALSE, tvb, offset, pinfo, tree, hf_pkinit_paNonce);
}
static const ber_sequence PKAuthenticator_sequence[] = {
static const ber_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 },
@ -239,7 +239,7 @@ static int dissect_pkAuthenticator(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_pkinit_PKAuthenticator(FALSE, tvb, offset, pinfo, tree, hf_pkinit_pkAuthenticator);
}
static const ber_sequence SEQUNCE_OF_AlgorithmIdentifier_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_AlgorithmIdentifier_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item },
};
@ -254,7 +254,7 @@ static int dissect_supportedCMSTypes(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkinit_SEQUNCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes);
}
static const ber_sequence AuthPack_sequence[] = {
static const ber_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 },
@ -276,7 +276,7 @@ static const value_string PaPkAsRep_vals[] = {
{ 0, NULL }
};
static const ber_choice PaPkAsRep_choice[] = {
static const ber_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 }
@ -303,7 +303,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_pkinit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkinit_subjectPublicKey);
}
static const ber_sequence KDCDHKeyInfo_sequence[] = {
static const ber_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 },

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

@ -186,7 +186,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_pkix1explicit_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_extnValue);
}
static const ber_sequence Extension_sequence[] = {
static const ber_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 },
@ -204,7 +204,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_pkix1explicit_Extension(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_Extensions_item);
}
static const ber_sequence Extensions_sequence_of[1] = {
static const ber_sequence_t Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
@ -253,7 +253,7 @@ static int dissect_seed(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_pkix1explicit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_seed);
}
static const ber_sequence ValidationParms_sequence[] = {
static const ber_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 }
@ -270,7 +270,7 @@ static int dissect_validationParms(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_pkix1explicit_ValidationParms(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_validationParms);
}
static const ber_sequence DomainParameters_sequence[] = {
static const ber_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 },
@ -315,7 +315,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_pkix1explicit_T_value(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value);
}
static const ber_sequence AttributeTypeAndValue_sequence[] = {
static const ber_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 }
@ -332,7 +332,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree
return dissect_pkix1explicit_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RelativeDistinguishedName_item);
}
static const ber_sequence RelativeDistinguishedName_set_of[1] = {
static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
};
@ -347,7 +347,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_pkix1explicit_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RDNSequence_item);
}
static const ber_sequence RDNSequence_sequence_of[1] = {
static const ber_sequence_t RDNSequence_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
};
@ -403,7 +403,7 @@ static int dissect_value1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value1);
}
static const ber_sequence TeletexDomainDefinedAttribute_sequence[] = {
static const ber_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 }

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

@ -122,7 +122,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence EDIPartyName_sequence[] = {
static const ber_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 }
@ -148,7 +148,7 @@ static int dissect_accessMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_pkix1implicit_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_accessMethod);
}
static const ber_sequence AccessDescription_sequence[] = {
static const ber_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 }
@ -165,7 +165,7 @@ static int dissect_AuthorityInfoAccessSyntax_item(packet_info *pinfo, proto_tree
return dissect_pkix1implicit_AccessDescription(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_AuthorityInfoAccessSyntax_item);
}
static const ber_sequence AuthorityInfoAccessSyntax_sequence_of[1] = {
static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthorityInfoAccessSyntax_item },
};
@ -224,7 +224,7 @@ static const value_string DisplayText_vals[] = {
{ 0, NULL }
};
static const ber_choice DisplayText_choice[] = {
static const ber_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 },
@ -257,7 +257,7 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item);
}
static const ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_INTEGER_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item },
};
@ -272,7 +272,7 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers);
}
static const ber_sequence NoticeReference_sequence[] = {
static const ber_sequence_t NoticeReference_sequence[] = {
{ BER_CLASS_UNI, -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 }
@ -289,7 +289,7 @@ static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef);
}
static const ber_sequence UserNotice_sequence[] = {
static const ber_sequence_t UserNotice_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
{ 0, 0, 0, NULL }

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

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixproxy.c */
/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* Input file: packet-pkixproxy-template.c */
@ -113,7 +113,7 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_pkixproxy_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_policy);
}
static const ber_sequence ProxyPolicy_sequence[] = {
static const ber_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 }
@ -130,7 +130,7 @@ static int dissect_proxyPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_pkixproxy_ProxyPolicy(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_proxyPolicy);
}
static const ber_sequence ProxyCertInfoExtension_sequence[] = {
static const ber_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 }

2
epan/dissectors/packet-pkixproxy.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixproxy.h */
/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
/* Input file: packet-pkixproxy-template.h */

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

@ -174,7 +174,7 @@ static const value_string TypeOfBiometricData_vals[] = {
{ 0, NULL }
};
static const ber_choice TypeOfBiometricData_choice[] = {
static const ber_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 }
@ -216,7 +216,7 @@ static int dissect_sourceDataUri(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixqualified_IA5String(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_sourceDataUri);
}
static const ber_sequence BiometricData_sequence[] = {
static const ber_sequence_t BiometricData_sequence[] = {
{ BER_CLASS_UNI, -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 },
@ -235,7 +235,7 @@ static int dissect_BiometricSyntax_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_pkixqualified_BiometricData(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_BiometricSyntax_item);
}
static const ber_sequence BiometricSyntax_sequence_of[1] = {
static const ber_sequence_t BiometricSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item },
};
@ -273,7 +273,7 @@ static int dissect_statementInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixqualified_T_statementInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_statementInfo);
}
static const ber_sequence QCStatement_sequence[] = {
static const ber_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 }
@ -290,7 +290,7 @@ static int dissect_QCStatements_item(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkixqualified_QCStatement(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_QCStatements_item);
}
static const ber_sequence QCStatements_sequence_of[1] = {
static const ber_sequence_t QCStatements_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item },
};
@ -302,7 +302,7 @@ dissect_pkixqualified_QCStatements(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence NameRegistrationAuthorities_sequence_of[1] = {
static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item },
};
@ -317,7 +317,7 @@ static int dissect_nameRegistrationAuthorities(packet_info *pinfo, proto_tree *t
return dissect_pkixqualified_NameRegistrationAuthorities(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_nameRegistrationAuthorities);
}
static const ber_sequence SemanticsInformation_sequence[] = {
static const ber_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 }

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

@ -151,7 +151,7 @@ static int dissect_hashedMessage(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixtsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_hashedMessage);
}
static const ber_sequence MessageImprint_sequence[] = {
static const ber_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 }
@ -215,7 +215,7 @@ static int dissect_ordering(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_ordering);
}
static const ber_sequence TimeStampReq_sequence[] = {
static const ber_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 },
@ -279,7 +279,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_failInfo);
}
static const ber_sequence PKIStatusInfo_sequence[] = {
static const ber_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 }
@ -307,7 +307,7 @@ static int dissect_timeStampToken(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixtsp_TimeStampToken(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_timeStampToken);
}
static const ber_sequence TimeStampResp_sequence[] = {
static const ber_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 }
@ -364,7 +364,7 @@ static int dissect_micros_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_pkixtsp_INTEGER_1_999(TRUE, tvb, offset, pinfo, tree, hf_pkixtsp_micros);
}
static const ber_sequence Accuracy_sequence[] = {
static const ber_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 },
@ -382,7 +382,7 @@ static int dissect_accuracy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_Accuracy(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_accuracy);
}
static const ber_sequence TSTInfo_sequence[] = {
static const ber_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 },

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

@ -212,7 +212,7 @@ static const value_string T_address_value_vals[] = {
{ 0, NULL }
};
static const ber_choice T_address_value_choice[] = {
static const ber_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 }
};
@ -228,7 +228,7 @@ static int dissect_address_value(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_smrse_T_address_value(FALSE, tvb, offset, pinfo, tree, hf_smrse_address_value);
}
static const ber_sequence SMS_Address_sequence[] = {
static const ber_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_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value },
@ -280,7 +280,7 @@ static int dissect_password(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_smrse_Password(FALSE, tvb, offset, pinfo, tree, hf_smrse_password);
}
static const ber_sequence SMR_Bind_sequence[] = {
static const ber_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 }
@ -306,7 +306,7 @@ static int dissect_moimsi_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_smrse_IMSI_Address(TRUE, tvb, offset, pinfo, tree, hf_smrse_moimsi);
}
static const ber_sequence SMR_Bind_Confirm_sequence[] = {
static const ber_sequence_t SMR_Bind_Confirm_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -340,7 +340,7 @@ static int dissect_connect_fail_reason(packet_info *pinfo, proto_tree *tree, tvb
return dissect_smrse_Connect_fail(FALSE, tvb, offset, pinfo, tree, hf_smrse_connect_fail_reason);
}
static const ber_sequence SMR_Bind_Failure_sequence[] = {
static const ber_sequence_t SMR_Bind_Failure_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason },
{ 0, 0, 0, NULL }
};
@ -353,7 +353,7 @@ dissect_smrse_SMR_Bind_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
return offset;
}
static const ber_sequence SMR_Unbind_sequence[] = {
static const ber_sequence_t SMR_Unbind_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -430,7 +430,7 @@ static int dissect_mt_tariffClass_impl(packet_info *pinfo, proto_tree *tree, tvb
return dissect_smrse_SM_TC(TRUE, tvb, offset, pinfo, tree, hf_smrse_mt_tariffClass);
}
static const ber_sequence RPDataMT_sequence[] = {
static const ber_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 },
@ -450,7 +450,7 @@ dissect_smrse_RPDataMT(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
return offset;
}
static const ber_sequence RPDataMO_sequence[] = {
static const ber_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 },
@ -467,7 +467,7 @@ dissect_smrse_RPDataMO(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
return offset;
}
static const ber_sequence RPAck_sequence[] = {
static const ber_sequence_t RPAck_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
{ 0, 0, 0, NULL }
};
@ -515,7 +515,7 @@ static int dissect_error_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_smrse_Error_reason(FALSE, tvb, offset, pinfo, tree, hf_smrse_error_reason);
}
static const ber_sequence RPError_sequence[] = {
static const ber_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 },
@ -532,7 +532,7 @@ dissect_smrse_RPError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
return offset;
}
static const ber_sequence RPAlertSC_sequence[] = {
static const ber_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 }

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

@ -281,7 +281,7 @@ static int dissect_parameters(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509af_T_parameters(FALSE, tvb, offset, pinfo, tree, hf_x509af_parameters);
}
static const ber_sequence AlgorithmIdentifier_sequence[] = {
static const ber_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 }
@ -344,7 +344,7 @@ const value_string Time_vals[] = {
{ 0, NULL }
};
static const ber_choice Time_choice[] = {
static const ber_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 }
@ -373,7 +373,7 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate);
}
static const ber_sequence Validity_sequence[] = {
static const ber_sequence_t Validity_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
{ 0, 0, 0, NULL }
@ -406,7 +406,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey);
}
static const ber_sequence SubjectPublicKeyInfo_sequence[] = {
static const ber_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 }
@ -466,7 +466,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509af_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_x509af_extnValue);
}
static const ber_sequence Extension_sequence[] = {
static const ber_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 },
@ -484,7 +484,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item);
}
static const ber_sequence Extensions_sequence_of[1] = {
static const ber_sequence_t Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
@ -505,7 +505,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions);
}
static const ber_sequence T_signedCertificate_sequence[] = {
static const ber_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 },
@ -530,7 +530,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate);
}
static const ber_sequence Certificate_sequence[] = {
static const ber_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 },
@ -560,7 +560,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate);
}
static const ber_sequence CrossCertificates_set_of[1] = {
static const ber_sequence_t CrossCertificates_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
};
@ -575,7 +575,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree
return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item);
}
static const ber_sequence ForwardCertificationPath_sequence_of[1] = {
static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
};
@ -590,7 +590,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath);
}
static const ber_sequence Certificates_sequence[] = {
static const ber_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 }
@ -604,7 +604,7 @@ dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence CertificatePair_sequence[] = {
static const ber_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 }
@ -621,7 +621,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree,
return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item);
}
static const ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_CertificatePair_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
};
@ -636,7 +636,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
}
static const ber_sequence CertificationPath_sequence[] = {
static const ber_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 }
@ -650,7 +650,7 @@ dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence T_revokedCertificates_item_sequence[] = {
static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate },
{ BER_CLASS_UNI, -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 },
@ -668,7 +668,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree
return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item);
}
static const ber_sequence T_revokedCertificates_sequence_of[1] = {
static const ber_sequence_t T_revokedCertificates_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item },
};
@ -683,7 +683,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates);
}
static const ber_sequence T_signedCertificateList_sequence[] = {
static const ber_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_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
@ -705,7 +705,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t
return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList);
}
static const ber_sequence CertificateList_sequence[] = {
static const ber_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 },
@ -720,7 +720,7 @@ dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
return offset;
}
static const ber_sequence IssuerSerial_sequence[] = {
static const ber_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 },
@ -745,7 +745,7 @@ static const value_string InfoSubject_vals[] = {
{ 0, NULL }
};
static const ber_choice InfoSubject_choice[] = {
static const ber_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 }
@ -762,7 +762,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject);
}
static const ber_sequence AttCertValidityPeriod_sequence[] = {
static const ber_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 }
@ -779,7 +779,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t
return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod);
}
static const ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_Attribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
};
@ -794,7 +794,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
}
static const ber_sequence AttributeCertificateInfo_sequence[] = {
static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
@ -818,7 +818,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree
return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo);
}
static const ber_sequence AttributeCertificate_sequence[] = {
static const ber_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 },
@ -836,7 +836,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate);
}
static const ber_sequence ACPathData_sequence[] = {
static const ber_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 }
@ -853,7 +853,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item);
}
static const ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ACPathData_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
};
@ -868,7 +868,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
}
static const ber_sequence AttributeCertificationPath_sequence[] = {
static const ber_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 }
@ -889,7 +889,7 @@ static const value_string AssertionSubject_vals[] = {
{ 0, NULL }
};
static const ber_choice AssertionSubject_choice[] = {
static const ber_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 }
@ -906,7 +906,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject);
}
static const ber_sequence SET_OF_AttributeType_set_of[1] = {
static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
};
@ -921,7 +921,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType);
}
static const ber_sequence AttributeCertificateAssertion_sequence[] = {
static const ber_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 },

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

@ -341,7 +341,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree
return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier);
}
static const ber_sequence EDIPartyName_sequence[] = {
static const ber_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 }
@ -401,7 +401,7 @@ const value_string GeneralName_vals[] = {
{ 0, NULL }
};
static const ber_choice GeneralName_choice[] = {
static const ber_choice_t GeneralName_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl },
{ 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_directoryName_impl },
@ -438,7 +438,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509ce_GeneralName(FALSE, tvb, offset, pinfo, tree, hf_x509ce_deltaLocation);
}
static const ber_sequence GeneralNames_sequence_of[1] = {
static const ber_sequence_t GeneralNames_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
};
@ -462,7 +462,7 @@ static int dissect_fullName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509ce_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_x509ce_fullName);
}
static const ber_sequence AuthorityKeyIdentifier_sequence[] = {
static const ber_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 },
@ -528,7 +528,7 @@ static int dissect_KeyPurposeIDs_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509ce_KeyPurposeId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_KeyPurposeIDs_item);
}
static const ber_sequence KeyPurposeIDs_sequence_of[1] = {
static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item },
};
@ -572,7 +572,7 @@ static int dissect_privateKeyValid_impl(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_GeneralizedTime(TRUE, tvb, offset, pinfo, tree, hf_x509ce_privateKeyValid);
}
static const ber_sequence PrivateKeyUsagePeriod_sequence[] = {
static const ber_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 }
@ -633,7 +633,7 @@ static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509ce_PolicyQualifierValue(FALSE, tvb, offset, pinfo, tree, hf_x509ce_qualifier);
}
static const ber_sequence PolicyQualifierInfo_sequence[] = {
static const ber_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 }
@ -650,7 +650,7 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t
return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item);
}
static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
};
@ -665,7 +665,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
}
static const ber_sequence PolicyInformation_sequence[] = {
static const ber_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 }
@ -682,7 +682,7 @@ static int dissect_CertificatePoliciesSyntax_item(packet_info *pinfo, proto_tree
return dissect_x509ce_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CertificatePoliciesSyntax_item);
}
static const ber_sequence CertificatePoliciesSyntax_sequence_of[1] = {
static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item },
};
@ -694,7 +694,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv
return offset;
}
static const ber_sequence PolicyMappingsSyntax_item_sequence[] = {
static const ber_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 }
@ -711,7 +711,7 @@ static int dissect_PolicyMappingsSyntax_item(packet_info *pinfo, proto_tree *tre
return dissect_x509ce_PolicyMappingsSyntax_item(FALSE, tvb, offset, pinfo, tree, hf_x509ce_PolicyMappingsSyntax_item);
}
static const ber_sequence PolicyMappingsSyntax_sequence_of[1] = {
static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item },
};
@ -723,7 +723,7 @@ dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static const ber_sequence AttributesSyntax_sequence_of[1] = {
static const ber_sequence_t AttributesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item },
};
@ -785,7 +785,7 @@ static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509ce_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509ce_modulus);
}
static const ber_sequence BasicConstraintsSyntax_sequence[] = {
static const ber_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 }
@ -814,7 +814,7 @@ static int dissect_maximum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509ce_BaseDistance(TRUE, tvb, offset, pinfo, tree, hf_x509ce_maximum);
}
static const ber_sequence GeneralSubtree_sequence[] = {
static const ber_sequence_t GeneralSubtree_sequence[] = {
{ BER_CLASS_CON, -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 },
@ -832,7 +832,7 @@ static int dissect_GeneralSubtrees_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_GeneralSubtree(FALSE, tvb, offset, pinfo, tree, hf_x509ce_GeneralSubtrees_item);
}
static const ber_sequence GeneralSubtrees_sequence_of[1] = {
static const ber_sequence_t GeneralSubtrees_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item },
};
@ -850,7 +850,7 @@ static int dissect_excludedSubtrees_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_x509ce_GeneralSubtrees(TRUE, tvb, offset, pinfo, tree, hf_x509ce_excludedSubtrees);
}
static const ber_sequence NameConstraintsSyntax_sequence[] = {
static const ber_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 }
@ -882,7 +882,7 @@ static int dissect_inhibitPolicyMapping_impl(packet_info *pinfo, proto_tree *tre
return dissect_x509ce_SkipCerts(TRUE, tvb, offset, pinfo, tree, hf_x509ce_inhibitPolicyMapping);
}
static const ber_sequence PolicyConstraintsSyntax_sequence[] = {
static const ber_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 }
@ -953,7 +953,7 @@ const value_string DistributionPointName_vals[] = {
{ 0, NULL }
};
static const ber_choice DistributionPointName_choice[] = {
static const ber_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 }
@ -1025,7 +1025,7 @@ static int dissect_reasonFlags(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509ce_ReasonFlags(FALSE, tvb, offset, pinfo, tree, hf_x509ce_reasonFlags);
}
static const ber_sequence NumberRange_sequence[] = {
static const ber_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 },
@ -1058,7 +1058,7 @@ static int dissect_cRLStreamIdentifier_impl(packet_info *pinfo, proto_tree *tree
return dissect_x509ce_CRLStreamIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_cRLStreamIdentifier);
}
static const ber_sequence BaseRevocationInfo_sequence[] = {
static const ber_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 },
@ -1076,7 +1076,7 @@ static int dissect_baseRevocationInfo_impl(packet_info *pinfo, proto_tree *tree,
return dissect_x509ce_BaseRevocationInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_baseRevocationInfo);
}
static const ber_sequence PerAuthorityScope_sequence[] = {
static const ber_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 },
@ -1099,7 +1099,7 @@ static int dissect_CRLScopeSyntax_item(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509ce_PerAuthorityScope(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLScopeSyntax_item);
}
static const ber_sequence CRLScopeSyntax_sequence_of[1] = {
static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item },
};
@ -1114,7 +1114,7 @@ static int dissect_cRLScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509ce_CRLScopeSyntax(FALSE, tvb, offset, pinfo, tree, hf_x509ce_cRLScope);
}
static const ber_sequence DeltaRefInfo_sequence[] = {
static const ber_sequence_t DeltaRefInfo_sequence[] = {
{ BER_CLASS_CON, -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 }
@ -1131,7 +1131,7 @@ static int dissect_deltaRefInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509ce_DeltaRefInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_deltaRefInfo);
}
static const ber_sequence CRLReferral_sequence[] = {
static const ber_sequence_t CRLReferral_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_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 },
@ -1158,7 +1158,7 @@ const value_string StatusReferral_vals[] = {
{ 0, NULL }
};
static const ber_choice StatusReferral_choice[] = {
static const ber_choice_t StatusReferral_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl },
{ 0, 0, 0, 0, NULL }
};
@ -1174,7 +1174,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_StatusReferral(FALSE, tvb, offset, pinfo, tree, hf_x509ce_StatusReferrals_item);
}
static const ber_sequence StatusReferrals_sequence_of[1] = {
static const ber_sequence_t StatusReferrals_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
};
@ -1201,7 +1201,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence DeltaInformation_sequence[] = {
static const ber_sequence_t DeltaInformation_sequence[] = {
{ BER_CLASS_CON, -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 }
@ -1215,7 +1215,7 @@ dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
return offset;
}
static const ber_sequence DistributionPoint_sequence[] = {
static const ber_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 },
@ -1233,7 +1233,7 @@ static int dissect_CRLDistPointsSyntax_item(packet_info *pinfo, proto_tree *tree
return dissect_x509ce_DistributionPoint(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLDistPointsSyntax_item);
}
static const ber_sequence CRLDistPointsSyntax_sequence_of[1] = {
static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item },
};
@ -1245,7 +1245,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence IssuingDistPointSyntax_sequence[] = {
static const ber_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 },
@ -1273,7 +1273,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
return offset;
}
static const ber_sequence CertificateExactAssertion_sequence[] = {
static const ber_sequence_t CertificateExactAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
{ 0, 0, 0, NULL }
@ -1324,7 +1324,7 @@ const value_string AltNameType_vals[] = {
{ 0, NULL }
};
static const ber_choice AltNameType_choice[] = {
static const ber_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 }
@ -1341,7 +1341,7 @@ static int dissect_subjectAltName_impl(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509ce_AltNameType(TRUE, tvb, offset, pinfo, tree, hf_x509ce_subjectAltName);
}
static const ber_sequence CertPolicySet_sequence_of[1] = {
static const ber_sequence_t CertPolicySet_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_CertPolicySet_item },
};
@ -1356,7 +1356,7 @@ static int dissect_policy_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509ce_CertPolicySet(TRUE, tvb, offset, pinfo, tree, hf_x509ce_policy);
}
static const ber_sequence CertificateAssertion_sequence[] = {
static const ber_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_issuer1_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
@ -1386,7 +1386,7 @@ static int dissect_issuedByThisCAAssertion1_impl(packet_info *pinfo, proto_tree
return dissect_x509ce_CertificateAssertion(TRUE, tvb, offset, pinfo, tree, hf_x509ce_issuedByThisCAAssertion1);
}
static const ber_sequence CertificatePairExactAssertion_sequence[] = {
static const ber_sequence_t CertificatePairExactAssertion_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 }
@ -1400,7 +1400,7 @@ dissect_x509ce_CertificatePairExactAssertion(gboolean implicit_tag _U_, tvbuff_t
return offset;
}
static const ber_sequence CertificatePairAssertion_sequence[] = {
static const ber_sequence_t CertificatePairAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion1_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion1_impl },
{ 0, 0, 0, NULL }
@ -1414,7 +1414,7 @@ dissect_x509ce_CertificatePairAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb
return offset;
}
static const ber_sequence CertificateListExactAssertion_sequence[] = {
static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint },
{ 0, 0, 0, NULL }
@ -1428,7 +1428,7 @@ dissect_x509ce_CertificateListExactAssertion(gboolean implicit_tag _U_, tvbuff_t
return offset;
}
static const ber_sequence CertificateListAssertion_sequence[] = {
static const ber_sequence_t CertificateListAssertion_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer1 },
{ 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 },
@ -1446,7 +1446,7 @@ dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb
return offset;
}
static const ber_sequence PkiPathMatchSyntax_sequence[] = {
static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject },
{ 0, 0, 0, NULL }

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

@ -419,7 +419,7 @@ static int dissect_distingAttrValue(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_ValuesWithContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_distingAttrValue);
}
static const ber_sequence SET_OF_AttributeValue_set_of[1] = {
static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item },
};
@ -457,7 +457,7 @@ static int dissect_includeSubtypes(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509if_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_x509if_includeSubtypes);
}
static const ber_sequence Context_sequence[] = {
static const ber_sequence_t Context_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fallback },
@ -475,7 +475,7 @@ static int dissect_contextList_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList_item);
}
static const ber_sequence SET_OF_Context_set_of[1] = {
static const ber_sequence_t SET_OF_Context_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextList_item },
};
@ -490,7 +490,7 @@ static int dissect_contextList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SET_OF_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList);
}
static const ber_sequence T_valuesWithContext_item_sequence[] = {
static const ber_sequence_t T_valuesWithContext_item_sequence[] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
{ 0, 0, 0, NULL }
@ -507,7 +507,7 @@ static int dissect_valuesWithContext_item(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_T_valuesWithContext_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext_item);
}
static const ber_sequence T_valuesWithContext_set_of[1] = {
static const ber_sequence_t T_valuesWithContext_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item },
};
@ -522,7 +522,7 @@ static int dissect_valuesWithContext(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_T_valuesWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext);
}
static const ber_sequence Attribute_sequence[] = {
static const ber_sequence_t Attribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_valuesWithContext },
@ -594,7 +594,7 @@ static int dissect_contextValues_item1(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509if_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValues_item1);
}
static const ber_sequence SET_OF_ContextValue_set_of[1] = {
static const ber_sequence_t SET_OF_ContextValue_set_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValues_item1 },
};
@ -609,7 +609,7 @@ static int dissect_contextValues1(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_SET_OF_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValues1);
}
static const ber_sequence ContextAssertion_sequence[] = {
static const ber_sequence_t ContextAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType1 },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues1 },
{ 0, 0, 0, NULL }
@ -629,7 +629,7 @@ static int dissect_assertedContexts_item(packet_info *pinfo, proto_tree *tree, t
return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts_item);
}
static const ber_sequence SET_OF_ContextAssertion_set_of[1] = {
static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item },
};
@ -651,7 +651,7 @@ static const value_string T_assertedContexts_vals[] = {
{ 0, NULL }
};
static const ber_choice T_assertedContexts_choice[] = {
static const ber_choice_t T_assertedContexts_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_allContexts },
{ 1, BER_CLASS_CON, 1, 0, dissect_selectedContexts },
{ 0, 0, 0, 0, NULL }
@ -668,7 +668,7 @@ static int dissect_assertedContexts(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_T_assertedContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts);
}
static const ber_sequence AttributeValueAssertion_sequence[] = {
static const ber_sequence_t AttributeValueAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts },
@ -683,7 +683,7 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb,
return offset;
}
static const ber_sequence SEQUNCE_OF_ContextAssertion_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ContextAssertion_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_assertedContexts_item },
};
@ -698,7 +698,7 @@ static int dissect_assertedContexts1(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_SEQUNCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts1);
}
static const ber_sequence AttributeTypeAssertion_sequence[] = {
static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_assertedContexts1 },
{ 0, 0, 0, NULL }
@ -712,7 +712,7 @@ dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb,
return offset;
}
static const ber_sequence T_valuesWithContext_item1_sequence[] = {
static const ber_sequence_t T_valuesWithContext_item1_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
{ 0, 0, 0, NULL }
@ -729,7 +729,7 @@ static int dissect_valuesWithContext_item1(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_T_valuesWithContext_item1(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext_item1);
}
static const ber_sequence T_valuesWithContext1_set_of[1] = {
static const ber_sequence_t T_valuesWithContext1_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item1 },
};
@ -744,7 +744,7 @@ static int dissect_valuesWithContext1(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509if_T_valuesWithContext1(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext1);
}
static const ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = {
static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value1 },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_primaryDistinguished },
@ -763,7 +763,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree
return dissect_x509if_AttributeTypeAndDistinguishedValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_RelativeDistinguishedName_item);
}
static const ber_sequence RelativeDistinguishedName_set_of[1] = {
static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
};
@ -778,7 +778,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_x509if_RDNSequence_item);
}
static const ber_sequence RDNSequence_sequence_of[1] = {
static const ber_sequence_t RDNSequence_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
};
@ -799,7 +799,7 @@ const value_string Name_vals[] = {
{ 0, NULL }
};
static const ber_choice Name_choice[] = {
static const ber_choice_t Name_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
{ 0, 0, 0, 0, NULL }
};
@ -844,7 +844,7 @@ static const value_string T_specificExclusions_item_vals[] = {
{ 0, NULL }
};
static const ber_choice T_specificExclusions_item_choice[] = {
static const ber_choice_t T_specificExclusions_item_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_chopBefore },
{ 1, BER_CLASS_CON, 1, 0, dissect_chopAfter },
{ 0, 0, 0, 0, NULL }
@ -861,7 +861,7 @@ static int dissect_specificExclusions_item(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_T_specificExclusions_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions_item);
}
static const ber_sequence T_specificExclusions_set_of[1] = {
static const ber_sequence_t T_specificExclusions_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item },
};
@ -936,7 +936,7 @@ static int dissect_newMatchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509if_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_newMatchingRule);
}
static const ber_sequence SET_OF_Refinement_set_of[1] = {
static const ber_sequence_t SET_OF_Refinement_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
@ -963,7 +963,7 @@ const value_string Refinement_vals[] = {
{ 0, NULL }
};
static const ber_choice Refinement_choice[] = {
static const ber_choice_t Refinement_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_item },
{ 1, BER_CLASS_CON, 1, 0, dissect_and },
{ 2, BER_CLASS_CON, 2, 0, dissect_or },
@ -979,7 +979,7 @@ dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
return offset;
}
static const ber_sequence SubtreeSpecification_sequence[] = {
static const ber_sequence_t SubtreeSpecification_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum },
@ -1003,7 +1003,7 @@ static const value_string T_specificExclusions_item1_vals[] = {
{ 0, NULL }
};
static const ber_choice T_specificExclusions_item1_choice[] = {
static const ber_choice_t T_specificExclusions_item1_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_chopBefore },
{ 1, BER_CLASS_CON, 1, 0, dissect_chopAfter },
{ 0, 0, 0, 0, NULL }
@ -1020,7 +1020,7 @@ static int dissect_specificExclusions_item1(packet_info *pinfo, proto_tree *tree
return dissect_x509if_T_specificExclusions_item1(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions_item1);
}
static const ber_sequence T_specificExclusions1_set_of[1] = {
static const ber_sequence_t T_specificExclusions1_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item1 },
};
@ -1035,7 +1035,7 @@ static int dissect_specificExclusions1(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509if_T_specificExclusions1(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions1);
}
static const ber_sequence ChopSpecification_sequence[] = {
static const ber_sequence_t ChopSpecification_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions1 },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum },
{ BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_maximum },
@ -1098,7 +1098,7 @@ static int dissect_superiorStructureRules_item(packet_info *pinfo, proto_tree *t
return dissect_x509if_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules_item);
}
static const ber_sequence SET_OF_RuleIdentifier_set_of[1] = {
static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules_item },
};
@ -1113,7 +1113,7 @@ static int dissect_superiorStructureRules(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_SET_OF_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules);
}
static const ber_sequence DITStructureRule_sequence[] = {
static const ber_sequence_t DITStructureRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules },
@ -1128,7 +1128,7 @@ dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
return offset;
}
static const ber_sequence SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item },
};
@ -1149,7 +1149,7 @@ static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts);
}
static const ber_sequence SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item },
};
@ -1170,7 +1170,7 @@ static int dissect_precluded(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded);
}
static const ber_sequence DITContentRule_sequence[] = {
static const ber_sequence_t DITContentRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatory },
@ -1187,7 +1187,7 @@ dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
return offset;
}
static const ber_sequence DITContextUse_sequence[] = {
static const ber_sequence_t DITContextUse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_optionalContexts },
@ -1245,7 +1245,7 @@ static int dissect_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509if_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues_item);
}
static const ber_sequence SEQUNCE_OF_SelectedValues_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_SelectedValues_sequence_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_selectedValues_item },
};
@ -1286,7 +1286,7 @@ static int dissect_values_item1(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_values_item1);
}
static const ber_sequence SEQUNCE_OF_DefaultValueValues_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_DefaultValueValues_sequence_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item1 },
};
@ -1301,7 +1301,7 @@ static int dissect_values1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509if_SEQUNCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_values1);
}
static const ber_sequence T_defaultValues_item_sequence[] = {
static const ber_sequence_t T_defaultValues_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_values1 },
{ 0, 0, 0, NULL }
@ -1318,7 +1318,7 @@ static int dissect_defaultValues_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509if_T_defaultValues_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues_item);
}
static const ber_sequence T_defaultValues_sequence_of[1] = {
static const ber_sequence_t T_defaultValues_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_defaultValues_item },
};
@ -1333,7 +1333,7 @@ static int dissect_defaultValues(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_T_defaultValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues);
}
static const ber_sequence SEQUNCE_OF_AttributeValue_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_AttributeValue_sequence_of[1] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item },
};
@ -1351,7 +1351,7 @@ static int dissect_selectedValues1(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509if_SEQUNCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues1);
}
static const ber_sequence ContextProfile_sequence[] = {
static const ber_sequence_t ContextProfile_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue },
{ 0, 0, 0, NULL }
@ -1368,7 +1368,7 @@ static int dissect_contexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts_item);
}
static const ber_sequence SEQUNCE_OF_ContextProfile_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ContextProfile_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item },
};
@ -1383,7 +1383,7 @@ static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509if_SEQUNCE_OF_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts);
}
static const ber_sequence SEQUNCE_OF_ContextCombination_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ContextCombination_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item1 },
};
@ -1410,7 +1410,7 @@ const value_string ContextCombination_vals[] = {
{ 0, NULL }
};
static const ber_choice ContextCombination_choice[] = {
static const ber_choice_t ContextCombination_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_context },
{ 1, BER_CLASS_CON, 1, 0, dissect_and1 },
{ 2, BER_CLASS_CON, 2, 0, dissect_or1 },
@ -1426,7 +1426,7 @@ dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence MatchingUse_sequence[] = {
static const ber_sequence_t MatchingUse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue },
{ 0, 0, 0, NULL }
@ -1443,7 +1443,7 @@ static int dissect_matchingUse_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse_item);
}
static const ber_sequence SEQUNCE_OF_MatchingUse_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_MatchingUse_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item },
};
@ -1458,7 +1458,7 @@ static int dissect_matchingUse(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SEQUNCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse);
}
static const ber_sequence RequestAttribute_sequence[] = {
static const ber_sequence_t RequestAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_selectedValues },
@ -1480,7 +1480,7 @@ static int dissect_inputAttributeTypes_item(packet_info *pinfo, proto_tree *tree
return dissect_x509if_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes_item);
}
static const ber_sequence SEQUNCE_OF_RequestAttribute_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_RequestAttribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item },
};
@ -1495,7 +1495,7 @@ static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509if_SEQUNCE_OF_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes);
}
static const ber_sequence SEQUNCE_OF_AttributeCombination_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_AttributeCombination_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item2 },
};
@ -1522,7 +1522,7 @@ const value_string AttributeCombination_vals[] = {
{ 0, NULL }
};
static const ber_choice AttributeCombination_choice[] = {
static const ber_choice_t AttributeCombination_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_attribute },
{ 1, BER_CLASS_CON, 1, 0, dissect_and2 },
{ 2, BER_CLASS_CON, 2, 0, dissect_or2 },
@ -1545,7 +1545,7 @@ static const value_string T_outputValues_vals[] = {
{ 0, NULL }
};
static const ber_choice T_outputValues_choice[] = {
static const ber_choice_t T_outputValues_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly },
{ 0, 0, 0, 0, NULL }
@ -1562,7 +1562,7 @@ static int dissect_outputValues(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_T_outputValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputValues);
}
static const ber_sequence ResultAttribute_sequence[] = {
static const ber_sequence_t ResultAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts },
@ -1580,7 +1580,7 @@ static int dissect_outputAttributeTypes_item(packet_info *pinfo, proto_tree *tre
return dissect_x509if_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes_item);
}
static const ber_sequence SEQUNCE_OF_ResultAttribute_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_ResultAttribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item },
};
@ -1595,7 +1595,7 @@ static int dissect_outputAttributeTypes(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509if_SEQUNCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes);
}
static const ber_sequence ControlOptions_sequence[] = {
static const ber_sequence_t ControlOptions_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -1616,7 +1616,7 @@ static int dissect_searchRuleControls(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509if_ControlOptions(FALSE, tvb, offset, pinfo, tree, hf_x509if_searchRuleControls);
}
static const ber_sequence Mapping_sequence[] = {
static const ber_sequence_t Mapping_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level },
{ 0, 0, 0, NULL }
@ -1633,7 +1633,7 @@ static int dissect_mapping_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping_item);
}
static const ber_sequence SEQUNCE_OF_Mapping_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_Mapping_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item },
};
@ -1648,7 +1648,7 @@ static int dissect_mapping(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509if_SEQUNCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping);
}
static const ber_sequence MRSubstitution_sequence[] = {
static const ber_sequence_t MRSubstitution_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_newMatchingRule },
@ -1666,7 +1666,7 @@ static int dissect_substitution_item(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution_item);
}
static const ber_sequence SEQUNCE_OF_MRSubstitution_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_MRSubstitution_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item },
};
@ -1681,7 +1681,7 @@ static int dissect_substitution(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_SEQUNCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution);
}
static const ber_sequence MRMapping_sequence[] = {
static const ber_sequence_t MRMapping_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution },
{ 0, 0, 0, NULL }
@ -1704,7 +1704,7 @@ static int dissect_relaxations_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations_item);
}
static const ber_sequence SEQUNCE_OF_MRMapping_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_MRMapping_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item },
};
@ -1722,7 +1722,7 @@ static int dissect_relaxations(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SEQUNCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations);
}
static const ber_sequence RelaxationPolicy_sequence[] = {
static const ber_sequence_t RelaxationPolicy_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_relaxations },
@ -1742,7 +1742,7 @@ static int dissect_relaxation(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509if_RelaxationPolicy(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxation);
}
static const ber_sequence SEQUNCE_OF_AttributeType_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_AttributeType_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item },
};
@ -1795,7 +1795,7 @@ static int dissect_imposedSubset(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_ImposedSubset(FALSE, tvb, offset, pinfo, tree, hf_x509if_imposedSubset);
}
static const ber_sequence EntryLimit_sequence[] = {
static const ber_sequence_t EntryLimit_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max },
{ 0, 0, 0, NULL }
@ -1812,7 +1812,7 @@ static int dissect_entryLimit(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509if_EntryLimit(FALSE, tvb, offset, pinfo, tree, hf_x509if_entryLimit);
}
static const ber_sequence SET_OF_DirectoryString_set_of[1] = {
static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_name_item },
};
@ -1827,7 +1827,7 @@ static int dissect_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_x509if_SET_OF_DirectoryString(FALSE, tvb, offset, pinfo, tree, hf_x509if_name);
}
static const ber_sequence SearchRuleDescription_sequence[] = {
static const ber_sequence_t SearchRuleDescription_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType },
@ -1857,7 +1857,7 @@ dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, i
return offset;
}
static const ber_sequence SearchRule_sequence[] = {
static const ber_sequence_t SearchRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType },
@ -1884,7 +1884,7 @@ dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
return offset;
}
static const ber_sequence SearchRuleId_sequence[] = {
static const ber_sequence_t SearchRuleId_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
{ 0, 0, 0, NULL }
@ -1905,7 +1905,7 @@ const value_string OutputValues_vals[] = {
{ 0, NULL }
};
static const ber_choice OutputValues_choice[] = {
static const ber_choice_t OutputValues_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly },
{ 0, 0, 0, 0, NULL }

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

@ -347,7 +347,7 @@ static const value_string CriteriaItem_vals[] = {
{ 0, NULL }
};
static const ber_choice CriteriaItem_choice[] = {
static const ber_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 },
@ -367,7 +367,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_x509sat_CriteriaItem(FALSE, tvb, offset, pinfo, tree, hf_x509sat_type);
}
static const ber_sequence SET_OF_Criteria_set_of[1] = {
static const ber_sequence_t SET_OF_Criteria_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
@ -394,7 +394,7 @@ const value_string Criteria_vals[] = {
{ 0, NULL }
};
static const ber_choice Criteria_choice[] = {
static const ber_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 },
@ -450,7 +450,7 @@ static int dissect_subset(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_T_subset(FALSE, tvb, offset, pinfo, tree, hf_x509sat_subset);
}
static const ber_sequence EnhancedGuide_sequence[] = {
static const ber_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 },
@ -465,7 +465,7 @@ dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
return offset;
}
static const ber_sequence PostalAddress_sequence_of[1] = {
static const ber_sequence_t PostalAddress_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_PostalAddress_item },
};
@ -509,7 +509,7 @@ static int dissect_answerback(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback);
}
static const ber_sequence TelexNumber_sequence[] = {
static const ber_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 },
@ -524,7 +524,7 @@ dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence FacsimileTelephoneNumber_sequence[] = {
static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber },
{ 0, 0, 0, NULL }
};
@ -593,7 +593,7 @@ static int dissect_PreferredDeliveryMethod_item(packet_info *pinfo, proto_tree *
return dissect_x509sat_PreferredDeliveryMethod_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_PreferredDeliveryMethod_item);
}
static const ber_sequence PreferredDeliveryMethod_sequence_of[1] = {
static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item },
};
@ -638,7 +638,7 @@ static int dissect_final1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_final1);
}
static const ber_sequence SET_OF_OCTET_STRING_set_of[1] = {
static const ber_sequence_t SET_OF_OCTET_STRING_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item },
};
@ -653,7 +653,7 @@ static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_SET_OF_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
}
static const ber_sequence PresentationAddress_sequence[] = {
static const ber_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 },
@ -669,7 +669,7 @@ dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static const ber_sequence SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item },
};
@ -684,7 +684,7 @@ static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
}
static const ber_sequence ProtocolInformation_sequence[] = {
static const ber_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 }
@ -698,7 +698,7 @@ dissect_x509sat_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static const ber_sequence NameAndOptionalUID_sequence[] = {
static const ber_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 }
@ -712,7 +712,7 @@ dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = {
static const ber_sequence_t SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
};
@ -727,7 +727,7 @@ static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
}
static const ber_sequence MultipleMatchingLocalities_sequence[] = {
static const ber_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 }
@ -750,7 +750,7 @@ static const value_string SubstringAssertion_item_vals[] = {
{ 0, NULL }
};
static const ber_choice SubstringAssertion_item_choice[] = {
static const ber_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 },
@ -769,7 +769,7 @@ static int dissect_SubstringAssertion_item(packet_info *pinfo, proto_tree *tree,
return dissect_x509sat_SubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_SubstringAssertion_item);
}
static const ber_sequence SubstringAssertion_sequence_of[1] = {
static const ber_sequence_t SubstringAssertion_sequence_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
};
@ -781,7 +781,7 @@ dissect_x509sat_SubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence CaseIgnoreListMatch_sequence_of[1] = {
static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_CaseIgnoreListMatch_item },
};
@ -801,7 +801,7 @@ static const value_string OctetSubstringAssertion_item_vals[] = {
{ 0, NULL }
};
static const ber_choice OctetSubstringAssertion_item_choice[] = {
static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_initial1 },
{ 1, BER_CLASS_CON, 1, 0, dissect_any1 },
{ 2, BER_CLASS_CON, 2, 0, dissect_final1 },
@ -819,7 +819,7 @@ static int dissect_OctetSubstringAssertion_item(packet_info *pinfo, proto_tree *
return dissect_x509sat_OctetSubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_OctetSubstringAssertion_item);
}
static const ber_sequence OctetSubstringAssertion_sequence_of[1] = {
static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
};
@ -831,7 +831,7 @@ dissect_x509sat_OctetSubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb
return offset;
}
static const ber_sequence ZonalSelect_sequence_of[1] = {
static const ber_sequence_t ZonalSelect_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item },
};
@ -886,7 +886,7 @@ static int dissect_at(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
return dissect_x509sat_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_at);
}
static const ber_sequence T_absolute_sequence[] = {
static const ber_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 }
@ -933,7 +933,7 @@ static int dissect_second1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second1);
}
static const ber_sequence DayTime_sequence[] = {
static const ber_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_second1 },
@ -954,7 +954,7 @@ static int dissect_endDayTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_DayTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_endDayTime);
}
static const ber_sequence DayTimeBand_sequence[] = {
static const ber_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 }
@ -971,7 +971,7 @@ static int dissect_timesOfDay_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509sat_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay_item);
}
static const ber_sequence SET_OF_DayTimeBand_set_of[1] = {
static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item },
};
@ -986,7 +986,7 @@ static int dissect_timesOfDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_SET_OF_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay);
}
static const ber_sequence SET_OF_INTEGER_set_of[1] = {
static const ber_sequence_t SET_OF_INTEGER_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item },
};
@ -1086,7 +1086,7 @@ const value_string NamedDay_vals[] = {
{ 0, NULL }
};
static const ber_choice NamedDay_choice[] = {
static const ber_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 }
@ -1125,7 +1125,7 @@ const value_string XDayOf_vals[] = {
{ 0, NULL }
};
static const ber_choice XDayOf_choice[] = {
static const ber_choice_t XDayOf_choice[] = {
{ 1, BER_CLASS_CON, 1, 0, dissect_first },
{ 2, BER_CLASS_CON, 2, 0, dissect_second },
{ 3, BER_CLASS_CON, 3, 0, dissect_third },
@ -1153,7 +1153,7 @@ static const value_string T_days_vals[] = {
{ 0, NULL }
};
static const ber_choice T_days_choice[] = {
static const ber_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_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
@ -1220,7 +1220,7 @@ static const value_string T_weeks_vals[] = {
{ 0, NULL }
};
static const ber_choice T_weeks_choice[] = {
static const ber_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 },
@ -1274,7 +1274,7 @@ static const value_string T_months_vals[] = {
{ 0, NULL }
};
static const ber_choice T_months_choice[] = {
static const ber_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 },
@ -1292,7 +1292,7 @@ static int dissect_months(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_T_months(FALSE, tvb, offset, pinfo, tree, hf_x509sat_months);
}
static const ber_sequence Period_sequence[] = {
static const ber_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 },
@ -1312,7 +1312,7 @@ static int dissect_periodic_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509sat_Period(FALSE, tvb, offset, pinfo, tree, hf_x509sat_periodic_item);
}
static const ber_sequence SET_OF_Period_set_of[1] = {
static const ber_sequence_t SET_OF_Period_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item },
};
@ -1334,7 +1334,7 @@ static const value_string T_time_vals[] = {
{ 0, NULL }
};
static const ber_choice T_time_choice[] = {
static const ber_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 }
@ -1377,7 +1377,7 @@ static int dissect_timeZone(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_TimeZone(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timeZone);
}
static const ber_sequence TimeSpecification_sequence[] = {
static const ber_sequence_t TimeSpecification_sequence[] = {
{ BER_CLASS_UNI, -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 },
@ -1392,7 +1392,7 @@ dissect_x509sat_TimeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence T_between_sequence[] = {
static const ber_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 },
@ -1418,7 +1418,7 @@ const value_string TimeAssertion_vals[] = {
{ 0, NULL }
};
static const ber_choice TimeAssertion_choice[] = {
static const ber_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 },
@ -1440,7 +1440,7 @@ const value_string LocaleContextSyntax_vals[] = {
{ 0, NULL }
};
static const ber_choice LocaleContextSyntax_choice[] = {
static const ber_choice_t LocaleContextSyntax_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_localeID1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_localeID2 },
{ 0, 0, 0, 0, NULL }

8
plugins/Xplugin_table.h
View File

@ -257,11 +257,11 @@ typedef int (*addr_dissect_ber_identifier) (packet_info *, proto_tree *, tvbuff_
typedef int (*addr_dissect_ber_length) (packet_info *, proto_tree *, tvbuff_t *, int, guint32 *, gboolean *);
typedef int (*addr_dissect_ber_integer) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, guint32 *);
typedef int (*addr_dissect_ber_boolean) (packet_info *, proto_tree *, tvbuff_t *, int, gint);
typedef int (*addr_dissect_ber_choice) (packet_info *, proto_tree *, tvbuff_t *, int, const ber_choice *, gint, gint);
typedef int (*addr_dissect_ber_choice) (packet_info *, proto_tree *, tvbuff_t *, int, const ber_choice_t *, gint, gint);
typedef int (*addr_dissect_ber_GeneralizedTime) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint);
typedef int (*addr_dissect_ber_sequence) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint);
typedef int (*addr_dissect_ber_sequence_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint);
typedef int (*addr_dissect_ber_set_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint);
typedef int (*addr_dissect_ber_sequence) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
typedef int (*addr_dissect_ber_sequence_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
typedef int (*addr_dissect_ber_set_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
typedef int (*addr_dissect_ber_octet_string) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **);
typedef int (*addr_dissect_ber_bitstring) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const asn_namedbit *, gint, gint, tvbuff_t **);
typedef int (*addr_dissect_ber_restricted_string) (gboolean, guint32, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **);

8
plugins/plugin_api_list.c
View File

@ -422,11 +422,11 @@ int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind);
int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *ch, gint hf_id, gint ett_id);
int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id);
int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id);
int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out);
int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn_namedbit const *named_bits, gint hf_id, gint ett_id, tvbuff_t **tvb_out);
int dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out);

14
tools/asn2eth.py
View File

@ -1956,7 +1956,7 @@ class SequenceOfType (SqType):
ef = ectx.field[f]['ethname']
out = ''
if (ectx.Ber()):
out = "static const ber_sequence %s_sequence_of[1] = {\n" % (tname)
out = "static const ber_sequence_t %s_sequence_of[1] = {\n" % (tname)
out += self.out_item(f, self.val, False, '', ectx)
out += "};\n"
out += ectx.eth_type_fn_hdr(tname)
@ -2025,7 +2025,7 @@ class SetOfType (SqType):
ef = ectx.field[f]['ethname']
out = ''
if (ectx.Ber()):
out = "static const ber_sequence %s_set_of[1] = {\n" % (tname)
out = "static const ber_sequence_t %s_set_of[1] = {\n" % (tname)
out += self.out_item(f, self.val, False, '', ectx)
out += "};\n"
out += ectx.eth_type_fn_hdr(tname)
@ -2146,10 +2146,7 @@ class SequenceType (SqType):
def eth_type_fn(self, proto, tname, ectx):
fname = ectx.eth_type[tname]['ref'][0]
if (ectx.OBer()):
out = "static const %s_sequence %s_sequence[] = {\n" % (ectx.encp(), tname)
else:
out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname)
out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname)
if hasattr(self, 'ext_list'):
ext = 'ASN1_EXTENSION_ROOT'
else:
@ -2385,10 +2382,7 @@ class ChoiceType (Type):
for e in (lst):
if (e.GetTag(ectx)[0] != t):
tagval = False
if (ectx.OBer()):
out += "static const %s_choice %s_choice[] = {\n" % (ectx.encp(), tname)
else:
out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname)
out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname)
cnt = 0
if hasattr(self, 'ext_list'):
ext = 'ASN1_EXTENSION_ROOT'