NISTZ256: set Z_is_one to boolean 0/1 as is customary.

[openssl.git] / test / tpkcs7

diff --git a/test/tpkcs7 b/test/tpkcs7
index ea1f005dacfdc5a6fbc0ed8e9020acdbeaf849c5..a1e8c0a61b4234ca91ad4b5c65beafc7ee7391a2 100644 (file)
--- a/test/tpkcs7
+++ b/test/tpkcs7
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/ssleay pkcs7'
+cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 if [ "$1"x != "x" ]; then
        t=$1
@@ -12,40 +10,28 @@ else
 fi
 
 echo testing pkcs7 conversions
-cp $t fff.p
+cp $t p7-fff.p
 
 echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in p7-fff.p -inform p -outform d >p7-f.d || exit 1
 echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in p7-fff.p -inform p -outform p >p7-f.p || exit 1
 
 echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in p7-f.d -inform d -outform d >p7-ff.d1 || exit 1
 echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in p7-f.p -inform p -outform d >p7-ff.d3 || exit 1
 
 echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in p7-f.d -inform d -outform p >p7-ff.p1 || exit 1
 echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
+$cmd -in p7-f.p -inform p -outform p >p7-ff.p3 || exit 1
+
+cmp p7-fff.p p7-f.p || exit 1
+cmp p7-fff.p p7-ff.p1 || exit 1
+cmp p7-fff.p p7-ff.p3 || exit 1
+cmp p7-f.p p7-ff.p1 || exit 1
+cmp p7-f.p p7-ff.p3 || exit 1
+
+/bin/rm -f p7-f.* p7-ff.* p7-fff.*
 exit 0