Adapt to new request handling.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21345 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-26 14:22:57 +00:00
parent cdc5318f33
commit f93c5750e6

View File

@@ -58,7 +58,7 @@ echo "issue certificate"
${hxtool} issue-certificate \ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--subject="cn=foo" \ --subject="cn=foo" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "verify certificate" echo "verify certificate"
@@ -107,7 +107,7 @@ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--subject="cn=foo" \ --subject="cn=foo" \
--lifetime="10years 1 month" \ --lifetime="10years 1 month" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue certificate (with https ekus)" echo "issue certificate (with https ekus)"
@@ -116,7 +116,7 @@ ${hxtool} issue-certificate \
--subject="cn=foo" \ --subject="cn=foo" \
--type="https-server" \ --type="https-server" \
--type="https-client" \ --type="https-client" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue certificate (pkinit KDC)" echo "issue certificate (pkinit KDC)"
@@ -125,7 +125,7 @@ ${hxtool} issue-certificate \
--subject="cn=foo" \ --subject="cn=foo" \
--type="pkinit-kdc" \ --type="pkinit-kdc" \
--pk-init-principal="krbtgt/TEST.H5L.SE@TEST.H5L.SE" \ --pk-init-principal="krbtgt/TEST.H5L.SE@TEST.H5L.SE" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue certificate (pkinit client)" echo "issue certificate (pkinit client)"
@@ -134,7 +134,7 @@ ${hxtool} issue-certificate \
--subject="cn=foo" \ --subject="cn=foo" \
--type="pkinit-client" \ --type="pkinit-client" \
--pk-init-principal="lha@TEST.H5L.SE" \ --pk-init-principal="lha@TEST.H5L.SE" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue certificate (hostnames)" echo "issue certificate (hostnames)"
@@ -144,7 +144,7 @@ ${hxtool} issue-certificate \
--type="https-server" \ --type="https-server" \
--hostname="www.test.h5l.se" \ --hostname="www.test.h5l.se" \
--hostname="ftp.test.h5l.se" \ --hostname="ftp.test.h5l.se" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "verify certificate hostname (ok)" echo "verify certificate hostname (ok)"
@@ -170,7 +170,7 @@ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--subject="cn=www.test.h5l.se" \ --subject="cn=www.test.h5l.se" \
--type="https-server" \ --type="https-server" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "verify certificate hostname (ok)" echo "verify certificate hostname (ok)"
@@ -191,7 +191,7 @@ ${hxtool} issue-certificate \
--subject="cn=foo" \ --subject="cn=foo" \
--email="lha@test.h5l.se" \ --email="lha@test.h5l.se" \
--email="test@test.h5l.se" \ --email="test@test.h5l.se" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue certificate (email, null subject DN)" echo "issue certificate (email, null subject DN)"
@@ -199,7 +199,7 @@ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--subject="" \ --subject="" \
--email="lha@test.h5l.se" \ --email="lha@test.h5l.se" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-null.pem" || exit 1 --certificate="FILE:cert-null.pem" || exit 1
echo "issue certificate (jabber)" echo "issue certificate (jabber)"
@@ -207,7 +207,7 @@ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--subject="cn=foo" \ --subject="cn=foo" \
--jid="lha@test.h5l.se" \ --jid="lha@test.h5l.se" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
echo "issue self-signed cert" echo "issue self-signed cert"
@@ -222,7 +222,7 @@ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \ --ca-certificate=FILE:$srcdir/data/ca.crt,$srcdir/data/ca.key \
--issue-ca \ --issue-ca \
--subject="cn=ca-cert" \ --subject="cn=ca-cert" \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-ca.der" || exit 1 --certificate="FILE:cert-ca.der" || exit 1
echo "issue self-signed ca cert" echo "issue self-signed ca cert"
@@ -237,7 +237,7 @@ echo "issue proxy certificate"
${hxtool} issue-certificate \ ${hxtool} issue-certificate \
--ca-certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \ --ca-certificate=FILE:$srcdir/data/test.crt,$srcdir/data/test.key \
--issue-proxy \ --issue-proxy \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--certificate="FILE:cert-proxy.der" || exit 1 --certificate="FILE:cert-proxy.der" || exit 1
echo "verify proxy cert" echo "verify proxy cert"
@@ -403,7 +403,7 @@ ${hxtool} verify --missing-revoke \
echo "issue ee cert (crl uri)" echo "issue ee cert (crl uri)"
${hxtool} issue-certificate \ ${hxtool} issue-certificate \
--ca-certificate=FILE:cert-ca.pem \ --ca-certificate=FILE:cert-ca.pem \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--crl-uri="http://www.test.h5l.se/crl1.crl" \ --crl-uri="http://www.test.h5l.se/crl1.crl" \
--subject="cn=cert-ee-crl-uri" \ --subject="cn=cert-ee-crl-uri" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1
@@ -411,7 +411,7 @@ ${hxtool} issue-certificate \
echo "issue null subject cert" echo "issue null subject cert"
${hxtool} issue-certificate \ ${hxtool} issue-certificate \
--ca-certificate=FILE:cert-ca.pem \ --ca-certificate=FILE:cert-ca.pem \
--req="pkcs10-request.der" \ --req="PKCS10:pkcs10-request.der" \
--subject="" \ --subject="" \
--email="lha@test.h5l.se" \ --email="lha@test.h5l.se" \
--certificate="FILE:cert-ee.pem" || exit 1 --certificate="FILE:cert-ee.pem" || exit 1