From: Marcus Brinkmann Date: Thu, 4 Apr 2002 23:01:31 +0000 (+0000) Subject: 2002-04-05 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~1024 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5744802ed73cb4417d7ac57dbf29a5a8261e3cb9;p=gpgme.git 2002-04-05 Marcus Brinkmann * 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. --- diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog index 49180bc..b2e9925 100644 --- a/trunk/tests/ChangeLog +++ b/trunk/tests/ChangeLog @@ -1,3 +1,10 @@ +2002-04-05 Marcus Brinkmann + + * 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 * gpgsm/t-keylist.c (main): Use gpgme_engine_check_version instead diff --git a/trunk/tests/gpgsm/Makefile.am b/trunk/tests/gpgsm/Makefile.am index 6985f8c..4730776 100644 --- a/trunk/tests/gpgsm/Makefile.am +++ b/trunk/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