From 8afae320de76b02165028db72b7c8266e54f9566 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Mon, 13 Dec 2004 08:15:34 +0000 Subject: 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 --- asn1/MAP_Dialogue/Makefile | 2 +- asn1/cmip/cmip.cnf | 1 + asn1/cmip/packet-cmip-template.c | 1 + asn1/cms/Makefile | 2 +- asn1/cms/cms-exp.cnf | 2 ++ asn1/cms/cms.cnf | 1 + asn1/cms/packet-cms-template.c | 3 +++ asn1/gsmmap/Makefile | 2 +- asn1/gsmmap/packet-gsm_map-template.c | 10 +++++----- asn1/h248/Makefile | 2 +- asn1/logotype-cert-extn/Makefile | 4 ++-- asn1/ocsp/Makefile | 2 +- asn1/pkixproxy/Makefile | 2 +- 13 files changed, 21 insertions(+), 13 deletions(-) (limited to 'asn1') diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile index d1bf03a00b..6c4127089f 100755 --- a/asn1/MAP_Dialogue/Makefile +++ b/asn1/MAP_Dialogue/Makefile @@ -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 diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index e40c0e1efb..c9dd7aa4ab 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -12,6 +12,7 @@ InformationFramework x509if CMIPAbortInfo CMIPUserInfo ROS +InvokeIDType #.NO_EMIT diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 95951b121e..968636094b 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -35,6 +35,7 @@ #include #include "packet-ber.h" +#include "packet-x509if.h" #include "packet-cmip.h" #define PNAME "X711 CMIP" diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile index 3124abcd03..9fba674d4d 100755 --- a/asn1/cms/Makefile +++ b/asn1/cms/Makefile @@ -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 diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index aa570b6a91..230a1deec1 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -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 diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index ca6f88f3f4..5577b435c3 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -13,6 +13,7 @@ InformationFramework x509if #.EXPORTS ContentInfo ContentType +Countersignature DigestAlgorithmIdentifiers EncapsulatedContentInfo IssuerAndSerialNumber diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 439f23e267..293ac94460 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -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" diff --git a/asn1/gsmmap/Makefile b/asn1/gsmmap/Makefile index b55bfc55cf..7c03804228 100755 --- a/asn1/gsmmap/Makefile +++ b/asn1/gsmmap/Makefile @@ -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 diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 1e894beeb1..6134d0e629 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -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 diff --git a/asn1/h248/Makefile b/asn1/h248/Makefile index ea3dd6355f..01229a7d70 100755 --- a/asn1/h248/Makefile +++ b/asn1/h248/Makefile @@ -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 diff --git a/asn1/logotype-cert-extn/Makefile b/asn1/logotype-cert-extn/Makefile index ec035418cf..67b6a1281d 100755 --- a/asn1/logotype-cert-extn/Makefile +++ b/asn1/logotype-cert-extn/Makefile @@ -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 diff --git a/asn1/ocsp/Makefile b/asn1/ocsp/Makefile index 29b6ec4e87..5bebacf7b0 100755 --- a/asn1/ocsp/Makefile +++ b/asn1/ocsp/Makefile @@ -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 diff --git a/asn1/pkixproxy/Makefile b/asn1/pkixproxy/Makefile index 6199d4802e..db33a69ba8 100755 --- a/asn1/pkixproxy/Makefile +++ b/asn1/pkixproxy/Makefile @@ -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 -- cgit v1.2.3