Move ASN.1 modules from lib/hx509 to lib/asn1

This will help us generate a directory of OIDs from all the ASN.1
modules in lib/asn1, which will then help us create an hx509 API for
resolving OIDs to/from friendly names, which ultimately will help us
make hxtool more user-friendly.

lib/asn1/Makefile.am

@@ -25,17 +25,22 @@ BUILT_SOURCES =				\
 	$(gen_files_rfc2459:.x=.c)	\
 	$(gen_files_cms:.x=.c)		\
 	$(gen_files_krb5:.x=.c)		\
+	$(gen_files_ocsp:.x=.c)	\
 	$(gen_files_pkinit:.x=.c)	\
 	$(gen_files_pkcs8:.x=.c)	\
 	$(gen_files_pkcs9:.x=.c)	\
+	$(gen_files_pkcs10:.x=.c)	\
 	$(gen_files_pkcs12:.x=.c)	\
 	$(gen_files_digest:.x=.c)	\
 	$(gen_files_kx509:.x=.c)
 
 gen_files_krb5 = asn1_krb5_asn1.x
 gen_files_cms = asn1_cms_asn1.x
+gen_files_crmf = asn1_crmf_asn1.x
 gen_files_rfc2459 = asn1_rfc2459_asn1.x
+gen_files_ocsp = asn1_ocsp_asn1.x
 gen_files_pkinit = asn1_pkinit_asn1.x
+gen_files_pkcs10 = asn1_pkcs10_asn1.x
 gen_files_pkcs12 = asn1_pkcs12_asn1.x
 gen_files_pkcs8 = asn1_pkcs8_asn1.x
 gen_files_pkcs9 = asn1_pkcs9_asn1.x
@@ -133,9 +138,11 @@ CLEANFILES = \
 	$(gen_files_rfc2459) \
 	$(gen_files_cms) \
 	$(gen_files_krb5) \
+	$(gen_files_ocsp) \
 	$(gen_files_pkinit) \
 	$(gen_files_pkcs8) \
 	$(gen_files_pkcs9) \
+	$(gen_files_pkcs10) \
 	$(gen_files_pkcs12) \
 	$(gen_files_digest) \
 	$(gen_files_kx509) \
@@ -145,10 +152,13 @@ CLEANFILES = \
 	asn1_err.c asn1_err.h \
 	rfc2459_asn1_files rfc2459_asn1*.h* \
 	cms_asn1_files cms_asn1*.h* \
+	crmf_asn1_files crmf_asn1*.h* \
 	krb5_asn1_files krb5_asn1*.h* \
+	ocsp_asn1_files ocsp_asn1*.h* \
 	pkinit_asn1_files pkinit_asn1*.h* \
 	pkcs8_asn1_files pkcs8_asn1*.h* \
 	pkcs9_asn1_files pkcs9_asn1*.h* \
+	pkcs10_asn1_files pkcs10_asn1*.h* \
 	pkcs12_asn1_files pkcs12_asn1*.h* \
 	digest_asn1_files digest_asn1*.h* \
 	kx509_asn1_files kx509_asn1*.h* \
@@ -164,9 +174,12 @@ nodist_include_HEADERS = asn1_err.h
 nodist_include_HEADERS += krb5_asn1.h
 nodist_include_HEADERS += pkinit_asn1.h
 nodist_include_HEADERS += cms_asn1.h
+nodist_include_HEADERS += crmf_asn1.h
 nodist_include_HEADERS += rfc2459_asn1.h
+nodist_include_HEADERS += ocsp_asn1.h
 nodist_include_HEADERS += pkcs8_asn1.h
 nodist_include_HEADERS += pkcs9_asn1.h
+nodist_include_HEADERS += pkcs10_asn1.h
 nodist_include_HEADERS += pkcs12_asn1.h
 nodist_include_HEADERS += digest_asn1.h
 nodist_include_HEADERS += kx509_asn1.h
@@ -174,9 +187,12 @@ nodist_include_HEADERS += kx509_asn1.h
 priv_headers  = krb5_asn1-priv.h
 priv_headers += pkinit_asn1-priv.h
 priv_headers += cms_asn1-priv.h
