[git] GnuPG - branch, master, updated. gnupg-2.1.17-38-g6170eb8

by Werner Koch cvs at cvs.gnupg.org
Thu Jan 5 20:45:54 CET 2017


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  6170eb809033c9d144abf3b1f31f8b936878cdd4 (commit)
       via  353f6ff37646ad4c24d309a495e6c6f41e5235e3 (commit)
      from  168c8c9d79a817c1f08a9ef976dab377f8c4c69e (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 6170eb809033c9d144abf3b1f31f8b936878cdd4
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 5 20:42:55 2017 +0100

    Silence two -Wlogical-op warnings.
    
    * common/tlv.c (parse_ber_header): Avoid compiler warning about a
    duplicate condition.
    * tools/gpgtar-create.c (pattern_valid_p): Likewise.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/tlv.c b/common/tlv.c
index 6813c58..0058b67 100644
--- a/common/tlv.c
+++ b/common/tlv.c
@@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
   else
     {
       unsigned long len = 0;
-      int count = c & 0x7f;
+      int count = (c & 0x7f);
 
-      if (count > sizeof (len) || count > sizeof (size_t))
+      if (count > (sizeof(len)<sizeof(size_t)?sizeof(len):sizeof(size_t)))
         return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
 
       for (; count; count--)
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index ef906a5..ffd239f 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -429,7 +429,11 @@ pattern_valid_p (const char *pattern)
     return 0;
   if (*pattern == '.' && pattern[1] == '.')
     return 0;
-  if (*pattern == '/' || *pattern == DIRSEP_C)
+  if (*pattern == '/'
+#ifdef HAVE_DOSISH_SYSTEM
+      || *pattern == '\\'
+#endif
+      )
     return 0; /* Absolute filenames are not supported.  */
 #ifdef HAVE_DRIVE_LETTERS
   if (((*pattern >= 'a' && *pattern <= 'z')

commit 353f6ff37646ad4c24d309a495e6c6f41e5235e3
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 5 20:25:16 2017 +0100

    doc: Mention gpgv in the description of gpg --verify.
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 469e548..4ea2cd2 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -255,6 +255,13 @@ out the actual signed data, but there are other pitfalls with this
 format as well.  It is suggested to avoid cleartext signatures in
 favor of detached signatures.
 
+Note: Sometimes the use of the @command{gpgv} tool is easier than
+using the full-fledged @command{gpg} with this option.  @command{gpgv}
+is designed to compare signed data against a list of trusted keys and
+returns with success only for a good signature.  It has its own manual
+page.
+
+
 @item --multifile
 @opindex multifile
 This modifies certain other commands to accept multiple files for

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

Summary of changes:
 common/tlv.c          | 4 ++--
 doc/gpg.texi          | 7 +++++++
 tools/gpgtar-create.c | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)


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




More information about the Gnupg-commits mailing list