X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Ftestgen;h=524c0d134c89416b8c6715f9977780b5da308471;hb=53bb723834f523d09cbb05adad4bc5ce3c672d59;hp=f2db42cb247c84f89aee7c4503ea610e5920644b;hpb=65b002f39934a755b6db855c9f9ba722d6cef863;p=oweals%2Fopenssl.git

diff --git a/test/testgen b/test/testgen
index f2db42cb24..524c0d134c 100644
--- a/test/testgen
+++ b/test/testgen
@@ -6,30 +6,36 @@ CA=../certs/testca.pem
 
 /bin/rm -f $T.1 $T.2 $T.key
 
-PATH=../apps:$PATH;
+if test "$OSTYPE" = msdosdjgpp; then
+    PATH=../apps\;$PATH;
+else
+    PATH=../apps:$PATH;
+fi
 export PATH
 
 echo "generating certificate request"
 
 echo "string to make the random number generator think it has entropy" >> ./.rnd
 
-if ../apps/openssl list-standard-commands | grep '^rsa$' >/dev/null; then
+if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
+  req_new='-newkey dsa:../apps/dsa512.pem'
+else
   req_new='-new'
   echo "There should be a 2 sequences of .'s and some +'s."
   echo "There should not be more that at most 80 per line"
-else
-  req_new='-newkey dsa:../apps/dsa512.pem'
 fi
 
 echo "This could take some time."
 
-../apps/openssl req -config test.cnf $req_new -out testreq.pem
+rm -f testkey.pem testreq.pem
+
+../util/shlib_wrap.sh ../apps/openssl req -config test.cnf $req_new -out testreq.pem
 if [ $? != 0 ]; then
 echo problems creating request
 exit 1
 fi
 
-../apps/openssl req -config test.cnf -verify -in testreq.pem -noout
+../util/shlib_wrap.sh ../apps/openssl req -config test.cnf -verify -in testreq.pem -noout
 if [ $? != 0 ]; then
 echo signature on req is wrong
 exit 1