asn1: use rfc2459.opt

This commit is contained in:
Nicolas Williams
2019-10-03 17:26:19 -05:00
parent 6f2b52bc97
commit 120619dbd0
4 changed files with 8 additions and 10 deletions

View File

@@ -207,7 +207,7 @@ $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files
$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files
rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
$(ASN1_COMPILE) --one-code-file --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/rfc2459.opt $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)

View File

@@ -211,12 +211,7 @@ $(gen_files_rfc2459) $(OBJ)\rfc2459_asn1.hx: $(BINDIR)\asn1_compile.exe rfc2459.
cd $(OBJ)
$(BINDIR)\asn1_compile.exe \
--one-code-file \
--preserve-binary=TBSCertificate \
--preserve-binary=TBSCRLCertList \
--preserve-binary=Name \
--sequence=GeneralNames \
--sequence=Extensions \
--sequence=CRLDistributionPoints \
--option-file=$(SRCDIR)\_rfc2459.opt \
$(SRCDIR)\rfc2459.asn1 rfc2459_asn1 \
|| ($(RM) $(OBJ)\rfc2459_asn1.h ; exit /b 1)
cd $(SRCDIR)

View File

@@ -23,6 +23,7 @@ EXPORTS
add_GeneralNames
add_METHOD_DATA
add_Principals
add_RDNSequence
asn1_APOptions_units
asn1_DigestTypes_units
asn1_DistributionPointReasonFlags_units

View File

@@ -1,6 +1,8 @@
--preserve-binary=Name
--preserve-binary=TBSCertificate
--preserve-binary=TBSCRLCertList
--preserve-binary=Name
--sequence=GeneralNames
--sequence=Extensions
--sequence=AttributeValues
--sequence=CRLDistributionPoints
--sequence=Extensions
--sequence=GeneralNames
--sequence=RDNSequence