From d459cbb4574286888b894fea4565d2cec0cf0c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sat, 22 Apr 2006 07:35:13 +0000
Subject: [PATCH] Test generating des-ede3 aes-128 aes-256 enveloped data

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17161 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/test_cms.in | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/hx509/test_cms.in b/lib/hx509/test_cms.in
index 082c623a9..712801d19 100644
--- a/lib/hx509/test_cms.in
+++ b/lib/hx509/test_cms.in
@@ -156,21 +156,25 @@ echo "unenvelope data (content-info)"
 	FILE:$srcdir/data/test.crt,$srcdir/data/test.key > /dev/null || exit 1
 cmp "$srcdir/data/static-file" ev.data.out || exit 1
 
-echo "envelope data"
-./hxtool cms-envelope \
-	--certificate=FILE:$srcdir/data/test.crt \
-	"$srcdir/data/static-file" \
-	ev.data  || exit 1
+for a in des-ede3 aes-128 aes-256; do
 
-echo "unenvelope data"
-./hxtool cms-unenvelope \
-	--certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
-	ev.data ev.data.out \
-	FILE:$srcdir/data/test.crt,$srcdir/data/test.key > /dev/null || exit 1
-cmp "$srcdir/data/static-file" ev.data.out || exit 1
+	rm -f ev.data ev.data.out
+	echo "envelope data ($a)"
+	./hxtool cms-envelope \
+	        --encryption-type="$a-cbc" \
+		--certificate=FILE:$srcdir/data/test.crt \
+		"$srcdir/data/static-file" \
+		ev.data  || exit 1
+
+	echo "unenvelope data ($a)"
+	./hxtool cms-unenvelope \
+		--certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
+		ev.data ev.data.out > /dev/null || exit 1
+	cmp "$srcdir/data/static-file" ev.data.out || exit 1
+done
 
 for a in rc2-40 rc2-64 rc2-128 des-ede3 aes-128 aes-256; do
-    echo "unenvelope data ($a)"
+    echo "static unenvelope data ($a)"
 
     rm -f ev.data.out
     ./hxtool cms-unenvelope \