mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-02 12:01:32 +01:00
gpg: Add canceled status message.
* common/status.h (STATUS_CANCELED_BY_USER): New. * g10/passphrase.c (passphrase_to_dek): Send STATUS_CANCELED_BY_USER instead of STATUS_MISSING_PASSPHRASE when canceled is set. -- This is to prevent further pinentry tries when the pinentry is canceled by the user during symmetric decryption. Signed-off-by: Ben Kibbey <bjk@luxsci.net>
This commit is contained in:
parent
f808012ac2
commit
31e47dfad0
@ -37,6 +37,7 @@ enum
|
||||
STATUS_ENTER,
|
||||
STATUS_LEAVE,
|
||||
STATUS_ABORT,
|
||||
STATUS_CANCELED_BY_USER,
|
||||
|
||||
STATUS_GOODSIG,
|
||||
STATUS_BADSIG,
|
||||
|
@ -359,7 +359,7 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
|
||||
if (*canceled)
|
||||
{
|
||||
xfree (pw);
|
||||
write_status( STATUS_MISSING_PASSPHRASE );
|
||||
write_status( STATUS_CANCELED_BY_USER );
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user