Changeset e376ed8 in mod_gnutls for test/test_ca.mk

Timestamp:

Nov 29, 2019, 4:30:08 PM (15 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

618ee14

Parents:

d4c9331 (diff), 556783e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'subca'

File:

• test/test_ca.mk (modified) (2 diffs)

test/test_ca.mk

@@ -10 +10 @@
         @mkdir -m 0700 -p $(@D)
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
-        sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)," $@
+        sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)$(dir $(*))," $@
         for i in $(patsubst [%],%,$(TEST_IP)); do \
                 IP_ADDRS="$${IP_ADDRS}\nip_address = $${i}"; \
@@ -58 +58 @@
 # special rule for root CAs
 root_cert_rule = certtool --outfile $@ --generate-self-signed --load-privkey $(dir $@)secret.key --template $<
+root_chain_rule = cp $< $@
 authority/x509.pem rogueca/x509.pem: %/x509.pem: %/template %/secret.key
         $(root_cert_rule)
+authority/x509-chain.pem rogueca/x509-chain.pem: %/x509-chain.pem: %/x509.pem
+        $(root_chain_rule)
 
 # generic rule for building non-root certificates, with the CA in the
 # parent directory
 cert_rule = certtool --outfile $@ --generate-certificate --load-ca-certificate $(dir $@)../x509.pem --load-ca-privkey $(dir $@)../secret.key --load-privkey $(dir $@)secret.key --template $<
+chain_rule = cat $< $(dir $@)../x509-chain.pem > $@
 
 # certificates signed by the test root CA
 %/x509.pem: %/template %/secret.key authority/secret.key authority/x509.pem
         $(cert_rule)
+%/x509-chain.pem: %/x509.pem authority/x509-chain.pem
+        $(chain_rule)
+
+# certificates signed by the test sub CA
+authority/subca/%/x509.pem: authority/subca/%/template authority/subca/%/secret.key authority/subca/x509.pem
+        $(cert_rule)
+authority/subca/%/x509-chain.pem: authority/subca/%/x509.pem authority/subca/x509-chain.pem
+        $(chain_rule)
 
 # certificates signed by rogue CA (for error cases)