mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* passphrase.c (ask_passphrase): Add optional promptid arg.
Changed all callers. * cardglue.c (pin_cb): Use it here, so the machine interface can tell whether the Admin PIN is requested. * cardglue.c (agent_scd_checkpin): New. * misc.c (openpgp_pk_algo_usage): Added AUTH usage. * app-openpgp.c (check_against_given_fingerprint): New. Factored out that code elsewhere. (do_check_pin): New. * card-util.c (card_edit): New command "passwd". Add logic to check the PIN in advance. (card_status): Add new args to return the serial number. Changed all callers.
This commit is contained in:
parent
b194ed0e0a
commit
441aeb85f2
14 changed files with 252 additions and 120 deletions
|
@ -1007,7 +1007,9 @@ passphrase_clear_cache ( u32 *keyid, int algo )
|
|||
* Ask for a passphrase and return that string.
|
||||
*/
|
||||
char *
|
||||
ask_passphrase (const char *description, const char *prompt, int *canceled)
|
||||
ask_passphrase (const char *description,
|
||||
const char *promptid,
|
||||
const char *prompt, int *canceled)
|
||||
{
|
||||
char *pw = NULL;
|
||||
|
||||
|
@ -1042,7 +1044,7 @@ ask_passphrase (const char *description, const char *prompt, int *canceled)
|
|||
pw = NULL;
|
||||
}
|
||||
else {
|
||||
pw = cpr_get_hidden("passphrase.ask",
|
||||
pw = cpr_get_hidden(promptid? promptid : "passphrase.ask",
|
||||
prompt?prompt : _("Enter passphrase: ") );
|
||||
tty_kill_prompt();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue