[git] GnuPG - branch, master, updated. gnupg-2.1.15-24-g76304a9

[by Werner Koch]

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  76304a971fe507ea659b952932ea899463ab7166 (commit)
      from  371ae66e9d5c7524431773c4a479fcae1ea3b652 (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 76304a971fe507ea659b952932ea899463ab7166
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 31 08:37:51 2016 +0200

    gpg: Fix regression in gpgv's printing of the keyid.
    
    * g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
    --
    
    Debian-bug-id: 836144
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyid.c b/g10/keyid.c
index ea6ed5e..4380151 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -403,6 +403,8 @@ keystr (u32 *keyid)
   static char keyid_str[KEYID_STR_SIZE];
   int format = opt.keyid_format;
 
+  if (format == KF_DEFAULT)
+    format = KF_NONE;
   if (format == KF_NONE)
     format = KF_LONG;
 

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

Summary of changes:
 g10/keyid.c | 2 ++
 1 file changed, 2 insertions(+)


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