[git] GnuPG - branch, master, updated. gnupg-2.1.13-148-g0342369

[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  0342369ce001b9dba04dc79e7a4eb66fbda278e7 (commit)
      from  fb14bf0a95e361b0991067e3aea2902d54be811d (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 0342369ce001b9dba04dc79e7a4eb66fbda278e7
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jul 14 14:00:37 2016 +0200

    gpg: Fix regression since 2.1 in --search-key with a fingerprint.
    
    * dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
    --
    
    pre-2.1 made sure that the 0x prefix was put before the fingerprint so
    that the search command works.  Actually --recv-key should be used
    with a fingerprint but some users are using --search-key, probably to
    use the interactive mode.
    
    GnuPG-bug-id: 2412
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 636eaf7..bcc1750 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -1207,12 +1207,16 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
       pattern = fprbuf;
       break;
     case KEYDB_SEARCH_MODE_FPR16:
-      bin2hex (desc.u.fpr, 16, fprbuf);
+      fprbuf[0] = '0';
+      fprbuf[1] = 'x';
+      bin2hex (desc.u.fpr, 16, fprbuf+2);
       pattern = fprbuf;
       break;
     case KEYDB_SEARCH_MODE_FPR20:
     case KEYDB_SEARCH_MODE_FPR:
-      bin2hex (desc.u.fpr, 20, fprbuf);
+      fprbuf[0] = '0';
+      fprbuf[1] = 'x';
+      bin2hex (desc.u.fpr, 20, fprbuf+2);
       pattern = fprbuf;
       break;
     default:

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

Summary of changes:
 dirmngr/ks-engine-hkp.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


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