+priv_headers += crmf_asn1-priv.h
 priv_headers += rfc2459_asn1-priv.h
+priv_headers += ocsp_asn1-priv.h
 priv_headers += pkcs8_asn1-priv.h
 priv_headers += pkcs9_asn1-priv.h
+priv_headers += pkcs10_asn1-priv.h
 priv_headers += pkcs12_asn1-priv.h
 priv_headers += digest_asn1-priv.h
 priv_headers += kx509_asn1-priv.h
@@ -195,14 +211,17 @@ $(asn1_print_OBJECTS): krb5_asn1.h
 asn1parse.h: asn1parse.c
 
 $(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx: krb5_asn1_files
+$(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files
 $(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx: pkinit_asn1_files
 $(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx: pkcs8_asn1_files
 $(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx: pkcs9_asn1_files
+$(gen_files_pkcs10) pkcs10_asn1.hx pkcs10_asn1-priv.hx: pkcs10_asn1_files
 $(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx: pkcs12_asn1_files
 $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files
 $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files
 $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files
 $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files
+$(gen_files_crmf) crmf_asn1.hx crmf_asn1-priv.hx: crmf_asn1_files
 $(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
 
@@ -212,9 +231,15 @@ rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
 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)
 
+crmf_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1 $(srcdir)/crmf.opt
+	$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/crmf.opt $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
+
 krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
 	$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
 
+ocsp_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
+	$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/ocsp.opt $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
+
 pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
 	$(ASN1_COMPILE) --one-code-file $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
 
@@ -224,6 +249,9 @@ pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
 pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
 	$(ASN1_COMPILE) --one-code-file $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
 
+pkcs10_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs10.asn1
+	$(ASN1_COMPILE) --one-code-file --option-file=$(srcdir)/pkcs10.opt $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
+
 pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
 	$(ASN1_COMPILE) --one-code-file $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
 
@@ -247,15 +275,19 @@ EXTRA_DIST =		\
 	libasn1-exports.def \
 	cms.asn1	\
 	cms.opt		\
+	crmf.asn1	\
+	crmf.opt	\
 	asn1_err.et	\
 	canthandle.asn1	\
 	digest.asn1	\
 	krb5.asn1	\
 	krb5.opt	\
 	kx509.asn1	\
+	ocsp.asn1	\
 	pkcs12.asn1	\
 	pkcs8.asn1	\
 	pkcs9.asn1	\
+	pkcs10.asn1	\
 	pkinit.asn1	\
 	rfc2459.asn1	\
 	setchgpw2.asn1	\

lib/asn1/NTMakefile

@@ -39,8 +39,12 @@ gen_files_krb5		= $(OBJ)\asn1_krb5_asn1.x
 
 gen_files_cms		= $(OBJ)\asn1_cms_asn1.x
 
+gen_files_crmf		= $(OBJ)\asn1_crmf_asn1.x
+
 gen_files_rfc2459	= $(OBJ)\asn1_rfc2459_asn1.x
 
+gen_files_ocsp		= $(OBJ)\asn1_ocsp_asn1.x
+
 gen_files_pkinit	= $(OBJ)\asn1_pkinit_asn1.x
 
 gen_files_pkcs12	= $(OBJ)\asn1_pkcs12_asn1.x
@@ -49,6 +53,8 @@ gen_files_pkcs8		= $(OBJ)\asn1_pkcs8_asn1.x
 
 gen_files_pkcs9		= $(OBJ)\asn1_pkcs9_asn1.x
 
+gen_files_pkcs10	= $(OBJ)\asn1_pkcs10_asn1.x
+
 gen_files_test		= $(OBJ)\asn1_test_asn1.x
 
 gen_files_digest	= $(OBJ)\asn1_digest_asn1.x
@@ -112,10 +118,13 @@ LIBASN1_OBJS=	\
 	$(OBJ)\timegm.obj		\
 	$(gen_files_rfc2459:.x=.obj)	\
 	$(gen_files_cms:.x=.obj)	\
+	$(gen_files_crmf:.x=.obj)	\
 	$(gen_files_krb5:.x=.obj)		\
+	$(gen_files_ocsp:.x=.obj)	\
 	$(gen_files_pkinit:.x=.obj)	\
 	$(gen_files_pkcs8:.x=.obj)	\
 	$(gen_files_pkcs9:.x=.obj)	\
+	$(gen_files_pkcs10:.x=.obj)	\
 	$(gen_files_pkcs12:.x=.obj)	\
 	$(gen_files_digest:.x=.obj)	\
 	$(gen_files_kx509:.x=.obj)	\
@@ -144,12 +153,16 @@ $(**: =
 
 $(gen_files_krb5:.x=.c)	    : $$(@R).x
 
+$(gen_files_ocsp:.x=.c)   : $$(@R).x
+
 $(gen_files_pkinit:.x=.c)   : $$(@R).x
 
 $(gen_files_pkcs8:.x=.c)    : $$(@R).x
 
 $(gen_files_pkcs9:.x=.c)    : $$(@R).x
 
+$(gen_files_pkcs10:.x=.c)   : $$(@R).x
+
 $(gen_files_pkcs12:.x=.c)   : $$(@R).x
 
 $(gen_files_digest:.x=.c)   : $$(@R).x
@@ -160,6 +173,8 @@ $(gen_files_rfc2459:.x=.c)  : $$(@R).x
 
 $(gen_files_cms:.x=.c)	    : $$(@R).x
 
+$(gen_files_crmf:.x=.c)	    : $$(@R).x
+
 $(gen_files_test:.x=.c)	    : $$(@R).x
 
 $(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5.opt
@@ -171,6 +186,16 @@ $(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5
 	|| ($(RM) $(OBJ)\krb5_asn1.h ; exit /b 1)
 	cd $(SRCDIR)
 
+$(gen_files_ocsp) $(OBJ)\ocsp_asn1.hx: $(BINDIR)\asn1_compile.exe ocsp.asn1
+	cd $(OBJ)
+	$(BINDIR)\asn1_compile.exe \
+		--one-code-file \
+		--option-file=$(SRCDIR)\ocsp.opt \
+		$(SRCDIR)\ocsp.asn1 \
+		ocsp_asn1 \
+	|| ($(RM) $(OBJ)\ocsp_asn1.h ; exit /b 1)
+	cd $(SRCDIR)
+
 $(gen_files_pkinit) $(OBJ)\pkinit_asn1.hx: $(BINDIR)\asn1_compile.exe pkinit.asn1
 	cd $(OBJ)
 	$(BINDIR)\asn1_compile.exe --one-code-file $(SRCDIR)\pkinit.asn1 pkinit_asn1 \
@@ -189,6 +214,16 @@ $(gen_files_pkcs9) $(OBJ)\pkcs9_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs9.asn1
 	|| ($(RM) $(OBJ)\pkcs9_asn1.h ; exit /b 1)
 	cd $(SRCDIR)
 
+$(gen_files_pkcs10) $(OBJ)\pkcs10_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs10.asn1
+	cd $(OBJ)
+	$(BINDIR)\asn1_compile.exe \
+		--one-code-file \
+		--option-file=$(SRCDIR)\pkcs10.opt \
+		$(SRCDIR)\pkcs10.asn1 \
+		pkcs10_asn1 \
+	|| ($(RM) $(OBJ)\pkcs10_asn1.h ; exit /b 1)
+	cd $(SRCDIR)
+
 $(gen_files_pkcs12) $(OBJ)\pkcs12_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs12.asn1
 	cd $(OBJ)
 	$(BINDIR)\asn1_compile.exe --one-code-file $(SRCDIR)\pkcs12.asn1 pkcs12_asn1 \
@@ -211,7 +246,7 @@ $(gen_files_rfc2459) $(OBJ)\rfc2459_asn1.hx: $(BINDIR)\asn1_compile.exe rfc2459.
 	cd $(OBJ)
 	$(BINDIR)\asn1_compile.exe \
 		--one-code-file \
-		--option-file=$(SRCDIR)\_rfc2459.opt \
+		--option-file=$(SRCDIR)\rfc2459.opt \
 		$(SRCDIR)\rfc2459.asn1 rfc2459_asn1 \
 	|| ($(RM) $(OBJ)\rfc2459_asn1.h ; exit /b 1)
 	cd $(SRCDIR)
@@ -224,6 +259,14 @@ $(gen_files_cms) $(OBJ)\cms_asn1.hx: $(BINDIR)\asn1_compile.exe cms.asn1 cms.opt
 	|| ($(RM) $(OBJ)\cms_asn1.h ; exit /b 1)
 	cd $(SRCDIR)
 
+$(gen_files_crmf) $(OBJ)\crmf_asn1.hx: $(BINDIR)\asn1_compile.exe crmf.asn1 crmf.opt
+	cd $(OBJ)
+	$(BINDIR)\asn1_compile.exe \
+		--one-code-file --option-file=$(SRCDIR)\crmf.opt \
+		$(SRCDIR)\crmf.asn1 crmf_asn1 \
+	|| ($(RM) $(OBJ)\crmf_asn1.h ; exit /b 1)
+	cd $(SRCDIR)
+
 $(gen_files_test) $(OBJ)\test_asn1.hx: $(BINDIR)\asn1_compile.exe test.asn1
 	cd $(OBJ)
 	$(BINDIR)\asn1_compile.exe \
@@ -246,20 +289,26 @@ $(INCDIR)\der-protos.h: $(OBJ)\der-protos.h
 GENINCFILES=			    \
 	$(INCDIR)\asn1_err.h	    \
 	$(INCDIR)\cms_asn1.h	    \
+	$(INCDIR)\crmf_asn1.h	    \
 	$(INCDIR)\digest_asn1.h	    \
 	$(INCDIR)\krb5_asn1.h	    \
 	$(INCDIR)\kx509_asn1.h	    \
+	$(INCDIR)\ocsp_asn1.h	    \
 	$(INCDIR)\pkcs12_asn1.h	    \
 	$(INCDIR)\pkcs8_asn1.h	    \
 	$(INCDIR)\pkcs9_asn1.h	    \
+	$(INCDIR)\pkcs10_asn1.h	    \
 	$(INCDIR)\pkinit_asn1.h	    \
 	$(INCDIR)\rfc2459_asn1.h    \
 	$(OBJ)\krb5_asn1-priv.h	    \
+	$(OBJ)\ocsp_asn1-priv.h     \
 	$(OBJ)\pkinit_asn1-priv.h   \
 	$(OBJ)\cms_asn1-priv.h	    \
+	$(OBJ)\crmf_asn1-priv.h	    \
 	$(OBJ)\rfc2459_asn1-priv.h  \
 	$(OBJ)\pkcs8_asn1-priv.h    \
 	$(OBJ)\pkcs9_asn1-priv.h    \
+	$(OBJ)\pkcs10_asn1-priv.h   \
 	$(OBJ)\pkcs12_asn1-priv.h   \
 	$(OBJ)\digest_asn1-priv.h   \
 	$(OBJ)\kx509_asn1-priv.h    \

lib/hx509/Makefile.am

@@ -7,50 +7,9 @@ libhx509_la_LDFLAGS = -version-info 5:0:0
 
 BUILT_SOURCES =				\
 	sel-gram.h			\
-	$(gen_files_ocsp:.x=.c)		\
-	$(gen_files_pkcs10:.x=.c)	\
 	hx509_err.c			\
 	hx509_err.h
 
-gen_files_ocsp = 			\
-	asn1_OCSPBasicOCSPResponse.x	\
-	asn1_OCSPCertID.x		\
-	asn1_OCSPCertStatus.x		\
-	asn1_OCSPInnerRequest.x		\
-	asn1_OCSPKeyHash.x		\
-	asn1_OCSPRequest.x		\
-	asn1_OCSPResponderID.x		\
-	asn1_OCSPResponse.x		\
-	asn1_OCSPResponseBytes.x	\
-	asn1_OCSPResponseData.x		\
-	asn1_OCSPResponseStatus.x	\
-	asn1_OCSPSignature.x		\
-	asn1_OCSPSingleResponse.x	\
-	asn1_OCSPTBSRequest.x		\
-	asn1_OCSPVersion.x		\
-	asn1_id_pkix_ocsp.x		\
-	asn1_id_pkix_ocsp_basic.x	\
-	asn1_id_pkix_ocsp_nonce.x
-
-gen_files_pkcs10 = 			\
-	asn1_CertificationRequestInfo.x	\
-	asn1_CertificationRequest.x
-
-gen_files_crmf = 			\
-	asn1_CRMFRDNSequence.x		\
-	asn1_CertReqMessages.x		\
-	asn1_CertReqMsg.x		\
-	asn1_CertRequest.x		\
-	asn1_CertTemplate.x		\
-	asn1_Controls.x			\
-	asn1_PBMParameter.x		\
-	asn1_PKMACValue.x		\
-	asn1_POPOPrivKey.x		\
-	asn1_POPOSigningKey.x		\
-	asn1_POPOSigningKeyInput.x	\
-	asn1_ProofOfPossession.x	\
-	asn1_SubsequentMessage.x	
-
 AM_YFLAGS = -d
 
 dist_libhx509_la_SOURCES = \
@@ -113,32 +72,11 @@ $(libhx509_la_OBJECTS): $(srcdir)/version-script.map $(nodist_include_HEADERS) $
 
 nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
 
-$(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files
-$(gen_files_pkcs10) pkcs10_asn1.hx pkcs10_asn1-priv.hx: pkcs10_asn1_files
-$(gen_files_crmf) crmf_asn1.hx crmf_asn1-priv.hx: crmf_asn1_files
-
 dist_include_HEADERS = hx509.h $(srcdir)/hx509-protos.h
 
 noinst_HEADERS = $(srcdir)/hx509-private.h
 
 nodist_include_HEADERS = hx509_err.h
-nodist_include_HEADERS += ocsp_asn1.h
-nodist_include_HEADERS += pkcs10_asn1.h
-nodist_include_HEADERS += crmf_asn1.h
-
-priv_headers  = ocsp_asn1-priv.h
-priv_headers += pkcs10_asn1-priv.h
-priv_headers += crmf_asn1-priv.h
-
-
-ocsp_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/ocsp.asn1 $(srcdir)/ocsp.opt
-	$(heim_verbose)$(ASN1_COMPILE) --option-file=$(srcdir)/ocsp.opt $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
-
-pkcs10_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs10.asn1 $(srcdir)/pkcs10.opt
-	$(heim_verbose)$(ASN1_COMPILE) --option-file=$(srcdir)/pkcs10.opt $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
-
-crmf_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/crmf.asn1
-	$(heim_verbose)$(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
 
 ALL_OBJECTS  = $(libhx509_la_OBJECTS)
 ALL_OBJECTS += $(hxtool_OBJECTS)
@@ -148,7 +86,6 @@ HX509_PROTOS = $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h
 $(ALL_OBJECTS): $(HX509_PROTOS)
 
 $(libhx509_la_OBJECTS): $(srcdir)/hx_locl.h
-$(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h
 
 $(srcdir)/hx509-protos.h: $(dist_libhx509_la_SOURCES)
 	$(heim_verbose)cd $(srcdir) && perl ../../cf/make-proto.pl -R '^(_|^C)' -E HX509_LIB -q -P comment -o hx509-protos.h $(dist_libhx509_la_SOURCES) || rm -f hx509-protos.h
@@ -174,12 +111,6 @@ hxtool_LDADD = \
 	$(top_builddir)/lib/sl/libsl.la
 
 CLEANFILES = $(BUILT_SOURCES) sel-gram.c sel-lex.c \
-	$(gen_files_ocsp) ocsp_asn1_files ocsp_asn1{,-priv}.h* \
-	ocsp_asn1-template.[chx]* \
-	$(gen_files_pkcs10) pkcs10_asn1_files pkcs10_asn1{,-priv}.h* \
-	pkcs10_asn1-template.[chx]* \
-	$(gen_files_crmf) crmf_asn1_files crmf_asn1{,-priv}.h* \
-	crmf_asn1-template.[chx]* \
 	$(TESTS) \
 	hxtool-commands.c hxtool-commands.h *.tmp \
 	request.out \
@@ -314,14 +245,9 @@ EXTRA_DIST = \
 	hxtool-version.rc \
 	libhx509-exports.def \
 	version-script.map \
-	crmf.asn1 \
 	hx509_err.et \
 	hxtool-commands.in \
 	quote.py \
-	ocsp.asn1 \
-	ocsp.opt \
-	pkcs10.asn1 \
-	pkcs10.opt \
 	test_ca.in \
 	test_chain.in \
 	test_cert.in \

lib/hx509/NTMakefile

@@ -35,12 +35,6 @@ localcflags=-DASN1_LIB
 
 !include ../../windows/NTMakefile.w32
 
-gen_files_ocsp = $(OBJ)\asn1_ocsp_asn1.x
-
-gen_files_pkcs10 = $(OBJ)\asn1_pkcs10_asn1.x
-
-gen_files_crmf = $(OBJ)\asn1_crmf_asn1.x
-
 libhx509_la_OBJS =			\
 	$(OBJ)\ca.obj			\
 	$(OBJ)\cert.obj			\
@@ -69,9 +63,7 @@ libhx509_la_OBJS =			\
 	$(OBJ)\print.obj		\
 	$(OBJ)\softp11.obj		\
 	$(OBJ)\req.obj			\
-	$(OBJ)\revoke.obj		\
+	$(OBJ)\revoke.obj
-	$(gen_files_ocsp:.x=.obj)	\
-	$(gen_files_pkcs10:.x=.obj)
 
 $(LIBHX509): $(libhx509_la_OBJS)
 	$(LIBCON)
@@ -118,46 +110,11 @@ dist_libhx509_la_SOURCES =	\
 
 asn1_compile=$(BINDIR)\asn1_compile.exe
 
-$(gen_files_ocsp:.x=.c): $$(@R).x
-
-$(gen_files_pkcs10:.x=.c): $$(@R).x
-
-$(gen_files_crmf:.x=.c): $$(@R).x
-
-$(gen_files_ocsp) $(OBJ)\ocsp_asn1.hx: $(asn1_compile) ocsp.asn1
-	cd $(OBJ)
-	$(asn1_compile) --one-code-file \
-		--preserve-binary=OCSPTBSRequest \
-		--preserve-binary=OCSPResponseData \
-		$(SRCDIR)\ocsp.asn1 ocsp_asn1 \
-	|| ( $(RM) -f $(gen_files_ocsp) $(OBJ)\ocsp_asn1.h ; exit /b 1 )
-	cd $(SRCDIR)
-
-$(gen_files_pkcs10) $(OBJ)\pkcs10_asn1.hx: $(asn1_compile) pkcs10.asn1
-	cd $(OBJ)
-	$(asn1_compile) --one-code-file \
-		--preserve-binary=CertificationRequestInfo \
-		$(SRCDIR)\pkcs10.asn1 pkcs10_asn1 \
-	|| ( $(RM) -f $(gen_files_pkcs10) $(OBJ)\pkcs10_asn1.h ; exit /b 1 )
-	cd $(SRCDIR)
-
-$(gen_files_crmf) $(OBJ)\crmf_asn1.hx: $(asn1_compile) crmf.asn1
-	cd $(OBJ)
-	$(asn1_compile) --one-code-file $(SRCDIR)\crmf.asn1 crmf_asn1 \
-	|| ( $(RM) -f $(gen_files_crmf) $(OBJ)\crmf_asn1.h ; exit /b 1 )
-	cd $(SRCDIR)
-
 INCFILES=			    \
 	$(INCDIR)\hx509.h	    \
 	$(INCDIR)\hx509-protos.h    \
 	$(INCDIR)\hx509-private.h   \
-	$(INCDIR)\hx509_err.h	    \
+	$(INCDIR)\hx509_err.h
-	$(INCDIR)\ocsp_asn1.h	    \
-	$(INCDIR)\pkcs10_asn1.h	    \
-	$(INCDIR)\crmf_asn1.h	    \
-	$(OBJ)\ocsp_asn1-priv.h	    \
-	$(OBJ)\pkcs10_asn1-priv.h   \
-	$(OBJ)\crmf_asn1-priv.h
 
 hxtool.c: $(OBJ)\hxtool-commands.h