aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2002-04-04 23:01:31 +0000
committerMarcus Brinkmann <[email protected]>2002-04-04 23:01:31 +0000
commitd30f21c528abd52f170668678aa3f8294f4aa273 (patch)
treeb45fede9edfbb07f69e89931bf4f790a0c668dd9
parent2002-04-05 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-d30f21c528abd52f170668678aa3f8294f4aa273.tar.gz
gpgme-d30f21c528abd52f170668678aa3f8294f4aa273.zip
2002-04-05 Marcus Brinkmann <marcus@g10code,de>
* gpgsm/Makefile.am (./trustlist.txt): Put more into this file to prevent use of gpg-agent. (./gpg-agent.conf): Remove target. (all-local): Remove ./gpg-agent.conf.
-rw-r--r--tests/ChangeLog7
-rw-r--r--tests/gpgsm/Makefile.am8
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 49180bcf..b2e9925b 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-05 Marcus Brinkmann <marcus@g10code,de>
+
+ * gpgsm/Makefile.am (./trustlist.txt): Put more into this file to
+ prevent use of gpg-agent.
+ (./gpg-agent.conf): Remove target.
+ (all-local): Remove ./gpg-agent.conf.
+
2002-04-05 Marcus Brinkmann <[email protected]>
* gpgsm/t-keylist.c (main): Use gpgme_engine_check_version instead
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 6985f8c6..47307767 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -35,14 +35,11 @@ noinst_PROGRAMS = $(TESTS)
key_id := 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
-all-local: ./pubring.kbx ./gpg-agent.conf ./gpgsm.conf ./private-keys-v1.d/$(key_id).key ./trustlist.txt
+all-local: ./pubring.kbx ./gpgsm.conf ./private-keys-v1.d/$(key_id).key ./trustlist.txt
./pubring.kbx: $(srcdir)/cert_g10code_test1.der
$(GPGSM) --homedir . --import $(srcdir)/cert_g10code_test1.der
-./gpg-agent.conf:
- echo batch > ./gpg-agent.conf
-
./gpgsm.conf:
echo disable-crl-checks > ./gpgsm.conf
@@ -52,3 +49,6 @@ all-local: ./pubring.kbx ./gpg-agent.conf ./gpgsm.conf ./private-keys-v1.d/$(key
./trustlist.txt:
echo $(key_id) > ./trustlist.txt
+ echo >> ./trustlist.txt
+ echo "# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE" >> ./trustlist.txt
+ echo "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S" >> ./trustlist.txt