aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/CMakeLists.txt37
-rwxr-xr-xtests/ssltest.sh13
-rwxr-xr-xtests/testdsa.sh13
-rwxr-xr-xtests/testenc.sh19
-rwxr-xr-xtests/testrsa.sh13
5 files changed, 66 insertions, 29 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f98a266..2e368c5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,11 +12,10 @@ include_directories(
12set(ENV{srcdir} ${CMAKE_CURRENT_SOURCE_DIR}) 12set(ENV{srcdir} ${CMAKE_CURRENT_SOURCE_DIR})
13 13
14# aeadtest 14# aeadtest
15#add_executable(aeadtest aeadtest.c) 15add_executable(aeadtest aeadtest.c)
16#target_link_libraries(aeadtest ${OPENSSL_LIBS}) 16target_link_libraries(aeadtest ${OPENSSL_LIBS})
17#add_test(aeadtest aeadtest.sh) 17add_test(aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtest.sh)
18#configure_file(aeadtests.txt aeadtests.txt COPYONLY) 18set_tests_properties(aeadtest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
19#configure_file(aeadtest.sh aeadtest.sh COPYONLY)
20 19
21# aes_wrap 20# aes_wrap
22add_executable(aes_wrap aes_wrap.c) 21add_executable(aes_wrap aes_wrap.c)
@@ -127,9 +126,10 @@ target_link_libraries(enginetest ${OPENSSL_LIBS})
127add_test(enginetest enginetest) 126add_test(enginetest enginetest)
128 127
129# evptest 128# evptest
130#add_executable(evptest evptest.c) 129add_executable(evptest evptest.c)
131#target_link_libraries(evptest ${OPENSSL_LIBS}) 130target_link_libraries(evptest ${OPENSSL_LIBS})
132#add_test(evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptest.sh) 131add_test(evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptest.sh)
132set_tests_properties(evptest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
133 133
134# explicit_bzero 134# explicit_bzero
135# explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows 135# explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows
@@ -209,9 +209,10 @@ target_link_libraries(poly1305test ${OPENSSL_LIBS})
209add_test(poly1305test poly1305test) 209add_test(poly1305test poly1305test)
210 210
211# pq_test 211# pq_test
212#add_executable(pq_test pq_test.c) 212add_executable(pq_test pq_test.c)
213#target_link_libraries(pq_test ${OPENSSL_LIBS}) 213target_link_libraries(pq_test ${OPENSSL_LIBS})
214#add_test(pq_test ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh) 214add_test(pq_test ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh)
215set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
215 216
216# randtest 217# randtest
217add_executable(randtest randtest.c) 218add_executable(randtest randtest.c)
@@ -258,18 +259,22 @@ target_link_libraries(sha512test ${OPENSSL_LIBS})
258add_test(sha512test sha512test) 259add_test(sha512test sha512test)
259 260
260# ssltest 261# ssltest
261#add_executable(ssltest ssltest.c) 262add_executable(ssltest ssltest.c)
262#target_link_libraries(ssltest ${OPENSSL_LIBS}) 263target_link_libraries(ssltest ${OPENSSL_LIBS})
263#add_test(ssltest ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) 264add_test(ssltest ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh)
265set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
264 266
265# testdsa 267# testdsa
266#add_test(testdsa ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh) 268add_test(testdsa ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh)
269set_tests_properties(testdsa PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
267 270
268# testenc 271# testenc
269add_test(testenc ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh) 272add_test(testenc ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh)
273set_tests_properties(testenc PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
270 274
271# testrsa 275# testrsa
272#add_test(testrsa ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh) 276add_test(testrsa ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh)
277set_tests_properties(testrsa PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
273 278
274# timingsafe 279# timingsafe
275add_executable(timingsafe timingsafe.c) 280add_executable(timingsafe timingsafe.c)
diff --git a/tests/ssltest.sh b/tests/ssltest.sh
index 5b48b40..28da3ac 100755
--- a/tests/ssltest.sh
+++ b/tests/ssltest.sh
@@ -6,9 +6,16 @@ if [ -e ./ssltest.exe ]; then
6 ssltest_bin=./ssltest.exe 6 ssltest_bin=./ssltest.exe
7fi 7fi
8 8
9openssl_bin=../apps/openssl/openssl 9if [ -d ../apps/openssl ]; then
10if [ -e ../apps/openssl/openssl.exe ]; then 10 openssl_bin=../apps/openssl/openssl
11 openssl_bin=../apps/openssl/openssl.exe 11 if [ -e ../apps/openssl/openssl.exe ]; then
12 openssl_bin=../apps/openssl/openssl.exe
13 fi
14else
15 openssl_bin=../apps/openssl
16 if [ -e ../apps/openssl.exe ]; then
17 openssl_bin=../apps/openssl.exe
18 fi
12fi 19fi
13 20
14if [ -z $srcdir ]; then 21if [ -z $srcdir ]; then
diff --git a/tests/testdsa.sh b/tests/testdsa.sh
index ed681e7..7ecb8ef 100755
--- a/tests/testdsa.sh
+++ b/tests/testdsa.sh
@@ -4,9 +4,16 @@
4 4
5#Test DSA certificate generation of openssl 5#Test DSA certificate generation of openssl
6 6
7cmd=../apps/openssl/openssl 7if [ -d ../apps/openssl ]; then
8if [ -e ../apps/openssl/openssl.exe ]; then 8 cmd=../apps/openssl/openssl
9 cmd=../apps/openssl/openssl.exe 9 if [ -e ../apps/openssl/openssl.exe ]; then
10 cmd=../apps/openssl/openssl.exe
11 fi
12else
13 cmd=../apps/openssl
14 if [ -e ../apps/openssl.exe ]; then
15 cmd=../apps/openssl.exe
16 fi
10fi 17fi
11 18
12if [ -z $srcdir ]; then 19if [ -z $srcdir ]; then
diff --git a/tests/testenc.sh b/tests/testenc.sh
index 4e488ad..63bce34 100755
--- a/tests/testenc.sh
+++ b/tests/testenc.sh
@@ -2,12 +2,23 @@
2# $OpenBSD: testenc.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $ 2# $OpenBSD: testenc.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
3 3
4test=p 4test=p
5cmd=../apps/openssl/openssl 5if [ -d ../apps/openssl ]; then
6if [ -e ../apps/openssl/openssl.exe ]; then 6 cmd=../apps/openssl/openssl
7 cmd=../apps/openssl/openssl.exe 7 if [ -e ../apps/openssl/openssl.exe ]; then
8 cmd=../apps/openssl/openssl.exe
9 fi
10else
11 cmd=../apps/openssl
12 if [ -e ../apps/openssl.exe ]; then
13 cmd=../apps/openssl.exe
14 fi
15fi
16
17if [ -z $srcdir ]; then
18 srcdir=.
8fi 19fi
9 20
10cat openssl.cnf >$test; 21cat $srcdir/openssl.cnf >$test;
11 22
12echo cat 23echo cat
13$cmd enc < $test > $test.cipher 24$cmd enc < $test > $test.cipher
diff --git a/tests/testrsa.sh b/tests/testrsa.sh
index c2c7c4c..e644999 100755
--- a/tests/testrsa.sh
+++ b/tests/testrsa.sh
@@ -4,9 +4,16 @@
4 4
5#Test RSA certificate generation of openssl 5#Test RSA certificate generation of openssl
6 6
7cmd=../apps/openssl/openssl 7if [ -d ../apps/openssl ]; then
8if [ -e ../apps/openssl/openssl.exe ]; then 8 cmd=../apps/openssl/openssl
9 cmd=../apps/openssl/openssl.exe 9 if [ -e ../apps/openssl/openssl.exe ]; then
10 cmd=../apps/openssl/openssl.exe
11 fi
12else
13 cmd=../apps/openssl
14 if [ -e ../apps/openssl.exe ]; then
15 cmd=../apps/openssl.exe
16 fi
10fi 17fi
11 18
12if [ -z $srcdir ]; then 19if [ -z $srcdir ]; then