3 files changed, 23 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a80aadb..bbb27d6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(
         ../crypto/modes
         ../crypto/asn1
         ../ssl
+        ../tls
         ../apps/openssl
         ../apps/openssl/compat
 )
@@ -213,6 +214,14 @@ add_executable(igetest igetest.c)
 target_link_libraries(igetest ${TESTS_LIBS})
 add_test(igetest igetest)
 
+# keypairtest
+add_executable(keypairtest keypairtest.c)
+target_link_libraries(keypairtest ${TESTS_LIBS})
+add_test(keypairtest keypairtest
+        ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
+        ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
+        ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
+
 # md4test
 add_executable(md4test md4test.c)
 target_link_libraries(md4test ${TESTS_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 395c2bf..69d054d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.am.common
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I $(top_srcdir)/ssl
+AM_CPPFLAGS += -I $(top_srcdir)/tls
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
 AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\"
@@ -219,6 +220,12 @@ TESTS += igetest
 check_PROGRAMS += igetest
 igetest_SOURCES = igetest.c
 
+# keypairtest
+TESTS += keypairtest.sh
+check_PROGRAMS += keypairtest
+keypairtest_SOURCES = keypairtest.c
+EXTRA_DIST += keypairtest.sh
+
 # md4test
 TESTS += md4test
 check_PROGRAMS += md4test
diff --git a/tests/keypairtest.sh b/tests/keypairtest.sh
new file mode 100755
index 0000000..f9637ff
--- /dev/null
+++ b/tests/keypairtest.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+TEST=./keypairtest
+if [ -e ./keypairtest.exe ]; then
+        TEST=./keypairtest.exe
+fi
+$TEST $srcdir/ca.pem $srcdir/server.pem $srcdir/server.pem