From 25dccf5897948d28dd2f32f1ccba15edc124dc0b Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 10 Jan 2008 04:33:34 +0000 Subject: [PATCH] 2008-01-10 Marcus Brinkmann * gpg/pinentry: New file. * gpg/Makefile.am (DISTCLEANFILES, all-local): Add gpg-agent.conf (./gpg-agent.conf): New target. (EXTRA_DIST): Add pinentry. --- tests/ChangeLog | 5 +++++ tests/gpg/Makefile.am | 10 +++++++--- tests/gpg/pinentry | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100755 tests/gpg/pinentry diff --git a/tests/ChangeLog b/tests/ChangeLog index add52e71..3219aa78 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,10 @@ 2008-01-10 Marcus Brinkmann + * gpg/pinentry: New file. + * gpg/Makefile.am (DISTCLEANFILES, all-local): Add gpg-agent.conf + (./gpg-agent.conf): New target. + (EXTRA_DIST): Add pinentry. + * gpg/t-gpgconf.c (main): Exit early if compiled without gpgconf. 2008-01-04 Marcus Brinkmann diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 3ce6592d..af0fa5f1 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -38,10 +38,10 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ t-encrypt-large t-file-name t-gpgconf $(tests_unix) CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf -DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf +DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf gpg-agent.conf EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ - geheim.txt pubkey-1.asc seckey-1.asc + geheim.txt pubkey-1.asc seckey-1.asc pinentry INCLUDES = -I$(top_srcdir)/gpgme @@ -55,7 +55,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey clean-local: $(srcdir)/mkdemodirs --clean -all-local: ./pubring.gpg ./gpg.conf +all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg $(GPG) --homedir . --import $(srcdir)/pubdemo.asc @@ -68,3 +68,7 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg.conf: # This is required for t-sig-notations. echo no-force-v3-sigs > ./gpg.conf + +./gpg-agent.conf: +# This is required for gpg2, which does not support command fd. + echo pinentry-program $(abs_builddir)/pinentry > ./gpg-agent.conf diff --git a/tests/gpg/pinentry b/tests/gpg/pinentry new file mode 100755 index 00000000..3b997268 --- /dev/null +++ b/tests/gpg/pinentry @@ -0,0 +1,22 @@ +#! /bin/bash +# Dummy pinentry +# +# Copyright 2008 g10 Code GmbH +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + +echo OK Your orders please + +while read cmd; do + case $cmd in + GETPIN) echo D abc; echo OK;; + *) echo OK;; + esac +done