[git] GnuPG - branch, master, updated. gnupg-2.1.18-55-g64be8e1

[by Neal H. Walfield]

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  64be8e1e8607944687f3ae45ec64aa30bf4fdf6f (commit)
       via  e596b21f4b78dd27489e677699cc4ba648051b3f (commit)
      from  769272ba87f282a69e8d5f9bb27c86e6bec4496b (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 64be8e1e8607944687f3ae45ec64aa30bf4fdf6f
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Feb 2 14:47:34 2017 +0100

    tests: Improve description of test.
    
    * tests/openpgp/issue2929.scm: Improve description of test.
    
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/tests/openpgp/issue2929.scm b/tests/openpgp/issue2929.scm
index 44521bb..121103b 100644
--- a/tests/openpgp/issue2929.scm
+++ b/tests/openpgp/issue2929.scm
@@ -26,7 +26,7 @@
 ;; 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).")
+(info "Checking TOFU trust model with ultimately trusted keys (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 e596b21f4b78dd27489e677699cc4ba648051b3f
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Feb 2 14:43:15 2017 +0100

    Revert "Revert "tests: Add test demonstrating issue2929.""
    
    This reverts commit 59048b0f1aa77313573a1004cd3a9f02692a7521.

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

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

Summary of changes:
 tests/openpgp/Makefile.am                      |  3 ++-
 tests/openpgp/{issue2015.scm => issue2929.scm} | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)
 copy tests/openpgp/{issue2015.scm => issue2929.scm} (60%)
 mode change 100755 => 100644


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