gpgme/gpgme (ChangeLog gpgme.h passphrase.c)

[cvs user wk]

    Date: Thursday, June 2, 2005 @ 13:22:14
  Author: wk
    Path: /cvs/gpgme/gpgme/gpgme

Modified: ChangeLog gpgme.h passphrase.c

* 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".

* gpgme.h: Added status codes GPGME_STATUS_SIG_SUBPACKET,
GPGME_STATUS_NEED_PASSPHRASE_PIN, GPGME_STATUS_SC_OP_FAILURE,
GPGME_STATUS_SC_OP_SUCCESS, GPGME_STATUS_CARDCTRL,
GPGME_STATUS_BACKUP_KEY_CREATED.


--------------+
 ChangeLog    |   12 ++++++++++++
 gpgme.h      |    8 +++++++-
 passphrase.c |    7 +++++--
 3 files changed, 24 insertions(+), 3 deletions(-)


Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.402 gpgme/gpgme/ChangeLog:1.403
--- gpgme/gpgme/ChangeLog:1.402	Sat May 28 22:03:24 2005
+++ gpgme/gpgme/ChangeLog	Thu Jun  2 13:22:14 2005
@@ -1,3 +1,15 @@
+2005-06-02  Werner Koch  <wk at g10code.com>
+
+	* 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".
+
+	* gpgme.h: Added status codes GPGME_STATUS_SIG_SUBPACKET,
+	GPGME_STATUS_NEED_PASSPHRASE_PIN, GPGME_STATUS_SC_OP_FAILURE,
+	GPGME_STATUS_SC_OP_SUCCESS, GPGME_STATUS_CARDCTRL,
+	GPGME_STATUS_BACKUP_KEY_CREATED.
+
 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.154 gpgme/gpgme/gpgme.h:1.155
--- gpgme/gpgme/gpgme.h:1.154	Thu Apr 28 18:11:33 2005
+++ gpgme/gpgme/gpgme.h	Thu Jun  2 13:22:14 2005
@@ -397,7 +397,13 @@
     GPGME_STATUS_TRUNCATED,
     GPGME_STATUS_ERROR,
     GPGME_STATUS_NEWSIG,
-    GPGME_STATUS_REVKEYSIG
+    GPGME_STATUS_REVKEYSIG,
+    GPGME_STATUS_SIG_SUBPACKET,
+    GPGME_STATUS_NEED_PASSPHRASE_PIN,
+    GPGME_STATUS_SC_OP_FAILURE,
+    GPGME_STATUS_SC_OP_SUCCESS,
+    GPGME_STATUS_CARDCTRL,
+    GPGME_STATUS_BACKUP_KEY_CREATED
   }
 gpgme_status_code_t;
 
Index: gpgme/gpgme/passphrase.c
diff -u gpgme/gpgme/passphrase.c:1.24 gpgme/gpgme/passphrase.c:1.25
--- gpgme/gpgme/passphrase.c:1.24	Tue Dec  7 22:13:36 2004
+++ gpgme/gpgme/passphrase.c	Thu Jun  2 13:22:14 2005
@@ -1,6 +1,6 @@
 /* passphrase.c - Passphrase callback.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -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;