Changeset 71e9a5c in mod_gnutls for test/TestMakefile

Timestamp:

Aug 22, 2015, 3:53:31 PM (6 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports

Children:

b837187

Parents:

2db6923 (diff), 4addf74 (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 tag 'upstream/0.7' into debian

Upstream version 0.7

File:

• test/TestMakefile (moved) (moved from t/Makefile) (6 diffs)

test/TestMakefile

@@ -6 +6 @@
 # simple configuration choices.
 
+export srcdir ?= .
+# If the Apache binary is not set, try to find apache2 in default PATH
+# (should only happen when the test script is run manually)
+export APACHE2 ?= apache2
+
 export TEST_HOST ?= localhost
 export TEST_IP ?= ::1
@@ -12 +17 @@
 export MSVA_PORT ?= 9933
 
-export TEST_GAP ?= 1.5
-export TEST_QUERY_DELAY ?= 2
+export TEST_GAP ?= 0.4
+export TEST_MSVA_MAX_WAIT ?= 10
+export TEST_QUERY_DELAY ?= 30
+export TEST_LOCK_WAIT ?= 30
+
+TEST_LOCK := ./test.lock
 
 all: setup.done
-        ./runtests
+        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests
 
 t-%: setup.done
-        ./runtests $@
+        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests $@
 
 
@@ -30 +39 @@
 all_tokens := $(foreach id,$(identities),$(foreach token,$(tokens),$(id)/$(token)))
 
-%.template: %.template.in
+%.template: $(srcdir)/%.template.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
-server.uid: server.uid.in
+%.uid: $(srcdir)/%.uid.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
@@ -55 +64 @@
         GNUPGHOME=$(dir $@) gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@
 
+# Import and signing modify the shared keyring, which leads to race
+# conditions with parallel make. Locking avoids this problem.
 %/cert.pgp: %/minimal.pgp authority/gpg.conf
-        GNUPGHOME=authority gpg --import $<
-        GNUPGHOME=authority gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
+        GNUPGHOME=authority flock authority/lock gpg --import $<
+        GNUPGHOME=authority flock authority/lock gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
         GNUPGHOME=authority gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@
 
 # special cases for the authorities' root certs:
 authority/x509.pem: authority.template authority/secret.key
-        certtool --generate-self-signed --load-privkey=authority/secret.key --template=authority.template > $@
-rogueca/x509.pem: rogueca.template rogueca/secret.key
-        certtool --generate-self-signed --load-privkey=rogueca/secret.key --template=rogueca.template > $@
+        certtool --generate-self-signed --load-privkey authority/secret.key --template authority.template > $@
+rogueca/x509.pem: $(srcdir)/rogueca.template rogueca/secret.key
+        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
 
 %/cert-request: %.template %/secret.key 
-        certtool --generate-request --load-privkey=$(dir $@)secret.key --template=$< > $@
+        certtool --generate-request --load-privkey $(dir $@)secret.key --template $< > $@
 
 %/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem 
-        certtool --generate-certificate --load-ca-certificate=authority/x509.pem --load-ca-privkey=authority/secret.key --load-request=$(dir $@)cert-request --template=$< > $@
+        certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
+
+%/softhsm.db: %/x509.pem %/secret.key
+        SOFTHSM_CONF="$(srcdir)/$(*)-softhsm.conf" $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+
+# Generate CRL revoking a certain certificate. Currently used to
+# revoke the server certificate and check if setting the CRL as
+# GnuTLSProxyCRLFile causes the connection to the back end server to
+# fail.
+%/crl.pem: %/x509.pem ${srcdir}/%-crl.template
+        certtool --generate-crl \
+                --load-ca-privkey authority/secret.key \
+                --load-ca-certificate authority/x509.pem \
+                --load-certificate $< \
+                --template "${srcdir}/$(*)-crl.template" \
+                > $@
 
 msva.gnupghome/trustdb.gpg: authority/minimal.pgp client/cert.pgp
@@ -80 +106 @@
 
 
-setup.done: $(all_tokens) msva.gnupghome/trustdb.gpg
+setup.done: $(all_tokens) msva.gnupghome/trustdb.gpg client.uid
         mkdir -p logs cache outputs
         touch setup.done
@@ -86 +112 @@
 
 clean:
-        rm -rf server client authority logs cache outputs setup.done server.template msva.gnupghome
+        rm -rf server client authority logs cache outputs setup.done \
+        server.template imposter.template msva.gnupghome \
+        */*.pgp */*.gpg */*.gpg~ */*.pem */*.key authority.template \
+        client.template client.uid server.uid *.lock tests/*/*.pem
+        rmdir imposter rogueca || true
 
 .PHONY: all clean