[git] GnuPG - branch, master, updated. gnupg-2.1.16-30-gbde4fdd

[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  bde4fddadc75ad6071e3fc6c0980905de14c03cb (commit)
       via  e062bc4da8062b822ee85096d9adfcbca8dcb56a (commit)
      from  f6728d13e8e544dbd4b9351ed981613e5504293f (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 bde4fddadc75ad6071e3fc6c0980905de14c03cb
Author: Justus Winter <justus at g10code.com>
Date:   Tue Nov 29 14:25:19 2016 +0100

    tests: Add test for '--decrypt --multifile'.
    
    * tests/openpgp/Makefile.am (XTESTS): Add new test.
    * tests/openpgp/decrypt-multifile.scm: New file.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 3cdf3d1..9eb69ee 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -47,6 +47,7 @@ XTESTS = \
 	version.scm \
 	mds.scm \
 	decrypt.scm \
+	decrypt-multifile.scm \
 	decrypt-dsa.scm \
 	sigs.scm \
 	sigs-dsa.scm \
diff --git a/tests/openpgp/decrypt-multifile.scm b/tests/openpgp/decrypt-multifile.scm
new file mode 100755
index 0000000..4efdf66
--- /dev/null
+++ b/tests/openpgp/decrypt-multifile.scm
@@ -0,0 +1,47 @@
+#!/usr/bin/env gpgscm
+
+;; Copyright (C) 2016 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-legacy-environment)
+
+(info "Checking decryption of supplied files using --multifile.")
+
+(define my-wd (getcwd))
+(define encrypted-files (map (lambda (name)
+			       (string-append name ".asc"))
+			     plain-files))
+
+(with-temporary-working-directory
+ ;; First, copy the files so that GnuPG writes the decrypted files here
+ ;; and not into the source directory.
+ (for-each (lambda (name)
+	     (file-copy (in-srcdir name) name))
+	   encrypted-files)
+
+ ;; Now decrypt all files.
+ (call-check `(, at gpg --decrypt --multifile , at encrypted-files))
+
+ ;; And verify the result.  Reference files are in our original
+ ;; working directory courtesy of setup-legacy-environment.
+ (for-each-p
+  "Verifying files:"
+  (lambda (name)
+    (unless (file=? (path-join my-wd name) name)
+	    (error "decrypted file differs")))
+  plain-files))

commit e062bc4da8062b822ee85096d9adfcbca8dcb56a
Author: Justus Winter <justus at g10code.com>
Date:   Tue Nov 29 13:31:38 2016 +0100

    gpgscm: Avoid truncating pointers.
    
    * tests/gpgscm/scheme.c (_alloc_cellseg): Avoid truncating pointers on
    systems where sizeof(unsigned long) < sizeof(void *).
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 8666548..30b5915 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -29,6 +29,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <stdint.h>
 #include <float.h>
 #include <ctype.h>
 
@@ -615,8 +616,8 @@ _alloc_cellseg(scheme *sc, size_t len, void **alloc, pointer *cells)
   *alloc = cp;
 
   /* adjust in TYPE_BITS-bit boundary */
-  if (((unsigned long) cp) % adj != 0)
-    cp = (void *) (adj * ((unsigned long) cp / adj + 1));
+  if (((uintptr_t) cp) % adj != 0)
+    cp = (void *) (adj * ((uintptr_t) cp / adj + 1));
 
   *cells = cp;
   return 0;

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

Summary of changes:
 tests/gpgscm/scheme.c                              |  5 ++--
 tests/openpgp/Makefile.am                          |  1 +
 tests/openpgp/{setup.scm => decrypt-multifile.scm} | 31 +++++++++++++++++-----
 3 files changed, 28 insertions(+), 9 deletions(-)
 copy tests/openpgp/{setup.scm => decrypt-multifile.scm} (50%)


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