From fe4e047ee7d5bc8564143a7605a9f2ce1b0ee036 Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Mon, 4 Sep 2017 22:34:50 -0700 Subject: [PATCH] added Ieee1609Dot2Data example --- examples/sample.makefile.regen | 10 +++++----- examples/sample.source.1609.2/Makefile | 14 +++++++------- .../sample-Ieee1609Dot2Data-1.coer | Bin 0 -> 205 bytes 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 examples/sample.source.1609.2/sample-Ieee1609Dot2Data-1.coer diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen index c58da42b..67f282a7 100755 --- a/examples/sample.makefile.regen +++ b/examples/sample.makefile.regen @@ -73,7 +73,7 @@ set +x echo 'check-ber:' echo " @if test -f sample-${ASN1PDU}-1.[db]er ; then \\" echo " for f in sample-*-*.[db]er; do \\" - echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\\1/"`; \' + echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\\1/"`; \' echo ' for b in 1 17 33 980 8192; do \' echo ' echo "Recoding $$f ($$pdu) into XER and back ($$b)..."; \' echo ' ./${TARGET} -p $$pdu -b $$b -iber -oxer $$f > ./.tmp.1.$$$$ || exit 2; \' @@ -88,7 +88,7 @@ set +x echo 'check-xer:' echo " @if test -f sample-${ASN1PDU}-1.xer ; then \\" echo " for f in sample-*-*.xer; do \\" - echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\\1/"`; \' + echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\\1/"`; \' echo ' for b in 1 17 33 980 8192; do \' echo ' echo "Recoding $$f ($$pdu) into DER and back ($$b)..."; \' echo ' ./${TARGET} -p $$pdu -b $$b -ixer -oder $$f > ./.tmp.1.$$$$ || exit 2; \' @@ -103,7 +103,7 @@ set +x echo 'check-oer:' echo " @if test -f sample-${ASN1PDU}-1.*oer ; then \\" echo " for f in sample-*-*.*oer; do \\" - echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\\1/"`; \' + echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\\1/"`; \' echo ' for b in 1 17 33 980 8192; do \' echo ' echo "Recoding $$f ($$pdu) into XER and back ($$b)..."; \' echo ' ./${TARGET} -p $$pdu -b $$b -ioer -oxer $$f > ./.tmp.1.$$$$ || exit 2; \' @@ -118,7 +118,7 @@ set +x echo 'check-per:' echo " @if test -f sample-${ASN1PDU}-1-nopad.per ; then \\" echo " for f in sample-*-[1-9]-nopad.per; do \\" - echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\\1/"`; \' + echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\\1/"`; \' echo ' for b in 1 17 33 980 8192; do \' echo ' echo "Recoding non-padded $$f ($$pdu) into DER into XER and back ($$b)..."; \' echo ' ./${TARGET} -p $$pdu -b $$b -per-nopad -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \' @@ -132,7 +132,7 @@ set +x echo ' done; done; fi' echo " @if test -f sample-${ASN1PDU}-1.per ; then \\" echo " for f in sample-*-[1-9].per; do \\" - echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\\1/"`; \' + echo ' pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\\1/"`; \' echo ' for b in 1 17 33 980 8192; do \' echo ' echo "Recoding $$f ($$pdu) into DER into XER and back ($$b)..."; \' echo ' ./${TARGET} -p $$pdu -b $$b -iper -oder $$f > ./.tmp.1.$$$$ || exit 3; \' diff --git a/examples/sample.source.1609.2/Makefile b/examples/sample.source.1609.2/Makefile index 37e2481e..3239286e 100644 --- a/examples/sample.source.1609.2/Makefile +++ b/examples/sample.source.1609.2/Makefile @@ -319,7 +319,7 @@ clean: regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ../../asn1c/asn1c -S ../../skeletons -pdu=Certificate -pdu=auto -fcompound-names -gen-OER ../IEEE-1609.2-2016.asn1 + ../../asn1c/asn1c -S ../../skeletons -pdu=Certificate -pdu=auto -pdu=Ieee1609Dot2Data -fcompound-names -gen-OER ../IEEE-1609.2-2016.asn1 Certificate.c: ../sample.makefile.regen ../IEEE-1609.2-2016.asn1 @@ -329,7 +329,7 @@ Certificate.c: ../sample.makefile.regen ../IEEE-1609.2-2016.asn1 regen-makefile: TITLE="IEEE 1609.2-2016 decoder" \ - ASN1CMDOPTS="-pdu=auto -fcompound-names -gen-OER" \ + ASN1CMDOPTS="-pdu=auto -pdu=Ieee1609Dot2Data -fcompound-names -gen-OER" \ ASN1MODULES="../IEEE-1609.2-2016.asn1" \ ASN1PDU=Certificate \ PROGNAME=1609-2-dump \ @@ -344,7 +344,7 @@ check: ${TARGET} check-ber check-xer check-oer check-per check-ber: @if test -f sample-Certificate-1.[db]er ; then \ for f in sample-*-*.[db]er; do \ - pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ + pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\1/"`; \ for b in 1 17 33 980 8192; do \ echo "Recoding $$f ($$pdu) into XER and back ($$b)..."; \ ./${TARGET} -p $$pdu -b $$b -iber -oxer $$f > ./.tmp.1.$$$$ || exit 2; \ @@ -359,7 +359,7 @@ check-ber: check-xer: @if test -f sample-Certificate-1.xer ; then \ for f in sample-*-*.xer; do \ - pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ + pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\1/"`; \ for b in 1 17 33 980 8192; do \ echo "Recoding $$f ($$pdu) into DER and back ($$b)..."; \ ./${TARGET} -p $$pdu -b $$b -ixer -oder $$f > ./.tmp.1.$$$$ || exit 2; \ @@ -374,7 +374,7 @@ check-xer: check-oer: @if test -f sample-Certificate-1.*oer ; then \ for f in sample-*-*.*oer; do \ - pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ + pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\1/"`; \ for b in 1 17 33 980 8192; do \ echo "Recoding $$f ($$pdu) into XER and back ($$b)..."; \ ./${TARGET} -p $$pdu -b $$b -ioer -oxer $$f > ./.tmp.1.$$$$ || exit 2; \ @@ -389,7 +389,7 @@ check-oer: check-per: @if test -f sample-Certificate-1-nopad.per ; then \ for f in sample-*-[1-9]-nopad.per; do \ - pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ + pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\1/"`; \ for b in 1 17 33 980 8192; do \ echo "Recoding non-padded $$f ($$pdu) into DER into XER and back ($$b)..."; \ ./${TARGET} -p $$pdu -b $$b -per-nopad -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \ @@ -403,7 +403,7 @@ check-per: done; done; fi @if test -f sample-Certificate-1.per ; then \ for f in sample-*-[1-9].per; do \ - pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \ + pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z0-9-]+)-[0-9].*/\1/"`; \ for b in 1 17 33 980 8192; do \ echo "Recoding $$f ($$pdu) into DER into XER and back ($$b)..."; \ ./${TARGET} -p $$pdu -b $$b -iper -oder $$f > ./.tmp.1.$$$$ || exit 3; \ diff --git a/examples/sample.source.1609.2/sample-Ieee1609Dot2Data-1.coer b/examples/sample.source.1609.2/sample-Ieee1609Dot2Data-1.coer new file mode 100644 index 0000000000000000000000000000000000000000..49907a7f35cb7d8440fdf8d87546aa209ca4985d GIT binary patch literal 205 zcmZQ>WN=_^5MW^8=PUhnfPv$$dI9$&85Rdd1qKH8Jl!d6C5?=X49tuTx5~2l)cY^l z1~fD8wU>q2Ll%u3m*?V z2hTeu7Cv@HW(F1}PA(?41vZR)T%1fiyetf?4BcGsESN>RK9w7@ure@n^D%HTvGD@{ DIG`z% literal 0 HcmV?d00001