Changeset 42829ae in mod_gnutls for test

Timestamp:

May 27, 2016, 8:12:43 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

9e56602

Parents:

298dc66

git-author:

Thomas Klute <thomas2.klute@…> (05/27/16 18:31:42)

git-committer:

Thomas Klute <thomas2.klute@…> (05/27/16 20:12:43)

Message:

Build pgpcrc through Automake, clean new GnuPG privkey files & directories

Location:

test

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• test_ca.mk (modified) (2 diffs)

test/.gitignore

@@ -21 +21 @@
 *.trs
 *.lock
+pgpcrc
+.deps

test/Makefile.am

@@ -33 +33 @@
 TESTS = $(dist_check_SCRIPTS)
 
+check_PROGRAMS = pgpcrc
+pgpcrc_SOURCES = pgpcrc.c
+
 # Identities in the miniature CA, server, and client environment for
 # the test suite
@@ -93 +96 @@
 # one day, so regenerating them is both fast and frequently
 # necessary.
-MOSTLYCLEANFILES += */*.pgp */*.gpg */*.gpg~ */gpg.conf authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
+MOSTLYCLEANFILES += */*.pgp */*.pgp.raw */*.gpg */*.gpg~ */gpg.conf \
+        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
 # GnuPG random pool, no need to regenerate on every build
 CLEANFILES += authority/random_seed
@@ -142 +146 @@
 
 mostlyclean-local: clean-softhsm2-db
+        -rmdir $(pgp_identities:=/private-keys-v1.d) || true
+if USE_MSVA
+        -rmdir $(msva_home)/private-keys-v1.d || true
+endif
 
 clean-local:
@@ -149 +157 @@
         -rmdir $(msva_home) || true
 endif
-        rm -f pgpcrc
 
 # Apache configuration and data files

test/test_ca.mk

@@ -3 +3 @@
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Thomas Klute <thomas2.klute@uni-dortmund.de>
-
-pgpcrc: pgpcrc.c
-        gcc -o $@ $<
 
 # General rules to set up a miniature CA & server & client environment
@@ -58 +55 @@
 # 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 $< 
+        certtool --outfile $@ --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $<
 
 # error case: certificates signed by rogue CA