aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2007-04-28 16:04:44 +0000
committerMarcus Brinkmann <[email protected]>2007-04-28 16:04:44 +0000
commit1843485de950929bda325fd20a5250feec11a886 (patch)
treeabcf39723c169869dde39a5a08e93201ac3bb72c
parentImproved logging for error orginating from libgcrypt. (diff)
downloadgnupg-1843485de950929bda325fd20a5250feec11a886.tar.gz
gnupg-1843485de950929bda325fd20a5250feec11a886.zip
2007-04-26 Marcus Brinkmann <[email protected]>
* passphrase.c (passphrase_to_dek): Write missing passphrase status message in case of cancellation.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/passphrase.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c8ce0c951..c7a190e60 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-26 Marcus Brinkmann <[email protected]>
+
+ * passphrase.c (passphrase_to_dek): Write missing passphrase
+ status message in case of cancellation.
+
2007-04-16 Werner Koch <[email protected]>
* build-packet.c (mpi_write): Made buffer a bit larger. Reported
diff --git a/g10/passphrase.c b/g10/passphrase.c
index c3d42dc0e..122b251dd 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -627,6 +627,7 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo,
if (*canceled)
{
xfree (pw);
+ write_status( STATUS_MISSING_PASSPHRASE );
return NULL;
}
if (!pw)
@@ -642,6 +643,7 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo,
{
xfree (pw);
xfree (pw2);
+ write_status( STATUS_MISSING_PASSPHRASE );
return NULL;
}
if (!pw2)