Pass in password, add more tests.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16021 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/hx509/test_cms.in

@@ -106,23 +106,39 @@ echo "verify signed data (no attr, no certs)"
 	"$srcdir/data/test-signed-data-noattr-nocerts" sd.data.out || exit 1
 cmp "$srcdir/test_chain.in" sd.data.out || exit 1
 
+echo "envelope data (content-info)"
+./hxtool cms-envelope \
+	--certificate=FILE:$srcdir/data/test.crt \
+	--content-info \
+	"$srcdir/test_chain.in" \
+	ev.data  || exit 1
+
+echo "unenvelope data (content-info)"
+./hxtool cms-unenvelope \
+	--pass=PASS:foobar \
+	--certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
+	--content-info \
+	ev.data ev.data.out \
+	FILE:$srcdir/data/test.crt,$srcdir/data/test.key || exit 1
+cmp "$srcdir/test_chain.in" ev.data.out || exit 1
+
 echo "envelope data"
 ./hxtool cms-envelope \
-    --certificate=FILE:$srcdir/data/test.crt \
-    --content-info \
-    "$srcdir/test_chain.in" \
-    ev.data  || exit 1
+	--certificate=FILE:$srcdir/data/test.crt \
+	"$srcdir/test_chain.in" \
+	ev.data  || exit 1
 
 echo "unenvelope data"
 ./hxtool cms-unenvelope \
-    --certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
-    --content-info \
-    ev.data ev.data.out \
-    FILE:$srcdir/data/test.crt,$srcdir/data/test.key || exit 1
+	--pass=PASS:foobar \
+	--certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
+	ev.data ev.data.out \
+	FILE:$srcdir/data/test.crt,$srcdir/data/test.key || exit 1
 cmp "$srcdir/test_chain.in" ev.data.out || exit 1
 
 echo "unenvelope data (aes-128)"
 ./hxtool cms-unenvelope \
+	--pass=PASS:foobar \
 	--certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
 	--content-info \
 	"$srcdir/data/test-enveloped-aes-128" ev.data.out || exit 1