diff options
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index be10bbb..6421bef 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,15 +17,16 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAG_VISIBILITY) -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I../gl +AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes AM_LDFLAGS = -no-install -LDADD = ../lib/libtasn1.la ../gl/libgnu.la +LDADD = ../lib/libtasn1.la +BUILT_SOURCES = CVE-2018-1000654-1_asn1_tab.h CVE-2018-1000654-2_asn1_tab.h EXTRA_DIST = Test_parser.asn Test_tree.asn Test_tree_asn1_tab.c mscat.asn \ Test_encoding.asn pkix.asn TestIndef.p12 choice.asn coding-decoding2.asn \ TestIndef2.p12 TestIndef3.der TestCertOctetOverflow.der \ - cert-invalid-time.der \ + cert-invalid-time.der setof.asn CVE-2018-1000654-1.asn CVE-2018-1000654-2.asn \ libtasn1.supp ocsp-basic-response.der spc_pe_image_data.der \ invalid-x509/id-000000.der invalid-x509/id-000001.der \ invalid-x509/id-000002.der invalid-x509/id-000003.der \ @@ -47,27 +48,36 @@ EXTRA_DIST = Test_parser.asn Test_tree.asn Test_tree_asn1_tab.c mscat.asn \ invalid-x509/id-000034.der invalid-x509/id-000035.der \ invalid-pkcs7/id-000001.der invalid-pkcs7/id-000002.der \ invalid-pkcs7/id-000003.der invalid-assignments1.txt \ - invalid-assignments2.txt + invalid-assignments2.txt pkix.asn.out # For crlf. EXTRA_DIST += crlf.cer crl.der ocsp.der dist_check_SCRIPTS = crlf benchmark threadsafety decoding decoding-invalid-x509 \ - decoding-invalid-pkcs7 coding + decoding-invalid-pkcs7 coding parser.sh -MOSTLYCLEANFILES = Test_parser_ERROR.asn +MOSTLYCLEANFILES = Test_parser_ERROR.asn CVE-2018-1000654-1_asn1_tab.h CVE-2018-1000654-2_asn1_tab.h check_PROGRAMS = Test_parser Test_tree Test_encoding Test_indefinite \ Test_errors Test_simple Test_overflow Test_strings Test_choice \ Test_encdec copynode coding-decoding2 strict-der Test_choice_ocsp \ ocsp-basic-response octet-string coding-long-oid object-id-decoding \ - spc_pe_image_data + spc_pe_image_data setof CVE-2018-1000654 single_node TESTS = Test_parser Test_tree Test_encoding Test_indefinite \ Test_errors Test_simple Test_overflow crlf threadsafety \ Test_strings Test_choice Test_encdec copynode coding-decoding2 \ strict-der Test_choice_ocsp decoding decoding-invalid-x509 \ ocsp-basic-response octet-string coding-long-oid object-id-decoding \ - spc_pe_image_data decoding-invalid-pkcs7 coding + spc_pe_image_data decoding-invalid-pkcs7 coding setof \ + CVE-2018-1000654 parser.sh single_node + +CVE-2018-1000654-1_asn1_tab.h: $(srcdir)/CVE-2018-1000654-1.asn + $(top_builddir)/src/asn1Parser$(EXEEXT) $^ -o $@ + +CVE-2018-1000654-2_asn1_tab.h: $(srcdir)/CVE-2018-1000654-2.asn + $(top_builddir)/src/asn1Parser$(EXEEXT) $^ -o $@ + +CVE_2018_1000654_SOURCES = CVE-2018-1000654-1_asn1_tab.h CVE-2018-1000654-2_asn1_tab.h CVE-2018-1000654.c TESTS_ENVIRONMENT = \ ASN1PARSER=$(srcdir)/Test_parser.asn \ @@ -75,6 +85,7 @@ TESTS_ENVIRONMENT = \ ASN1CHOICE=$(srcdir)/choice.asn \ ASN1CODINGDECODING2=$(srcdir)/coding-decoding2.asn \ ASN1PKIX=$(srcdir)/pkix.asn \ + ASN1SETOF=$(srcdir)/setof.asn \ ASN1CRLDER=$(srcdir)/crl.der \ ASN1INDEF=$(srcdir)/TestIndef.p12 \ ASN1INDEF2=$(srcdir)/TestIndef2.p12 \ @@ -88,5 +99,4 @@ TESTS_ENVIRONMENT = \ ASAN_OPTIONS="detect_leaks=0:exitcode=6" \ THREADSAFETY_FILES=`find $(top_srcdir)/lib -name \*.c` \ EXEEXT=$(EXEEXT) \ - LSAN_OPTIONS=suppressions=libtasn1.supp \ - $(VALGRIND) + LSAN_OPTIONS=suppressions=libtasn1.supp |