GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* passphrase.c (_gpgme_passphrase_status_handler): Take care of

Browse Source 
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.
This commit is contained in:
Werner Koch 2005-06-02 11:22:14 +00:00
parent 749ed3a258
commit e8ddf895a0
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gpgme/ChangeLog
View File

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

8
gpgme/gpgme.h
View File

@ -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;

7
gpgme/passphrase.c
View File

@ -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;