Imported Upstream version 4.9upstream/4.9

1 files changed, 42 insertions, 6 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c1ad745..f51866d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -111,7 +111,8 @@ check_PROGRAMS = Test_parser$(EXEEXT) Test_tree$(EXEEXT) \
 	Test_choice$(EXEEXT) Test_encdec$(EXEEXT) copynode$(EXEEXT) \
 	coding-decoding2$(EXEEXT) strict-der$(EXEEXT) \
 	Test_choice_ocsp$(EXEEXT) ocsp-basic-response$(EXEEXT) \
-	octet-string$(EXEEXT)
+	octet-string$(EXEEXT) coding-long-oid$(EXEEXT) \
+	object-id-decoding$(EXEEXT)
 TESTS = Test_parser$(EXEEXT) Test_tree$(EXEEXT) Test_encoding$(EXEEXT) \
 	Test_indefinite$(EXEEXT) Test_errors$(EXEEXT) \
 	Test_simple$(EXEEXT) Test_overflow$(EXEEXT) crlf threadsafety \
@@ -119,7 +120,8 @@ TESTS = Test_parser$(EXEEXT) Test_tree$(EXEEXT) Test_encoding$(EXEEXT) \
 	Test_encdec$(EXEEXT) copynode$(EXEEXT) \
 	coding-decoding2$(EXEEXT) strict-der$(EXEEXT) \
 	Test_choice_ocsp$(EXEEXT) decoding decoding-invalid-x509 \
-	ocsp-basic-response$(EXEEXT) octet-string$(EXEEXT)
+	ocsp-basic-response$(EXEEXT) octet-string$(EXEEXT) \
+	coding-long-oid$(EXEEXT) object-id-decoding$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/lib/glm4/gnulib-comp.m4 \
@@ -231,10 +233,18 @@ coding_decoding2_SOURCES = coding-decoding2.c
 coding_decoding2_OBJECTS = coding-decoding2.$(OBJEXT)
 coding_decoding2_LDADD = $(LDADD)
 coding_decoding2_DEPENDENCIES = ../lib/libtasn1.la ../gl/libgnu.la
+coding_long_oid_SOURCES = coding-long-oid.c
+coding_long_oid_OBJECTS = coding-long-oid.$(OBJEXT)
+coding_long_oid_LDADD = $(LDADD)
+coding_long_oid_DEPENDENCIES = ../lib/libtasn1.la ../gl/libgnu.la
 copynode_SOURCES = copynode.c
 copynode_OBJECTS = copynode.$(OBJEXT)
 copynode_LDADD = $(LDADD)
 copynode_DEPENDENCIES = ../lib/libtasn1.la ../gl/libgnu.la
+object_id_decoding_SOURCES = object-id-decoding.c
+object_id_decoding_OBJECTS = object-id-decoding.$(OBJEXT)
+object_id_decoding_LDADD = $(LDADD)
+object_id_decoding_DEPENDENCIES = ../lib/libtasn1.la ../gl/libgnu.la
 ocsp_basic_response_SOURCES = ocsp-basic-response.c
 ocsp_basic_response_OBJECTS = ocsp-basic-response.$(OBJEXT)
 ocsp_basic_response_LDADD = $(LDADD)
@@ -284,13 +294,15 @@ am__v_CCLD_1 =
 SOURCES = Test_choice.c Test_choice_ocsp.c Test_encdec.c \
 	Test_encoding.c Test_errors.c Test_indefinite.c \
 	Test_overflow.c Test_parser.c Test_simple.c Test_strings.c \
-	Test_tree.c coding-decoding2.c copynode.c \
-	ocsp-basic-response.c octet-string.c strict-der.c
+	Test_tree.c coding-decoding2.c coding-long-oid.c copynode.c \
+	object-id-decoding.c ocsp-basic-response.c octet-string.c \
+	strict-der.c
 DIST_SOURCES = Test_choice.c Test_choice_ocsp.c Test_encdec.c \
 	Test_encoding.c Test_errors.c Test_indefinite.c \
 	Test_overflow.c Test_parser.c Test_simple.c Test_strings.c \
-	Test_tree.c coding-decoding2.c copynode.c \
-	ocsp-basic-response.c octet-string.c strict-der.c
+	Test_tree.c coding-decoding2.c coding-long-oid.c copynode.c \
+	object-id-decoding.c ocsp-basic-response.c octet-string.c \
+	strict-der.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -1312,10 +1324,18 @@ coding-decoding2$(EXEEXT): $(coding_decoding2_OBJECTS) $(coding_decoding2_DEPEND
 	@rm -f coding-decoding2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(coding_decoding2_OBJECTS) $(coding_decoding2_LDADD) $(LIBS)
 
+coding-long-oid$(EXEEXT): $(coding_long_oid_OBJECTS) $(coding_long_oid_DEPENDENCIES) $(EXTRA_coding_long_oid_DEPENDENCIES) 
+	@rm -f coding-long-oid$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(coding_long_oid_OBJECTS) $(coding_long_oid_LDADD) $(LIBS)
+
 copynode$(EXEEXT): $(copynode_OBJECTS) $(copynode_DEPENDENCIES) $(EXTRA_copynode_DEPENDENCIES) 
 	@rm -f copynode$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(copynode_OBJECTS) $(copynode_LDADD) $(LIBS)
 
+object-id-decoding$(EXEEXT): $(object_id_decoding_OBJECTS) $(object_id_decoding_DEPENDENCIES) $(EXTRA_object_id_decoding_DEPENDENCIES) 
+	@rm -f object-id-decoding$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(object_id_decoding_OBJECTS) $(object_id_decoding_LDADD) $(LIBS)
+
 ocsp-basic-response$(EXEEXT): $(ocsp_basic_response_OBJECTS) $(ocsp_basic_response_DEPENDENCIES) $(EXTRA_ocsp_basic_response_DEPENDENCIES) 
 	@rm -f ocsp-basic-response$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ocsp_basic_response_OBJECTS) $(ocsp_basic_response_LDADD) $(LIBS)
@@ -1346,7 +1366,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Test_strings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Test_tree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coding-decoding2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coding-long-oid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copynode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object-id-decoding.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocsp-basic-response.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/octet-string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strict-der.Po@am__quote@
@@ -1711,6 +1733,20 @@ octet-string.log: octet-string$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+coding-long-oid.log: coding-long-oid$(EXEEXT)
+	@p='coding-long-oid$(EXEEXT)'; \
+	b='coding-long-oid'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+object-id-decoding.log: object-id-decoding$(EXEEXT)
+	@p='object-id-decoding$(EXEEXT)'; \
+	b='object-id-decoding'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \