diff options
| author | Ben Kibbey <[email protected]> | 2020-11-05 05:51:06 +0000 |
|---|---|---|
| committer | Ben Kibbey <[email protected]> | 2020-11-05 19:19:15 +0000 |
| commit | 31e47dfad0f40e31e8b3113b933696e8e4105136 (patch) | |
| tree | 9f370c597f6f38680b95bdc4332208b305d95dce | |
| parent | scd: Use lock_slot for apdu_send_direct. (diff) | |
| download | gnupg-31e47dfad0f40e31e8b3113b933696e8e4105136.tar.gz gnupg-31e47dfad0f40e31e8b3113b933696e8e4105136.zip | |
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 <[email protected]>
| -rw-r--r-- | common/status.h | 1 | ||||
| -rw-r--r-- | g10/passphrase.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/status.h b/common/status.h index 477b29eaa..0c481d247 100644 --- a/common/status.h +++ b/common/status.h @@ -37,6 +37,7 @@ enum STATUS_ENTER, STATUS_LEAVE, STATUS_ABORT, + STATUS_CANCELED_BY_USER, STATUS_GOODSIG, STATUS_BADSIG, 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; } } |