Fix tests for ssleay -> openssl.
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index f105c38..0682306 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -183,7 +183,7 @@
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"
diff --git a/test/tcrl b/test/tcrl
index 859fba4..acaf8f3 100644
--- a/test/tcrl
+++ b/test/tcrl
@@ -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 a28402f..88c186b 100644
--- a/test/testca
+++ b/test/testca
@@ -23,7 +23,7 @@
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 42db56c..f69ca37 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 12a4ca4..f31586e 100644
--- a/test/testgen
+++ b/test/testgen
@@ -15,13 +15,13 @@
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 a5aecf4..36c7922 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 ea1f005..15bbba4 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 c8f18fb..46e5aa2 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 @@
t=pkcs7-1.pem
fi
-echo testing pkcs7 conversions
+echo "testing pkcs7 conversions (2)"
cp $t fff.p
echo "p -> d"
diff --git a/test/treq b/test/treq
index e5f1d8c..ef3c132 100644
--- a/test/treq
+++ b/test/treq
@@ -3,7 +3,7 @@
PATH=../apps:$PATH
export PATH
-cmd='../apps/ssleay req'
+cmd='../apps/openssl req'
if [ "$1"x != "x" ]; then
t=$1
diff --git a/test/trsa b/test/trsa
index e5b8fe0..d6a4dd8 100644
--- a/test/trsa
+++ b/test/trsa
@@ -3,7 +3,7 @@
PATH=../apps:$PATH
export PATH
-cmd='../apps/ssleay rsa'
+cmd='../apps/openssl rsa'
if [ "$1"x != "x" ]; then
t=$1
diff --git a/test/tsid b/test/tsid
index 8c7e9b1..9e08545 100644
--- a/test/tsid
+++ b/test/tsid
@@ -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 f8d1f82..35169f3 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