diff options
| -rw-r--r-- | test/Makefile.ssl | 2 | ||||
| -rw-r--r-- | test/tcrl | 2 | ||||
| -rw-r--r-- | test/testca | 2 | ||||
| -rw-r--r-- | test/testenc | 2 | ||||
| -rw-r--r-- | test/testgen | 4 | ||||
| -rw-r--r-- | test/testss | 6 | ||||
| -rw-r--r-- | test/tpkcs7 | 2 | ||||
| -rw-r--r-- | test/tpkcs7d | 4 | ||||
| -rw-r--r-- | test/treq | 2 | ||||
| -rw-r--r-- | test/trsa | 2 | ||||
| -rw-r--r-- | test/tsid | 2 | ||||
| -rw-r--r-- | test/tx509 | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/test/Makefile.ssl b/test/Makefile.ssl index f105c380ce..06823067bc 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -183,7 +183,7 @@ if (((NR+1)%64) == 0) print NR+1," tests done"; }' test_verify: @echo "The following command should have some OK's and some failures" @echo "There are definitly a few expired certificates" - ../apps/ssleay verify -CApath ../certs ../certs/*.pem + ../apps/openssl verify -CApath ../certs ../certs/*.pem test_dh: @echo "Generate as set of DH parameters" @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay crl' +cmd='../apps/openssl crl' if [ "$1"x != "x" ]; then t=$1 diff --git a/test/testca b/test/testca index a28402f9ca..88c186b6ab 100644 --- a/test/testca +++ b/test/testca @@ -23,7 +23,7 @@ if [ $? != 0 ]; then fi -SSLEAY_CONFIG="-config ../apps/ssleay.cnf" +SSLEAY_CONFIG="-config ../apps/openssl.cnf" export SSLEAY_CONFIG $SH ../apps/CA.sh -sign <<EOF y diff --git a/test/testenc b/test/testenc index 42db56c2be..f69ca37fc3 100644 --- a/test/testenc +++ b/test/testenc @@ -2,7 +2,7 @@ testsrc=Makefile.ssl test=./p -cmd=../apps/ssleay +cmd=../apps/openssl cat $testsrc >$test; diff --git a/test/testgen b/test/testgen index 12a4ca4cea..f31586e2a4 100644 --- a/test/testgen +++ b/test/testgen @@ -15,13 +15,13 @@ echo "There should be a 2 sequences of .'s and some +'s." echo "There should not be more that at most 80 per line" echo "This could take some time." -../apps/ssleay req -config test.cnf -new -out testreq.pem +../apps/openssl req -config test.cnf -new -out testreq.pem if [ $? != 0 ]; then echo problems creating request exit 1 fi -../apps/ssleay req -verify -in testreq.pem -noout +../apps/openssl req -verify -in testreq.pem -noout if [ $? != 0 ]; then echo signature on req is wrong exit 1 diff --git a/test/testss b/test/testss index a5aecf4694..36c792251e 100644 --- a/test/testss +++ b/test/testss @@ -1,9 +1,9 @@ #!/bin/sh digest='-mdc2' -reqcmd="../apps/ssleay req" -x509cmd="../apps/ssleay x509 $digest" -verifycmd="../apps/ssleay verify" +reqcmd="../apps/openssl req" +x509cmd="../apps/openssl x509 $digest" +verifycmd="../apps/openssl verify" CAkey="keyCA.ss" CAcert="certCA.ss" diff --git a/test/tpkcs7 b/test/tpkcs7 index ea1f005dac..15bbba42c0 100644 --- a/test/tpkcs7 +++ b/test/tpkcs7 @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay pkcs7' +cmd='../apps/openssl pkcs7' if [ "$1"x != "x" ]; then t=$1 diff --git a/test/tpkcs7d b/test/tpkcs7d index c8f18fb09c..46e5aa2bd6 100644 --- a/test/tpkcs7d +++ b/test/tpkcs7d @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay pkcs7' +cmd='../apps/openssl pkcs7' if [ "$1"x != "x" ]; then t=$1 @@ -11,7 +11,7 @@ else t=pkcs7-1.pem fi -echo testing pkcs7 conversions +echo "testing pkcs7 conversions (2)" cp $t fff.p echo "p -> d" @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay req' +cmd='../apps/openssl req' if [ "$1"x != "x" ]; then t=$1 @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay rsa' +cmd='../apps/openssl rsa' if [ "$1"x != "x" ]; then t=$1 @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay sess_id' +cmd='../apps/openssl sess_id' if [ "$1"x != "x" ]; then t=$1 diff --git a/test/tx509 b/test/tx509 index f8d1f82cdd..35169f3a43 100644 --- a/test/tx509 +++ b/test/tx509 @@ -3,7 +3,7 @@ PATH=../apps:$PATH export PATH -cmd='../apps/ssleay x509' +cmd='../apps/openssl x509' if [ "$1"x != "x" ]; then t=$1 |