[svn] GnuPG - r4489 - trunk/g10

[svn author marcus]

Author: marcus
Date: 2007-04-28 18:04:44 +0200 (Sat, 28 Apr 2007)
New Revision: 4489

Modified:
   trunk/g10/ChangeLog
   trunk/g10/passphrase.c
Log:
2007-04-26  Marcus Brinkmann  <marcus at g10code.de>

	* passphrase.c (passphrase_to_dek): Write missing passphrase
	status message in case of cancellation.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-04-20 16:59:37 UTC (rev 4488)
+++ trunk/g10/ChangeLog	2007-04-28 16:04:44 UTC (rev 4489)
@@ -1,3 +1,8 @@
+2007-04-26  Marcus Brinkmann  <marcus at g10code.de>
+
+	* passphrase.c (passphrase_to_dek): Write missing passphrase
+	status message in case of cancellation.
+
 2007-04-16  Werner Koch  <wk at g10code.com>
 
 	* build-packet.c (mpi_write): Made buffer a bit larger.  Reported

Modified: trunk/g10/passphrase.c
===================================================================
--- trunk/g10/passphrase.c	2007-04-20 16:59:37 UTC (rev 4488)
+++ trunk/g10/passphrase.c	2007-04-28 16:04:44 UTC (rev 4489)
@@ -627,6 +627,7 @@
       if (*canceled)
         {
           xfree (pw);
+	  write_status( STATUS_MISSING_PASSPHRASE );
           return NULL;
         }
       if (!pw)
@@ -642,6 +643,7 @@
                 {
                   xfree (pw);
                   xfree (pw2);
+		  write_status( STATUS_MISSING_PASSPHRASE );
                   return NULL;
                 }
 	      if (!pw2)