Changeset 143bd98 in mod_gnutls

Timestamp:

May 22, 2019, 2:44:48 AM (17 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

c91382d

Parents:

510764a

Message:

Build test certificates without intermediate certificate request files

File:

• test/test_ca.mk (modified) (1 diff)

test/test_ca.mk

@@ -61 +61 @@
         certtool --outfile $@ --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template
 
-%/cert-request: %.template %/secret.key
-        certtool --outfile $@ --generate-request --load-privkey $(dir $@)secret.key --template $<
-
 # normal case: certificates signed by test CA
-%/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem
-        certtool --outfile $@ --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $<
+%/x509.pem: %.template %/secret.key authority/secret.key authority/x509.pem
+        certtool --outfile $@ --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-privkey $(dir $@)secret.key --template $<
 
 # error case: certificates signed by rogue CA
-rogue%/x509.pem: rogue%.template rogue%/cert-request rogueca/x509.pem
-        certtool --outfile $@ --generate-certificate --load-ca-certificate rogueca/x509.pem --load-ca-privkey rogueca/secret.key --load-request $(dir $@)cert-request --template $<
+rogue%/x509.pem: rogue%.template rogue%/secret.key rogueca/x509.pem
+        certtool --outfile $@ --generate-certificate --load-ca-certificate rogueca/x509.pem --load-ca-privkey rogueca/secret.key --load-privkey $(dir $@)secret.key --template $<
 
 %/softhsm.conf: %/secret.key