tests: use template file for generating long DNS certificate request

Instead of an interaction file, which causes problems on Windows when
reading a password from tty.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/cert-tests/crq.sh b/tests/cert-tests/crq.sh
index 6bbdc544ee6fc37ee25d66cacca2cc1c78f5a2d9..5ebbdbf0279687ca3cc9c50fbb6e1141b3b8f17c 100644 (file)
--- a/tests/cert-tests/crq.sh
+++ b/tests/cert-tests/crq.sh
@@ -96,40 +96,10 @@ rm -f "${OUTFILE}" "${OUTFILE2}"
 
 
 # Test interactive CRQ creation with very long input
-cat >$TMPFILE <<__EOF__
-
-
-
-
-
-super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long.com
-
-
-super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long.com
-
-
-
-
-
-
-
-
-N
-Y
-N
-Y
-N
-N
-N
-N
-N
-N
-__EOF__
-
-setsid \
 "${CERTTOOL}" --attime "2007-04-22" -q \
-       --load-privkey "${srcdir}/data/template-test.key" \
-       --outfile "${OUTFILE}" <$TMPFILE 2>/dev/null
+             --load-privkey "${srcdir}/data/template-test.key" \
+             --template "${srcdir}/templates/template-long-dns.tmpl" \
+             --outfile "${OUTFILE}" 2>/dev/null
 
 ${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/data/template-long-dns-crq.pem" "${OUTFILE}" >/dev/null 2>&1
 rc=$?

diff --git a/tests/cert-tests/data/template-long-dns-crq.pem b/tests/cert-tests/data/template-long-dns-crq.pem
index 411a65813a64b7b85c6dbb452dba7e06bd2ac1ed..07bdd308bffd8637fe7b108c8f7b17941e3425e3 100644 (file)
--- a/tests/cert-tests/data/template-long-dns-crq.pem
+++ b/tests/cert-tests/data/template-long-dns-crq.pem
@@ -1,8 +1,8 @@
 PKCS #10 Certificate Request Information:
        Version: 1
-       Subject: CN=super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long.com
+       Subject: OU=super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long dept,O=super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long org,CN=super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long.com
        Subject Public Key Algorithm: RSA
-       Algorithm Security Level: Low (1024 bits)
+       Algorithm Security Level: Legacy (1024 bits)
                Modulus (bits 1024):
                        00:a5:c6:ce:75:43:84:bf:64:9e:02:27:13:f1:03:59
                        f7:79:2d:92:ed:7c:2f:50:a4:03:f1:2d:79:b9:86:8b
@@ -20,14 +20,17 @@ PKCS #10 Certificate Request Information:
                Extensions:
                        Subject Alternative Name (not critical):
                                DNSname: super-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long.com
+                               DNSname: www.morethanone.org
+                               DNSname: www.evenmorethanone.org
+                               IPAddress: 192.168.1.1
+                               RFC822Name: none@none.org
+                               RFC822Name: where@none.org
                        Basic Constraints (critical):
                                Certificate Authority (CA): FALSE
-                       Key Purpose (critical):
-                               Time stamping.
-                               Ipsec IKE.
                        Key Usage (critical):
                                Digital signature.
-                               Key encipherment.
+                       Key Purpose (critical):
+                               TLS WWW Server.
 Other Information:
        Public Key ID:
                sha1:5d40adf0ce9440958b7e99941d925422ca72365f
@@ -38,24 +41,36 @@ Other Information:
 Self signature: verified
 
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIDlzCCAwACAQAwgf0xgfowgfcGA1UEAxOB73N1cGVyLXZlcnktdmVyeS12ZXJ5
+MIIF3zCCBUgCAQAwggL4MYH6MIH3BgNVBAMTge9zdXBlci12ZXJ5LXZlcnktdmVy
+eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12
+ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5
 LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZl
 cnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnkt
+dmVyeS12ZXJ5LXZlcnktdmVyeS1sb25nLmNvbTGB+jCB9wYDVQQKE4Hvc3VwZXIt
 dmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVy
 eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12
-ZXJ5LXZlcnktdmVyeS12ZXJ5LWxvbmcuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQClxs51Q4S/ZJ4CJxPxA1n3eS2S7XwvUKQD8S15uYaLBX46u0Sqr4TP
-E5geHEo49zMtep9y1GttJrAxN3AQ+0Lp2J0YZX4ZSfwFlgRogx53hr/t9eUSOxP+
-MxicGnodaa9HAmB6H7noz9vINDBRlj2MllwAvGHeCA+xNiF/qQDjBQIDAQABoIIB
-VzCCAVMGCSqGSIb3DQEJDjGCAUQwggFAMIH9BgNVHREEgfUwgfKCge9zdXBlci12
 ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5
 LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZl
-cnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnkt
+cnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktbG9uZyBvcmcxgfswgfgG
+A1UECxOB8HN1cGVyLXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnkt
 dmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVy
-eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS1sb25nLmNvbTAMBgNVHRMB
-Af8EAjAAMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMIBggrBgEFBQcDETAOBgNVHQ8B
-Af8EBAMCBaAwDQYJKoZIhvcNAQELBQADgYEAayPv5BS2Rqrj7ajEUKz0TH1VZ/cx
-dTxaK4TXj8k6551jk/gyVZz4m0P61UeBL2Weqc2mWDhz6f7TAmUbtd4ZzBv4qn1h
-ses5EzF/1kMgWKzKMwAqT/LirwRMYFfkfAZjAbd71dYUnL+I84e4GaXcchH3hB2d
-sXtj4I9KZ9kWCf4=
+eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12
+ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5
+LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LWxv
+bmcgZGVwdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApcbOdUOEv2SeAicT
+8QNZ93ktku18L1CkA/EtebmGiwV+OrtEqq+EzxOYHhxKOPczLXqfctRrbSawMTdw
+EPtC6didGGV+GUn8BZYEaIMed4a/7fXlEjsT/jMYnBp6HWmvRwJgeh+56M/byDQw
+UZY9jJZcALxh3ggPsTYhf6kA4wUCAwEAAaCCAaMwggGfBgkqhkiG9w0BCQ4xggGQ
+MIIBjDCCAVIGA1UdEQSCAUkwggFFgoHvc3VwZXItdmVyeS12ZXJ5LXZlcnktdmVy
+eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12
+ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5
+LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZl
+cnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnkt
+dmVyeS12ZXJ5LXZlcnktbG9uZy5jb22CE3d3dy5tb3JldGhhbm9uZS5vcmeCF3d3
+dy5ldmVubW9yZXRoYW5vbmUub3JnhwTAqAEBgQ1ub25lQG5vbmUub3JngQ53aGVy
+ZUBub25lLm9yZzAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUB
+Af8EDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOBgQBk+82WSfNqpt7z63Qx
+8n3KsjccllCx2gJTiiPGV1A+yZRGNuAOaGeuEg39ymI3h7XBzV22y6rRlQ/MYs+F
+3tuk6TUJR2OSYPIfDiWNp05EPHv28I62KuX6un+t/KxdwxChqpldwjbae/mlpzqF
+reLzf5vBFbZg47f3tBWuzul0hg==
 -----END NEW CERTIFICATE REQUEST-----