Commit 288370ea authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix tests for ssleay -> openssl.

parent 2ec077d8

test/Makefile.ssl

+1 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ if (((NR+1)%64) == 0) print NR+1," tests done"; }' 
test_verify:

test_verify:

	@echo "The following command should have some OK's and some failures"

	@echo "The following command should have some OK's and some failures"

	@echo "There are definitly a few expired certificates"

	@echo "There are definitly a few expired certificates"

	../apps/ssleay verify -CApath ../certs ../certs/*.pem

	../apps/openssl verify -CApath ../certs ../certs/*.pem





test_dh:

test_dh:

	@echo "Generate as set of DH parameters"

	@echo "Generate as set of DH parameters"

test/tcrl

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
PATH=../apps:$PATH

PATH=../apps:$PATH

export PATH

export PATH





cmd='../apps/ssleay crl'

cmd='../apps/openssl crl'





if [ "$1"x != "x" ]; then

if [ "$1"x != "x" ]; then

	t=$1

	t=$1

test/testca

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ if [ $? != 0 ]; then 
fi

fi









SSLEAY_CONFIG="-config ../apps/ssleay.cnf"

SSLEAY_CONFIG="-config ../apps/openssl.cnf"

export SSLEAY_CONFIG

export SSLEAY_CONFIG

$SH ../apps/CA.sh -sign  <<EOF

$SH ../apps/CA.sh -sign  <<EOF

y

y

test/testenc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 




testsrc=Makefile.ssl

testsrc=Makefile.ssl

test=./p

test=./p

cmd=../apps/ssleay

cmd=../apps/openssl





cat $testsrc >$test;

cat $testsrc >$test;

test/testgen

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 "There should not be more that at most 80 per line"

echo "This could take some time."

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

if [ $? != 0 ]; then

echo problems creating request

echo problems creating request

exit 1

exit 1

fi

fi





../apps/ssleay req -verify -in testreq.pem -noout

../apps/openssl req -verify -in testreq.pem -noout

if [ $? != 0 ]; then

if [ $? != 0 ]; then

echo signature on req is wrong

echo signature on req is wrong

exit 1

exit 1