[git] GnuPG - branch, master, updated. gnupg-2.1.18-5-g5aafa56

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  5aafa56dffefe3fac55b9d0555c7c86e8a07f072 (commit)
       via  628ff843466b42309f850b8d65b13cf5f586b81f (commit)
      from  c0234462dce17766e1844ad7f6219eb5b5372a05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072
Author: Justus Winter <justus at g10code.com>
Date:   Tue Jan 24 14:28:36 2017 +0100

    tests: Add test demonstrating issue2929.
    
    * tests/openpgp/Makefile.am (XTESTS): Add new test.
    * tests/openpgp/issue2929.scm: New file.
    --
    This test demonstrates a problem with the TOFU trust model when a new
    key is created.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index d1dd449..5cab3d5 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -96,7 +96,8 @@ XTESTS = \
 	issue2015.scm \
 	issue2346.scm \
 	issue2417.scm \
-	issue2419.scm
+	issue2419.scm \
+	issue2929.scm
 
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
diff --git a/tests/openpgp/issue2929.scm b/tests/openpgp/issue2929.scm
new file mode 100644
index 0000000..44521bb
--- /dev/null
+++ b/tests/openpgp/issue2929.scm
@@ -0,0 +1,32 @@
+#!/usr/bin/env gpgscm
+
+;; Copyright (C) 2017 g10 Code GmbH
+;;
+;; This file is part of GnuPG.
+;;
+;; GnuPG is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GnuPG is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+(load (with-path "defs.scm"))
+(setup-environment)
+
+(catch (skip "Tofu not supported")
+       (call-check `(, at gpg --trust-model=tofu --list-config)))
+
+;; Redefine GPG without --always-trust and TOFU trust model.
+(define gpg `(,(tool 'gpg) --no-permission-warning --trust-model=tofu))
+
+(info "Checking key creation with TOFU trust model (issue2929).")
+(call-check `(, at gpg --quick-generate-key frob at example.org))
+(call-check `(, at gpg --sign gpg.conf))
+(call-check `(, at gpg --verify gpg.conf.gpg))

commit 628ff843466b42309f850b8d65b13cf5f586b81f
Author: Justus Winter <justus at g10code.com>
Date:   Tue Jan 24 14:20:36 2017 +0100

    tests: Enable gpgconf test.
    
    * tests/openpgp/Makefile.am (XTESTS): Re-add gpgconf.scm.
    --
    This partially reverts 25e029823813e190a18b601af60efcb1fb3b84af.
    
    That change was not sufficiently motivated, and our continuous
    integration server shows no recent distcheck failures.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 05341fb..d1dd449 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -92,15 +92,12 @@ XTESTS = \
 	quick-key-manipulation.scm \
 	key-selection.scm \
 	delete-keys.scm \
+	gpgconf.scm \
 	issue2015.scm \
 	issue2346.scm \
 	issue2417.scm \
 	issue2419.scm
 
-# Fixme: gpgconf.scm does not yet work with make distcheck.
-#	gpgconf.scm
-
-
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
 # the 'check' target.  For extra robustness, we merely define a

-----------------------------------------------------------------------

Summary of changes:
 tests/openpgp/Makefile.am                      |  8 +++-----
 tests/openpgp/{issue2417.scm => issue2929.scm} | 18 +++++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)
 copy tests/openpgp/{issue2417.scm => issue2929.scm} (61%)
 mode change 100755 => 100644


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org