3 files changed, 56 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 04cfc1e..2a2e1a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,13 @@ test-driver
 *.trs
 tests/aes_wrap*
 tests/arc4random_fork*
+tests/asn1api*
+tests/asn1basic*
+tests/asn1complex*
+tests/asn1string_copy*
 tests/asn1evp*
 tests/asn1time*
+tests/asn1x509*
 tests/bnaddsub*
 tests/bn_rand_interval*
 tests/bn_to_string*
@@ -89,6 +94,7 @@ tests/verify*
 tests/x509_info*
 tests/x509attribute*
 tests/x509name*
+tests/x509req_ext*
 !tests/optionstest.c
 !tests/*.test
 tests/client.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5b9652e..0ddbc74 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -32,11 +32,31 @@ if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES "MINGW")))
         add_test(arc4randomforktest ${CMAKE_CURRENT_SOURCE_DIR}/arc4randomforktest.sh)
 endif()
 
+# asn1api
+add_executable(asn1api asn1api.c)
+target_link_libraries(asn1api ${OPENSSL_TEST_LIBS})
+add_test(asn1api asn1api)
+
+# asn1basic
+add_executable(asn1basic asn1basic.c)
+target_link_libraries(asn1basic ${OPENSSL_TEST_LIBS})
+add_test(asn1basic asn1basic)
+
+# asn1complex
+add_executable(asn1complex asn1complex.c)
+target_link_libraries(asn1complex ${OPENSSL_TEST_LIBS})
+add_test(asn1complex asn1complex)
+
 # asn1evp
 add_executable(asn1evp asn1evp.c)
 target_link_libraries(asn1evp ${OPENSSL_TEST_LIBS})
 add_test(asn1evp asn1evp)
 
+# asn1string_copy
+add_executable(asn1string_copy asn1string_copy.c)
+target_link_libraries(asn1string_copy ${OPENSSL_TEST_LIBS})
+add_test(asn1string_copy asn1string_copy)
+
 # asn1test
 add_executable(asn1test asn1test.c)
 target_link_libraries(asn1test ${OPENSSL_TEST_LIBS})
@@ -170,6 +190,11 @@ if(NOT WIN32)
         set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 endif()
 
+# ec_asn1_test
+add_executable(ec_asn1_test ec_asn1_test.c)
+target_link_libraries(ec_asn1_test ${OPENSSL_TEST_LIBS})
+add_test(ec_asn1_test ec_asn1_test)
+
 # ec_point_conversion
 add_executable(ec_point_conversion ec_point_conversion.c)
 target_link_libraries(ec_point_conversion ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ec87028..eb10eec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,11 +44,31 @@ arc4randomforktest_SOURCES = arc4randomforktest.c
 endif
 EXTRA_DIST += arc4randomforktest.sh
 
+# asn1api
+TESTS += asn1api
+check_PROGRAMS += asn1api
+asn1api_SOURCES = asn1api.c
+
+# asn1basic
+TESTS += asn1basic
+check_PROGRAMS += asn1basic
+asn1basic_SOURCES = asn1basic.c
+
+# asn1complex
+TESTS += asn1complex
+check_PROGRAMS += asn1complex
+asn1complex_SOURCES = asn1complex.c
+
 # asn1evp
 TESTS += asn1evp
 check_PROGRAMS += asn1evp
 asn1evp_SOURCES = asn1evp.c
 
+# asn1string_copy
+TESTS += asn1string_copy
+check_PROGRAMS += asn1string_copy
+asn1string_copy_SOURCES = asn1string_copy.c
+
 # asn1test
 TESTS += asn1test
 check_PROGRAMS += asn1test
@@ -182,6 +202,11 @@ dtlstest_SOURCES = dtlstest.c
 endif
 EXTRA_DIST += dtlstest.sh
 
+# ec_asn1_test
+TESTS += ec_asn1_test
+check_PROGRAMS += ec_asn1_test
+ec_asn1_test_SOURCES = ec_asn1_test.c
+
 # ec_point_conversion
 TESTS += ec_point_conversion
 check_PROGRAMS += ec_point_conversion