Call of memcmp with null pointers in obj_cmp()

[oweals/openssl.git] / test / treq

diff --git a/test/treq b/test/treq
index 420d25e16899f9e057b20ab3165a4f53422c038e..89f088c75797172e2d0c648d486e71363d50eff7 100644 (file)
--- a/test/treq
+++ b/test/treq
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 if [ "$1"x != "x" ]; then
        t=$1
@@ -17,67 +18,25 @@ echo testing req conversions
 cp $t req-fff.p
 
 echo "p -> d"
-$cmd -in req-fff.p -inform p -outform d >req-f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-fff.p -inform p -outform t >req-f.t
-#if [ $? != 0 ]; then exit 1; fi
+$cmd -in req-fff.p -inform p -outform d >req-f.d || exit 1
 echo "p -> p"
-$cmd -in req-fff.p -inform p -outform p >req-f.p
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in req-fff.p -inform p -outform p >req-f.p || exit 1
 
 echo "d -> d"
-$cmd -verify -in req-f.d -inform d -outform d >req-ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in req-f.t -inform t -outform d >req-ff.d2
-#if [ $? != 0 ]; then exit 1; fi
+$cmd -verify -in req-f.d -inform d -outform d >req-ff.d1 || exit 1
 echo "p -> d"
-$cmd -verify -in req-f.p -inform p -outform d >req-ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in req-f.d -inform d -outform t >req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in req-f.t -inform t -outform t >req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-f.p -inform p -outform t >req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
+$cmd -verify -in req-f.p -inform p -outform d >req-ff.d3 || exit 1
 
 echo "d -> p"
-$cmd -in req-f.d -inform d -outform p >req-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in req-f.t -inform t -outform p >req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
+$cmd -in req-f.d -inform d -outform p >req-ff.p1 || exit 1
 echo "p -> p"
-$cmd -in req-f.p -inform p -outform p >req-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp req-fff.p req-f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp req-fff.p req-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp req-fff.p req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp req-fff.p req-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp req-f.t req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
+$cmd -in req-f.p -inform p -outform p >req-ff.p3 || exit 1
 
-cmp req-f.p req-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.p req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp req-f.p req-ff.p3
-if [ $? != 0 ]; then exit 1; fi
+cmp req-fff.p req-f.p || exit 1
+cmp req-fff.p req-ff.p1 || exit 1
+cmp req-fff.p req-ff.p3 || exit 1
+cmp req-f.p req-ff.p1 || exit 1
+cmp req-f.p req-ff.p3 || exit 1
 
 /bin/rm -f req-f.* req-ff.* req-fff.*
 exit 0