[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-41-ga17d2d1

[by NIIBE Yutaka]

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, STABLE-BRANCH-2-2 has been updated
       via  a17d2d1f690ebe5d005b4589a5fe378b6487c657 (commit)
      from  6705ee42a4bd89eea3f959f75d3c14a69c1249a3 (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 a17d2d1f690ebe5d005b4589a5fe378b6487c657
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 2 17:41:50 2018 +0900

    g10: Fix filtering by PK->REQ_USAGE.
    
    * g10/getkey.c (get_pubkey_byfprint): Filter by PK->REQ_USAGE.
    
    --
    
    GnuPG-bug-id: 3844
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/getkey.c b/g10/getkey.c
index dabd052..0405d1d 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1810,6 +1810,8 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock,
       ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16
 	: KEYDB_SEARCH_MODE_FPR20;
       memcpy (ctx.items[0].u.fpr, fprint, fprint_len);
+      if (pk)
+        ctx.req_usage = pk->req_usage;
       rc = lookup (ctrl, &ctx, 0, &kb, &found_key);
       if (!rc && pk)
 	pk_from_block (pk, kb, found_key);

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

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


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