aboutsummaryrefslogtreecommitdiffstats
path: root/gpgme/passphrase.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-06-02 11:22:14 +0000
committerWerner Koch <[email protected]>2005-06-02 11:22:14 +0000
commite8ddf895a0346b70a31e3c2c9b203e794cdac889 (patch)
tree71b740cce90d5e6f4cf917bcbb42aea2b87a25f6 /gpgme/passphrase.c
parent2005-05-28 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-e8ddf895a0346b70a31e3c2c9b203e794cdac889.tar.gz
gpgme-e8ddf895a0346b70a31e3c2c9b203e794cdac889.zip
* 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.
Diffstat (limited to '')
-rw-r--r--gpgme/passphrase.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c
index 921b69c0..74214fb1 100644
--- a/gpgme/passphrase.c
+++ b/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;