From a00613fcda89a9df2ef692051d773630dea33a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 4 Oct 2006 21:00:33 +0000
Subject: [PATCH] Test pkinit encKey case.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18223 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tests/kdc/check-kdc.in | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index 1fc13d905..4dedb3c2f 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -247,20 +247,22 @@ fi
 
 # If we support pkinit and have RSA, lets try that
 if test "$pkinit" = yes -a "$rsa" = yes ; then
-	echo "Trying pk-init (principal in certificate)"
-	base="${srcdir}/../../lib/hx509/data"
-	${kinit} -C FILE:${base}/pkinit.crt,${base}/pkinit.key bar@${R} || exitcode=1
-	${kgetcred} ${server}@${R} || exitcode=1
-	${kdestroy}
-	echo "Trying pk-init (principal in pki-mapping)"
-	${kinit} -C FILE:${base}/pkinit.crt,${base}/pkinit.key foo@${R} || exitcode=1
-	${kgetcred} ${server}@${R} || exitcode=1
-	${kdestroy}
-	echo "Trying pk-init (password protected key)"
-	${kinit} -C FILE:${base}/pkinit.crt,${base}/pkinit-pw.key --password-file=${objdir}/foopassword foo@${R} || exitcode=1
-	${kgetcred} ${server}@${R} || exitcode=1
-	${kdestroy}
 
+    for type in "" "--pk-use-enckey"; do
+	echo "Trying pk-init (principal in certificate) $type"
+	base="${srcdir}/../../lib/hx509/data"
+	${kinit} $type -C FILE:${base}/pkinit.crt,${base}/pkinit.key bar@${R} || exitcode=1
+	${kgetcred} ${server}@${R} || exitcode=1
+	${kdestroy}
+	echo "Trying pk-init (principal in pki-mapping) $type"
+	${kinit} $type -C FILE:${base}/pkinit.crt,${base}/pkinit.key foo@${R} || exitcode=1
+	${kgetcred} ${server}@${R} || exitcode=1
+	${kdestroy}
+	echo "Trying pk-init (password protected key) $type"
+	${kinit} $type -C FILE:${base}/pkinit.crt,${base}/pkinit-pw.key --password-file=${objdir}/foopassword foo@${R} || exitcode=1
+	${kgetcred} ${server}@${R} || exitcode=1
+	${kdestroy}
+    done
 else
 	echo "no pkinit (pkinit: $pkinit, rsa: $rsa)"
 fi