From 31e47dfad0f40e31e8b3113b933696e8e4105136 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Wed, 4 Nov 2020 21:51:06 -0800 Subject: 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 --- g10/passphrase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/passphrase.c') diff --git a/g10/passphrase.c b/g10/passphrase.c index fe41ae034..50bb0e18d 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -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; } } -- cgit v1.2.3