[git] GnuPG - branch, master, updated. gnupg-2.1.15-12-gbdbd036

[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  bdbd03608b6f508ac4732f9986a046de8a85a311 (commit)
      from  0a5a854510fda6e6990938a3fca424df868fe676 (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 bdbd03608b6f508ac4732f9986a046de8a85a311
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 29 07:55:06 2016 +0200

    gpg: Make decryption of -R work w/o --try-secret-key or --default-key.
    
    * g10/getkey.c (enum_secret_keys): At state 3 enumerate the keys in all
    cases not just when --try-all-secrets is used.
    --
    
    Regression-due-to: 82b90eee100cf1c9680517059b2d35e295dd992a
    Reported-by: Carola Grunwald
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/getkey.c b/g10/getkey.c
index 90083ba..8b17598 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3620,17 +3620,14 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
                     c->state++;
                   break;
 
-                case 3: /* Init search context to try all keys.  */
-                  if (opt.try_all_secrets)
+                case 3: /* Init search context to enum all secret keys.  */
+                  err = getkey_bynames (&c->ctx, NULL, NULL, 1, &keyblock);
+                  if (err)
                     {
-                      err = getkey_bynames (&c->ctx, NULL, NULL, 1, &keyblock);
-                      if (err)
-                        {
-                          release_kbnode (keyblock);
-                          keyblock = NULL;
-                          getkey_end (c->ctx);
-                          c->ctx = NULL;
-                        }
+                      release_kbnode (keyblock);
+                      keyblock = NULL;
+                      getkey_end (c->ctx);
+                      c->ctx = NULL;
                     }
                   c->state++;
                   break;

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

Summary of changes:
 g10/getkey.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)


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