diff options
| author | Werner Koch <[email protected]> | 2004-04-26 13:29:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-04-26 13:29:09 +0000 |
| commit | 388218891b10daae07b07dee0ad0c10149413629 (patch) | |
| tree | 79fe2053efa6c2616076dd68a8e69781120bde87 /sm/gpgsm.c | |
| parent | 2004-04-26 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-388218891b10daae07b07dee0ad0c10149413629.tar.gz gnupg-388218891b10daae07b07dee0ad0c10149413629.zip | |
* call-agent.c (gpgsm_agent_pksign, gpgsm_agent_pkdecrypt)
(gpgsm_agent_genkey, gpgsm_agent_istrusted)
(gpgsm_agent_marktrusted, gpgsm_agent_havekey)
(gpgsm_agent_passwd): Add new arg CTRL and changed all callers.
(start_agent): New arg CTRL. Send progress item when starting a
new agent.
* sign.c (gpgsm_get_default_cert, get_default_signer): New arg
CTRL to be passed down to the agent function.
* decrypt.c (prepare_decryption): Ditto.
* certreqgen.c (proc_parameters, read_parameters): Ditto.
* certcheck.c (gpgsm_create_cms_signature): Ditto.
Diffstat (limited to '')
| -rw-r--r-- | sm/gpgsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 322f893a4..eff167367 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1496,7 +1496,7 @@ main ( int argc, char **argv) wrong_args ("--learn-card"); else { - int rc = gpgsm_agent_learn (); + int rc = gpgsm_agent_learn (&ctrl); if (rc) log_error ("error learning card: %s\n", gpg_strerror (rc)); } @@ -1519,7 +1519,7 @@ main ( int argc, char **argv) else { char *desc = gpgsm_format_keydesc (cert); - rc = gpgsm_agent_passwd (grip, desc); + rc = gpgsm_agent_passwd (&ctrl, grip, desc); xfree (desc); } if (rc) |