[git] GnuPG - branch, master, updated. gnupg-2.1.6-27-g328a6b6

[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  328a6b6459a5ce4a70b374262f221ada20c40878 (commit)
      from  23d8609f4b5ec3432323a676fd7ef225c0ef71a1 (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 328a6b6459a5ce4a70b374262f221ada20c40878
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 31 12:02:08 2015 +0200

    gpg: Fix endless loop for expired keys given by fpr.
    
    * g10/getkey.c (lookup): Disable keydb caching when continuing a
    search.
    --
    
    Caches are Fierce Creatures.
    
    Reported-by: Patrick Brunschwig

diff --git a/g10/getkey.c b/g10/getkey.c
index 14b912a..f02e8c2 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2621,6 +2621,11 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret)
       /* Release resources and continue search. */
       release_kbnode (ctx->keyblock);
       ctx->keyblock = NULL;
+      /* We need to disable the caching so that for an exact key search we
+         won't get the result back from the cache and thus end up in an
+         endless loop.  Disabling this here is sufficient because although
+         the result may have been cached, if won't be used then.  */
+      keydb_disable_caching (ctx->kr_handle);
     }
 
 found:

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

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


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