[git] GnuPG - branch, master, updated. gnupg-2.1.21-65-gbadc1cd

[by Justus Winter]

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  badc1cdae52bd434e5fac2e4275575afeccc2837 (commit)
      from  3621dbe52584bc8b417f61b5370ebaa5598db956 (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 badc1cdae52bd434e5fac2e4275575afeccc2837
Author: Justus Winter <justus at g10code.com>
Date:   Tue Jun 20 10:46:52 2017 +0200

    gpg: Fix error handling.
    
    * g10/keygen.c (generate_subkeypair): Handle errors from pinentry.
    --
    
    Previously, when generating a subkey, gpg would ask for the passphrase
    of the primary key.  If that dialog is canceled, gpg would ask a
    second time for a passphrase to protect the new subkey.
    
    Fix this by handling the error.
    
    GnuPG-bug-id: 3212
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/keygen.c b/g10/keygen.c
index 0dfed63..bfbed0e 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -5041,6 +5041,8 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock, const char *algostr,
     err = agent_passwd (ctrl, hexgrip, desc, 1 /*=verify*/,
                         &cache_nonce, &passwd_nonce);
     xfree (desc);
+    if (err)
+      goto leave;
   }
 
   /* Start creation.  */

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

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


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