[git] GnuPG - branch, master, updated. gnupg-2.1.10-88-g2c3e674

[by Daniel Kahn Gillmor]

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  2c3e67430d9b523c85c81ae562223fd51e3608cc (commit)
      from  c7389ae90fa4a70766400cc241ff6a45aa750324 (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 2c3e67430d9b523c85c81ae562223fd51e3608cc
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Dec 9 13:01:04 2015 -0500

    Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
    
    * g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
    default to KF_SHORT.
    (format_keyid): Default to KF_SHORT, not KF_0xLONG.
    
    --
    Without this fix, gpgv2 fails with:
    
    gpgv: Ohhhh jeeee: ... this is a bug (keyid.c:342:keystrlen)
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/keyid.c b/g10/keyid.c
index cb237ef..69acbe4 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -284,7 +284,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
   if (format == KF_DEFAULT)
     format = opt.keyid_format;
   if (format == KF_DEFAULT)
-    format = KF_0xLONG;
+    format = KF_SHORT;
 
   switch (format)
     {
@@ -324,7 +324,11 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
 size_t
 keystrlen(void)
 {
-  switch(opt.keyid_format)
+  int format = opt.keyid_format;
+  if (format == KF_DEFAULT)
+    format = KF_SHORT;
+
+  switch(format)
     {
     case KF_SHORT:
       return 8;

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

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


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