Changeset e376ed8 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Nov 29, 2019, 4:30:08 PM (16 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:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    rd4c9331 re376ed8  
    5858shared_identities = authority authority/client
    5959pgp_identities = $(shared_identities)
    60 x509_only_identities = authority/server authority/imposter rogueca \
    61         rogueca/rogueclient
    62 if ENABLE_OCSP_TEST
    63 x509_only_identities += authority/ocsp-responder
     60x509_only_identities = authority/server authority/imposter \
     61        authority/subca authority/subca/server \
     62        rogueca rogueca/rogueclient
     63if ENABLE_OCSP_TEST
     64x509_only_identities += authority/ocsp-responder authority/subca/ocsp-responder
    6465endif
    6566x509_identities = $(shared_identities) $(x509_only_identities)
     
    101102        authority/imposter/template.in authority/ocsp-responder/template \
    102103        authority/server/template.in \
     104        authority/subca/template.in authority/subca/server/template.in \
     105        authority/subca/ocsp-responder/template \
    103106        rogueca/template rogueca/rogueclient/template.in
    104107generated_templates = authority/template authority/client/template \
     
    161164if ENABLE_OCSP_TEST
    162165# rules to build OCSP database
    163 check_DATA += authority/ocsp_index.txt
    164 MOSTLYCLEANFILES += authority/ocsp_index.txt authority/ocsp_index.txt.attr
    165 authority/ocsp_index.txt: $(x509_tokens) gen_ocsp_index authority/ocsp_index.txt.attr
    166         ./gen_ocsp_index authority/server/x509.pem authority/client/x509.pem > $@
    167 
    168 authority/ocsp_index.txt.attr: authority/secret.key
     166ocsp_index_data = authority/ocsp_index.txt authority/ocsp_index.txt.attr \
     167        authority/subca/ocsp_index.txt authority/subca/ocsp_index.txt.attr
     168check_DATA += $(ocsp_index_data)
     169MOSTLYCLEANFILES += $(ocsp_index_data)
     170
     171# The "find" command builds a list of all certificates directly below
     172# the CA that aren't for the ocsp-responder.
     173%/ocsp_index.txt: $(x509_tokens) gen_ocsp_index
     174        ./gen_ocsp_index $$(find $(*) -mindepth 2 -maxdepth 2 ! -path '*/ocsp-responder/*' -name x509.pem) > $@
     175
     176%/ocsp_index.txt.attr:
     177        @mkdir -m 0700 -p $(dir $@)
    169178        echo "unique_subject = no" > $@
    170179
    171 # build certificate chain file for server
    172 check_DATA += authority/server/x509-chain.pem
    173 MOSTLYCLEANFILES += authority/server/x509-chain.pem
    174 %/x509-chain.pem: %/x509.pem authority/x509.pem
    175         cat $< authority/x509.pem > $@
     180# Build certificate chain files. Note that intermediate tokens must be
     181# listed explicitly, or the dependency chain will be broken because
     182# the higher level pattern matches, too.
     183chain_tokens = authority/server/x509-chain.pem \
     184        authority/subca/x509-chain.pem \
     185        authority/subca/server/x509-chain.pem
     186check_DATA += $(chain_tokens)
     187MOSTLYCLEANFILES += $(chain_tokens) authority/x509-chain.pem
    176188endif
    177189
Note: See TracChangeset for help on using the changeset viewer.