From 9bcc5990ba290e30aaed1a5eb3e0cc8bb4961aa2 Mon Sep 17 00:00:00 2001 From: vlm Date: Fri, 25 Aug 2006 01:51:29 +0000 Subject: [PATCH] converter-sample.c instead of asn-decoder-template.c git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1139 59561ff5-6e30-0410-9f3c-9617f08c8826 --- ChangeLog | 1 + examples/sample.source.MHEG5/Makefile | 6 +++--- examples/sample.source.MHEG5/README | 21 +++++-------------- examples/sample.source.PKIX1/Makefile | 8 ++++--- examples/sample.source.PKIX1/README | 13 ++---------- examples/sample.source.TAP3/Makefile | 6 +++--- examples/sample.source.TAP3/README | 19 ++++------------- ...-decoder-template.c => converter-sample.c} | 0 skeletons/file-dependencies | 2 +- 9 files changed, 24 insertions(+), 52 deletions(-) rename skeletons/{asn-decoder-template.c => converter-sample.c} (100%) diff --git a/ChangeLog b/ChangeLog index e4dad7d1..1cba2fbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * [typedef enum foo {}] foo_e; is now e_foo, see #1287989 * Refactored ValueSetTypeAssignment parsing. * First release of PER encoder (does not encode SETs yet). + * asn-decoder-template.c renamed into converter-sample.c 0.9.20: 2006-Mar-06 diff --git a/examples/sample.source.MHEG5/Makefile b/examples/sample.source.MHEG5/Makefile index c61e043d..7fe0f49d 100644 --- a/examples/sample.source.MHEG5/Makefile +++ b/examples/sample.source.MHEG5/Makefile @@ -470,9 +470,9 @@ InterchangedObject.c: ../ISO13522-MHEG-5.asn regenerate.Makefile @touch InterchangedObject.c make -ASN_DECODER_TEMPLATE=../../skeletons/asn-decoder-template.c -$(TARGET).o: $(ASN_DECODER_TEMPLATE) - $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_InterchangedObject -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE) +ASN_CONVERTER=../../skeletons/converter-sample.c +$(TARGET).o: $(ASN_CONVERTER) + $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_InterchangedObject -o $(TARGET).o -c $(ASN_CONVERTER) distclean: clean rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS) diff --git a/examples/sample.source.MHEG5/README b/examples/sample.source.MHEG5/README index 2fe89c1e..3b8dc0c6 100644 --- a/examples/sample.source.MHEG5/README +++ b/examples/sample.source.MHEG5/README @@ -13,6 +13,9 @@ THERE IS NO ISO13522-MHEG-5.asn FILE THERE YET! OBTAINING THE MHEG-5 SPECIFICATION ================================== +Due to licensing restrictions, asn1c can not include the MHEG-5 ASN.1 module +in its distribution. + To obtain the MHEG-5 ASN.1 specification, you should go to http://www.itu.int/ITU-T/asn1/database/itu-t/t/t172 and select the latest "Text" version of the corresponding ASN.1 module. @@ -26,23 +29,9 @@ mheg5dump USAGE The mheg5dump utility may be used to dump the contents of the BER-encoded MHEG-5 data record file: - ./mheg5dump -x tapfile.der # Print as XML (BASIC-XER) - -If necessary, a straightforward modification of the - ../../skeletons/asn-decoder-template.c -will allow you to build a converter from the XML (XER) MHEG-5 format -back into binary (BER). + ./mheg5dump tapfile.der # Print MHEG-5 stream as XML (BASIC-XER) The full list of recognized command line options may be obtained with - > ./mheg5dump -h - Usage: ./mheg5dump [options] ... - Where options are: - -b Set the i/o buffer size (default is 8192) - -c Check ASN.1 constraints after decoding - -d Enable debugging (-dd is even better) - -n Process files times - -s Set the stack usage limit - -p Print out the decoded contents - -x Print out as XML + ./mheg5dump -h diff --git a/examples/sample.source.PKIX1/Makefile b/examples/sample.source.PKIX1/Makefile index 8fecc54d..6eb381ff 100644 --- a/examples/sample.source.PKIX1/Makefile +++ b/examples/sample.source.PKIX1/Makefile @@ -334,6 +334,8 @@ ASN_MODULE_HEADERS+=per_support.h ASN_MODULE_SOURCES+=per_support.c ASN_MODULE_HEADERS+=per_decoder.h ASN_MODULE_SOURCES+=per_decoder.c +ASN_MODULE_HEADERS+=per_encoder.h +ASN_MODULE_SOURCES+=per_encoder.c lib_LTLIBRARIES=libsomething.la @@ -371,9 +373,9 @@ Certificate.c: regenerate.Makefile @touch Certificate.c make -ASN_DECODER_TEMPLATE=../../skeletons/asn-decoder-template.c -$(TARGET).o: $(ASN_DECODER_TEMPLATE) - $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_Certificate -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE) +ASN_CONVERTER=../../skeletons/converter-sample.c +$(TARGET).o: $(ASN_CONVERTER) + $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_Certificate -o $(TARGET).o -c $(ASN_CONVERTER) distclean: clean rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS) diff --git a/examples/sample.source.PKIX1/README b/examples/sample.source.PKIX1/README index d204dab1..b28e817a 100644 --- a/examples/sample.source.PKIX1/README +++ b/examples/sample.source.PKIX1/README @@ -5,7 +5,7 @@ GENERAL INFORMATION The X.509 (PKIX1) certificate decoder. Invoking `make` will compile the ASN.1 specifications from the rfc3280.txt in the above directory. -The ../../skeletons/asn-decoder-template.c will supply the missing +The ../../skeletons/converter-sample.c will supply the missing "int main()" routine which drives the decoding process. x509dump USAGE @@ -24,18 +24,9 @@ may be used to convert between PEM and DER. After convertsion, the x509dump utility may be used to dump the contents of the DER-encoded X.509 certificate: - ./x509dump -x certificate.der # Print as XML (BASIC-XER) + ./x509dump certificate.der # Print as XML (BASIC-XER) The full list of recognized command line options may be obtained with > ./x509dump -h - Usage: ./x509dump [options] ... - Where options are: - -b Set the i/o buffer size (default is 8192) - -c Check ASN.1 constraints after decoding - -d Enable debugging (-dd is even better) - -n Process files times - -s Set the stack usage limit - -p Print out the decoded contents - -x Print out as XML diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile index abd99c9f..24833598 100644 --- a/examples/sample.source.TAP3/Makefile +++ b/examples/sample.source.TAP3/Makefile @@ -700,9 +700,9 @@ DataInterChange.c: ../tap3.asn1 regenerate.Makefile @touch DataInterChange.c make -ASN_DECODER_TEMPLATE=../../skeletons/asn-decoder-template.c -$(TARGET).o: $(ASN_DECODER_TEMPLATE) - $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_DataInterChange -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE) +ASN_CONVERTER=../../skeletons/converter-sample.c +$(TARGET).o: $(ASN_CONVERTER) + $(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_DataInterChange -o $(TARGET).o -c $(ASN_CONVERTER) distclean: clean rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS) diff --git a/examples/sample.source.TAP3/README b/examples/sample.source.TAP3/README index 4df59949..e3f9a1f5 100644 --- a/examples/sample.source.TAP3/README +++ b/examples/sample.source.TAP3/README @@ -11,6 +11,9 @@ THERE IS NO tap3.asn1 FILE THERE YET! OBTAINING THE TAP3 SPECIFICATION ================================ +Due to licensing restrictions, asn1c can not include the TAP3 ASN.1 module +in its distribution. + To obtain the TAP3 ASN.1 specification, you should go to http://www.gsmworld.com/using/billing/tap3_legal.html and agree with their licensing terms by clicking the "I ACCEPT" button. @@ -33,23 +36,9 @@ tap3dump USAGE The tap3dump utility may be used to dump the contents of the BER-encoded TAP3 data record file: - ./tap3dump -x tapfile.der # Print as XML (BASIC-XER) - -If necessary, a straightforward modification of the - ../../skeletons/asn-decoder-template.c -will allow you to build a converter from the XML (XER) TAP3 format -back into binary (BER). + ./tap3dump tapfile.ber # Print as XML (BASIC-XER) The full list of recognized command line options may be obtained with > ./tap3dump -h - Usage: ./tap3dump [options] ... - Where options are: - -b Set the i/o buffer size (default is 8192) - -c Check ASN.1 constraints after decoding - -d Enable debugging (-dd is even better) - -n Process files times - -s Set the stack usage limit - -p Print out the decoded contents - -x Print out as XML diff --git a/skeletons/asn-decoder-template.c b/skeletons/converter-sample.c similarity index 100% rename from skeletons/asn-decoder-template.c rename to skeletons/converter-sample.c diff --git a/skeletons/file-dependencies b/skeletons/file-dependencies index 972eea47..a640145e 100644 --- a/skeletons/file-dependencies +++ b/skeletons/file-dependencies @@ -61,6 +61,6 @@ xer_encoder.h xer_encoder.c # XER encoding support per_support.h per_support.c # PER parsing per_decoder.h per_decoder.c # PER decoding support per_encoder.h per_encoder.c # PER encoding support -#asn-decoder-template.c # Template for quick decoder creation +#converter-sample.c # A sample of transcoder CODEC-PER: # THIS IS A SPECIAL SECTION