[Pkg-gnupg-commit] [gnupg2] 65/185: gpg: Fix error handling.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 g10/keygen.c | 2 ++
 1 file changed, 2 insertions(+)

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.  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git