提交 288370ea 编写于 作者: B Ben Laurie

Fix tests for ssleay -> openssl.

上级 2ec077d8
...@@ -183,7 +183,7 @@ if (((NR+1)%64) == 0) print NR+1," tests done"; }' ...@@ -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"
......
...@@ -3,7 +3,7 @@ ...@@ -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
......
...@@ -23,7 +23,7 @@ if [ $? != 0 ]; then ...@@ -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
......
...@@ -2,7 +2,7 @@ ...@@ -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;
......
...@@ -15,13 +15,13 @@ echo "There should be a 2 sequences of .'s and some +'s." ...@@ -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
......
#!/bin/sh #!/bin/sh
digest='-mdc2' digest='-mdc2'
reqcmd="../apps/ssleay req" reqcmd="../apps/openssl req"
x509cmd="../apps/ssleay x509 $digest" x509cmd="../apps/openssl x509 $digest"
verifycmd="../apps/ssleay verify" verifycmd="../apps/openssl verify"
CAkey="keyCA.ss" CAkey="keyCA.ss"
CAcert="certCA.ss" CAcert="certCA.ss"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay pkcs7' cmd='../apps/openssl pkcs7'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay pkcs7' cmd='../apps/openssl pkcs7'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
...@@ -11,7 +11,7 @@ else ...@@ -11,7 +11,7 @@ else
t=pkcs7-1.pem t=pkcs7-1.pem
fi fi
echo testing pkcs7 conversions echo "testing pkcs7 conversions (2)"
cp $t fff.p cp $t fff.p
echo "p -> d" echo "p -> d"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay req' cmd='../apps/openssl req'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay rsa' cmd='../apps/openssl rsa'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay sess_id' cmd='../apps/openssl sess_id'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PATH=../apps:$PATH PATH=../apps:$PATH
export PATH export PATH
cmd='../apps/ssleay x509' cmd='../apps/openssl x509'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册