svn commit: lorikeet r764 - in trunk/heimdal/tests: . kdc

[lha at samba.org]

Author: lha
Date: 2007-06-26 15:21:53 +0000 (Tue, 26 Jun 2007)
New Revision: 764

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=764

Log:
Merged with Heimdal svn revision 21349
Modified:
   trunk/heimdal/tests/ChangeLog
   trunk/heimdal/tests/kdc/check-pkinit.in


Changeset:
Modified: trunk/heimdal/tests/ChangeLog
===================================================================
--- trunk/heimdal/tests/ChangeLog	2007-06-26 14:27:06 UTC (rev 763)
+++ trunk/heimdal/tests/ChangeLog	2007-06-26 15:21:53 UTC (rev 764)
@@ -1,5 +1,7 @@
 2007-06-26  Love Hörnquist Åstrand  <lha at it.su.se>
 
+	* kdc/check-pkinit.in: Fix hxtool issue-certificate --req.
+
 	* kdc/check-referral.in: Spelling.
 	
 2007-06-22  Love Hörnquist Åstrand  <lha at it.su.se>

Modified: trunk/heimdal/tests/kdc/check-pkinit.in
===================================================================
--- trunk/heimdal/tests/kdc/check-pkinit.in	2007-06-26 14:27:06 UTC (rev 763)
+++ trunk/heimdal/tests/kdc/check-pkinit.in	2007-06-26 15:21:53 UTC (rev 764)
@@ -31,7 +31,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 # SUCH DAMAGE. 
 #
-# $Id: check-pkinit.in 20749 2007-05-31 17:34:17Z lha $
+# $Id: check-pkinit.in 21348 2007-06-26 15:12:59Z lha $
 #
 
 srcdir="@srcdir@"
@@ -130,7 +130,7 @@
 	  --ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
 	  --type="pkinit-kdc" \
           --pk-init-principal="krbtgt/TEST.H5L.SE at TEST.H5L.SE" \
-	  --req="req-kdc.der" \
+	  --req="PKCS10:req-kdc.der" \
 	  --certificate="FILE:kdc.crt" || exit 1
 
 echo "issue user certificate (pkinit san)"
@@ -138,14 +138,14 @@
 	  --ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
 	  --type="pkinit-client" \
           --pk-init-principal="bar at TEST.H5L.SE" \
-	  --req="req-pkinit.der" \
+	  --req="PKCS10:req-pkinit.der" \
 	  --certificate="FILE:pkinit.crt" || exit 1
 
 echo "issue user 2 certificate (no san)"
 ${hxtool} issue-certificate \
 	  --ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
 	  --type="pkinit-client" \
-	  --req="req-pkinit2.der" \
+	  --req="PKCS10:req-pkinit2.der" \
 	  --certificate="FILE:pkinit2.crt" || exit 1
 
 echo "issue user 3 certificate (ms san)"
@@ -153,7 +153,7 @@
 	  --ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
 	  --type="pkinit-client" \
           --ms-upn="bar at test.h5l.se" \
-	  --req="req-pkinit2.der" \
+	  --req="PKCS10:req-pkinit2.der" \
 	  --certificate="FILE:pkinit3.crt" || exit 1