diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 1999-01-05 17:53:10 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 1999-01-05 17:53:10 +0000 |
| commit | 0a0f4596b795354a803b00baa899ecb288a1e20b (patch) | |
| tree | e3d6adb6c26887e4c48130352afdb2bc6f527335 | |
| parent | 65adbf725c06baaac6bc27dd4769fae6a9e3d45c (diff) | |
Fix up for make regress. Should handle objdir now.
| -rw-r--r-- | regress/lib/libssl/Makefile | 6 | ||||
| -rw-r--r-- | regress/lib/libssl/testdsa.sh | 4 | ||||
| -rw-r--r-- | regress/lib/libssl/testenc.sh | 6 | ||||
| -rw-r--r-- | regress/lib/libssl/testrsa.sh | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/regress/lib/libssl/Makefile b/regress/lib/libssl/Makefile index 5eb5fc64557..3f7d48fd2ef 100644 --- a/regress/lib/libssl/Makefile +++ b/regress/lib/libssl/Makefile @@ -4,8 +4,8 @@ CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem install: regress: - sh ${.CURDIR}/testenc.sh - sh ${.CURDIR}/testdsa.sh -# sh ${.CURDIR}/testrsa.sh + sh ${.CURDIR}/testenc.sh ${.OBJDIR} ${.CURDIR} + sh ${.CURDIR}/testdsa.sh ${.OBJDIR} ${.CURDIR} +# sh ${.CURDIR}/testrsa.sh ${.OBJDIR} ${.CURDIR} .include <bsd.prog.mk> diff --git a/regress/lib/libssl/testdsa.sh b/regress/lib/libssl/testdsa.sh index 4c9668c906f..dc5d7b97b56 100644 --- a/regress/lib/libssl/testdsa.sh +++ b/regress/lib/libssl/testdsa.sh @@ -2,6 +2,8 @@ #Test DSA certificate generation of ssleay +cd $1 + # Generate DSA paramter set ssleay dsaparam 512 -out dsa512.pem if [ $? != 0 ]; then @@ -10,7 +12,7 @@ fi # Denerate a DSA certificate -ssleay req -config ssleay.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key +ssleay req -config $2/ssleay.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key if [ $? != 0 ]; then exit 1; fi diff --git a/regress/lib/libssl/testenc.sh b/regress/lib/libssl/testenc.sh index ab3278f27e7..85997bfbe5c 100644 --- a/regress/lib/libssl/testenc.sh +++ b/regress/lib/libssl/testenc.sh @@ -1,9 +1,11 @@ #!/bin/sh -testsrc=./ssleay.cnf -test=./p +testsrc=$2/ssleay.cnf +test=$1/p cmd=/usr/sbin/ssleay +cd $1 + cat $testsrc >$test; echo cat diff --git a/regress/lib/libssl/testrsa.sh b/regress/lib/libssl/testrsa.sh index 79c578834a5..3f4c328acd3 100644 --- a/regress/lib/libssl/testrsa.sh +++ b/regress/lib/libssl/testrsa.sh @@ -11,6 +11,7 @@ echo This will *not* work with what\'s in the tree, rsa is not in that. echo sleep 3 +cd $1 # Generate RSA private key ssleay genrsa -out rsakey.pem @@ -20,7 +21,7 @@ fi # Denerate an RSA certificate -ssleay req -config ssleay.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem +ssleay req -config $2/ssleay.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem if [ $? != 0 ]; then exit 1; fi |