Changeset a819501 in mod_gnutls for test/test_ca.mk


Ignore:
Timestamp:
Jun 24, 2019, 2:46:11 PM (8 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master
Children:
f205c5f
Parents:
c91382d
Message:

Test suite: Move template files into per-identity directories

Also ensure that per-identity build directories exist for VPATH builds.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/test_ca.mk

    rc91382d ra819501  
    77# for the test suite
    88
    9 %.template: $(srcdir)/%.template.in
     9%/template: $(srcdir)/%/template.in %
     10        @mkdir -m 0700 -p $(@D)
    1011        sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
    1112        sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)," $@
     
    1516        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
    1617
    17 %/uid: $(srcdir)/%/uid.in
     18%/uid: $(srcdir)/%/uid.in %
     19        @mkdir -m 0700 -p $(@D)
    1820        sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
    1921
    20 %/secret.key:
    21         mkdir -p $(dir $@)
    22         chmod 0700 $(dir $@)
     22%/secret.key: %
     23        @mkdir -m 0700 -p $(@D)
    2324        certtool --outfile $@ --generate-privkey
    2425
     
    5657
    5758# special cases for the authorities' root certs:
    58 authority/x509.pem: authority.template authority/secret.key
    59         certtool --outfile $@ --generate-self-signed --load-privkey authority/secret.key --template authority.template
    60 rogueca/x509.pem: $(srcdir)/rogueca.template rogueca/secret.key
    61         certtool --outfile $@ --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template
     59authority/x509.pem: authority/template authority/secret.key
     60        certtool --outfile $@ --generate-self-signed --load-privkey authority/secret.key --template authority/template
     61rogueca/x509.pem: $(srcdir)/rogueca/template rogueca/secret.key
     62        certtool --outfile $@ --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca/template
    6263
    6364# normal case: certificates signed by test CA
    64 %/x509.pem: %.template %/secret.key authority/secret.key authority/x509.pem
     65%/x509.pem: %/template %/secret.key authority/secret.key authority/x509.pem
    6566        certtool --outfile $@ --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-privkey $(dir $@)secret.key --template $<
    6667
    6768# error case: certificates signed by rogue CA
    68 rogue%/x509.pem: rogue%.template rogue%/secret.key rogueca/x509.pem
     69rogue%/x509.pem: rogue%/template rogue%/secret.key rogueca/x509.pem
    6970        certtool --outfile $@ --generate-certificate --load-ca-certificate rogueca/x509.pem --load-ca-privkey rogueca/secret.key --load-privkey $(dir $@)secret.key --template $<
    7071
     
    9293# GnuTLSProxyCRLFile causes the connection to the back end server to
    9394# fail.
    94 %/crl.pem: %/x509.pem ${srcdir}/%-crl.template
     95%/crl.pem: %/x509.pem ${srcdir}/%/crl.template
    9596        certtool --generate-crl \
    9697                --outfile $@ \
     
    9899                --load-ca-certificate authority/x509.pem \
    99100                --load-certificate $< \
    100                 --template "${srcdir}/$(*)-crl.template"
     101                --template "${srcdir}/$(*)/crl.template"
Note: See TracChangeset for help on using the changeset viewer.