From badc1cdae52bd434e5fac2e4275575afeccc2837 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 20 Jun 2017 10:46:52 +0200 Subject: [PATCH] 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 --- g10/keygen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/g10/keygen.c b/g10/keygen.c index 0dfed63a7..bfbed0ebd 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. */