diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-08 14:07:39 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-08 14:07:39 -0400 |
| commit | be739b0cc05cda920377d3c12c26b2dc6aa44daf (patch) | |
| tree | 05d659d0be94abded8f5a644542de502bbe49e34 /test | |
| parent | 5adac91eab78d0ba8b5c84e7c883ae123c28a72b (diff) | |
Drop CA.sh for CA.pl
Remove CA.sh script and use CA.pl for testing, etc.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/testca | 13 | ||||
| -rw-r--r-- | test/testtsa | 2 | ||||
| -rw-r--r-- | test/testtsa.com | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/test/Makefile b/test/Makefile index 13b92852ca..e3fb791e10 100644 --- a/test/Makefile +++ b/test/Makefile @@ -352,7 +352,7 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf echo SKIP $@ -- requires RSA; \ else \ echo $(START) $@; \ - sh ./testca; \ + sh ./testca $(PERL); \ fi test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh diff --git a/test/testca b/test/testca index 2cffeb717b..0e2d05c572 100644 --- a/test/testca +++ b/test/testca @@ -1,12 +1,13 @@ #!/bin/sh -SH="/bin/sh" +PERL="$1" + if test "$OSTYPE" = msdosdjgpp; then PATH="../apps\;$PATH" else PATH="../apps:$PATH" fi -export SH PATH +export PATH SSLEAY_CONFIG="-config CAss.cnf" export SSLEAY_CONFIG @@ -15,7 +16,7 @@ OPENSSL="`pwd`/../util/opensslwrap.sh" export OPENSSL /bin/rm -fr demoCA -OPENSSL_CONFIG=/dev/null $SH ../apps/CA.sh -newca <<EOF +OPENSSL_CONFIG=/dev/null $PERL ../apps/CA.pl -newca <<EOF EOF if [ $? != 0 ]; then @@ -24,7 +25,7 @@ fi SSLEAY_CONFIG="-config Uss.cnf" export SSLEAY_CONFIG -$SH ../apps/CA.sh -newreq +$PERL ../apps/CA.pl -newreq if [ $? != 0 ]; then exit 1; fi @@ -32,7 +33,7 @@ fi SSLEAY_CONFIG="-config ../apps/openssl.cnf" export SSLEAY_CONFIG -$SH ../apps/CA.sh -sign <<EOF +$PERL ../apps/CA.pl -sign <<EOF y y EOF @@ -41,7 +42,7 @@ if [ $? != 0 ]; then fi -$SH ../apps/CA.sh -verify newcert.pem +$PERL ../apps/CA.pl -verify newcert.pem if [ $? != 0 ]; then exit 1; fi diff --git a/test/testtsa b/test/testtsa index bb653b5f73..a0588e39a6 100644 --- a/test/testtsa +++ b/test/testtsa @@ -14,7 +14,7 @@ export SH PATH OPENSSL_CONF="../CAtsa.cnf" export OPENSSL_CONF -# Because that's what ../apps/CA.sh really looks at +# Because that's what ../apps/CA.pl really looks at SSLEAY_CONFIG="-config $OPENSSL_CONF" export SSLEAY_CONFIG diff --git a/test/testtsa.com b/test/testtsa.com index 29fb1d0e63..8503633e86 100644 --- a/test/testtsa.com +++ b/test/testtsa.com @@ -13,7 +13,7 @@ $ exe_dir = "sys$disk:[-.''__arch'.exe.apps]" $ $ openssl = "mcr ''f$parse(exe_dir+"openssl.exe")'" $ OPENSSL_CONF = "[-]CAtsa.cnf" -$ ! Because that's what ../apps/CA.sh really looks at +$ ! Because that's what ../apps/CA.pl really looks at $ SSLEAY_CONFIG = "-config " + OPENSSL_CONF $ $ error: |