X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftestca;h=ee5246303da9092fc296ed9b29d70ae810803025;hp=a28402f9ca79fa2187d1c19b808066637d3c7cd0;hb=323daa74fc608860ebee86c7e93ab8b4e926cb1e;hpb=b7896b3cb86d80206af14a14d69b0717786f2729

diff --git a/test/testca b/test/testca
index a28402f9ca..ee5246303d 100644
--- a/test/testca
+++ b/test/testca
@@ -1,44 +1,31 @@
 #!/bin/sh
 
-SH="/bin/sh"
-PATH=../apps:$PATH
-export SH PATH
+set -e
 
-SSLEAY_CONFIG="-config CAss.cnf"
-export SSLEAY_CONFIG
-
-/bin/rm -fr demoCA
-$SH ../apps/CA.sh -newca <<EOF
-EOF
+PERL="$1"
 
-if [ $? != 0 ]; then
-	exit 1;
+if test "$OSTYPE" = msdosdjgpp; then
+    PATH="../apps\;$PATH"
+else
+    PATH="../apps:$PATH"
 fi
+export PATH
 
-SSLEAY_CONFIG="-config Uss.cnf"
-export SSLEAY_CONFIG
-$SH ../apps/CA.sh -newreq
-if [ $? != 0 ]; then
-	exit 1;
-fi
+export SSLEAY_CONFIG OPENSSL
 
+/bin/rm -fr demoCA
 
-SSLEAY_CONFIG="-config ../apps/ssleay.cnf"
-export SSLEAY_CONFIG
-$SH ../apps/CA.sh -sign  <<EOF
-y
-y
-EOF
-if [ $? != 0 ]; then
-	exit 1;
-fi
+SSLEAY_CONFIG="-config CAss.cnf"
+OPENSSL="`pwd`/../util/opensslwrap.sh"
 
+OPENSSL_CONFIG=/dev/null $PERL ../apps/CA.pl -newca </dev/null
 
-$SH ../apps/CA.sh -verify newcert.pem
-if [ $? != 0 ]; then
-	exit 1;
-fi
+SSLEAY_CONFIG="-config Uss.cnf"
+$PERL ../apps/CA.pl -newreq
 
-/bin/rm -fr demoCA newcert.pem newreq.pem
-#usage: CA -newcert|-newreq|-newca|-sign|-verify
+SSLEAY_CONFIG="-config ../apps/openssl.cnf"
+yes | $PERL ../apps/CA.pl -sign
+
+$PERL ../apps/CA.pl -verify newcert.pem
 
+/bin/rm -fr demoCA newcert.pem newreq.pem