2008-01-10 Marcus Brinkmann <marcus@g10code.de>

* gpg/pinentry: New file.
	* gpg/Makefile.am (DISTCLEANFILES, all-local): Add gpg-agent.conf
	(./gpg-agent.conf): New target.
	(EXTRA_DIST): Add pinentry.
This commit is contained in:
Marcus Brinkmann 2008-01-10 04:33:34 +00:00
parent e65bb3ef3c
commit 25dccf5897
3 changed files with 34 additions and 3 deletions

View File

@ -1,5 +1,10 @@
2008-01-10 Marcus Brinkmann <marcus@g10code.de> 2008-01-10 Marcus Brinkmann <marcus@g10code.de>
* 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. * gpg/t-gpgconf.c (main): Exit early if compiled without gpgconf.
2008-01-04 Marcus Brinkmann <marcus@g10code.de> 2008-01-04 Marcus Brinkmann <marcus@g10code.de>

View File

@ -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) t-encrypt-large t-file-name t-gpgconf $(tests_unix)
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf 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 \ 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 INCLUDES = -I$(top_srcdir)/gpgme
@ -55,7 +55,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey
clean-local: clean-local:
$(srcdir)/mkdemodirs --clean $(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 ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg
$(GPG) --homedir . --import $(srcdir)/pubdemo.asc $(GPG) --homedir . --import $(srcdir)/pubdemo.asc
@ -68,3 +68,7 @@ all-local: ./pubring.gpg ./gpg.conf
./gpg.conf: ./gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.
echo no-force-v3-sigs > ./gpg.conf 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

22
tests/gpg/pinentry Executable file
View File

@ -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