From: Werner Koch <wk@gnupg.org>
Date: Thu, 2 Jun 2005 11:22:14 +0000 (+0000)
Subject: * passphrase.c (_gpgme_passphrase_status_handler): Take care of
X-Git-Tag: gpgme-1.2.0@1385~321
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64794f2179e2d5554e4791776ac90449ac0b3868;p=gpgme.git

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

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index d99166f..0a2509d 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,15 @@
+2005-06-02  Werner Koch  <wk@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@g10code.de>
 
 	* data-user.c: Include <errno.h>.
diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index c3f5123..0708d37 100644
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -397,7 +397,13 @@ typedef enum
     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;
 
diff --git a/trunk/gpgme/passphrase.c b/trunk/gpgme/passphrase.c
index 921b69c..74214fb 100644
--- a/trunk/gpgme/passphrase.c
+++ b/trunk/gpgme/passphrase.c
@@ -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 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
 
     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 @@ _gpgme_passphrase_command_handler_internal (void *priv,
   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;