gpgme-1-0-branch gpgme/gpgme (ChangeLog gpgme.h passphrase.c)

[cvs user wk]

    Date: Thursday, June 2, 2005 @ 13:28:12
  Author: wk
    Path: /cvs/gpgme/gpgme/gpgme
     Tag: gpgme-1-0-branch

Modified: ChangeLog gpgme.h passphrase.c

* gpgme.h: Add GPGME_STATUS_NEED_PASSPHRASE_PIN.
* passphrase.c (_gpgme_passphrase_status_handler): Take care of
GPGME_STATUS_NEED_PASSPHRASE_PIN.
(_gpgme_passphrase_command_handler_internal): Also act on the key
"passphrase.pin.ask".


--------------+
 ChangeLog    |    8 ++++++++
 gpgme.h      |    3 ++-
 passphrase.c |    5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)


Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.386.2.4 gpgme/gpgme/ChangeLog:1.386.2.5
--- gpgme/gpgme/ChangeLog:1.386.2.4	Sat May 28 22:10:37 2005
+++ gpgme/gpgme/ChangeLog	Thu Jun  2 13:28:11 2005
@@ -1,3 +1,11 @@
+2005-06-02  Werner Koch  <wk at g10code.com>
+
+	* gpgme.h: Add GPGME_STATUS_NEED_PASSPHRASE_PIN.
+	* passphrase.c (_gpgme_passphrase_status_handler): Take care of
+	GPGME_STATUS_NEED_PASSPHRASE_PIN.
+	(_gpgme_passphrase_command_handler_internal): Also act on the key
+	"passphrase.pin.ask".
+
 2005-05-28  Marcus Brinkmann  <marcus at g10code.de>
 
 	* data-user.c: Include <errno.h>.
Index: gpgme/gpgme/gpgme.h
diff -u gpgme/gpgme/gpgme.h:1.149.2.4 gpgme/gpgme/gpgme.h:1.149.2.5
--- gpgme/gpgme/gpgme.h:1.149.2.4	Sat May 28 22:10:37 2005
+++ gpgme/gpgme/gpgme.h	Thu Jun  2 13:28:11 2005
@@ -399,7 +399,8 @@
     GPGME_STATUS_TRUNCATED,
     GPGME_STATUS_ERROR,
     GPGME_STATUS_NEWSIG,
-    GPGME_STATUS_REVKEYSIG
+    GPGME_STATUS_REVKEYSIG,
+    GPGME_STATUS_NEED_PASSPHRASE_PIN
   }
 gpgme_status_code_t;
 
Index: gpgme/gpgme/passphrase.c
diff -u gpgme/gpgme/passphrase.c:1.23.2.1 gpgme/gpgme/passphrase.c:1.23.2.2
--- gpgme/gpgme/passphrase.c:1.23.2.1	Tue Dec  7 22:11:53 2004
+++ gpgme/gpgme/passphrase.c	Thu Jun  2 13:28:11 2005
@@ -90,6 +90,7 @@
 
     case GPGME_STATUS_NEED_PASSPHRASE:
     case GPGME_STATUS_NEED_PASSPHRASE_SYM:
+    case GPGME_STATUS_NEED_PASSPHRASE_PIN:
       if (opd->passphrase_info)
 	free (opd->passphrase_info);
       opd->passphrase_info = strdup (args);
@@ -133,7 +134,9 @@
   if (err)
     return err;
 
-  if (code == GPGME_STATUS_GET_HIDDEN && !strcmp (key, "passphrase.enter"))
+  if (code == GPGME_STATUS_GET_HIDDEN 
+      && (!strcmp (key, "passphrase.enter")
+          || !strcmp (key, "passphrase.pin.ask")))
     {
       if (processed)
 	*processed = 1;