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/decrypt.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 'sm/decrypt.c')
| -rw-r--r-- | sm/decrypt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sm/decrypt.c b/sm/decrypt.c index df0edc2ae..9a21cfb46 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -54,7 +54,7 @@ struct decrypt_filter_parm_s { /* Decrypt the session key and fill in the parm structure. The algo and the IV is expected to be already in PARM. */ static int -prepare_decryption (const char *hexkeygrip, const char *desc, +prepare_decryption (ctrl_t ctrl, const char *hexkeygrip, const char *desc, ksba_const_sexp_t enc_val, struct decrypt_filter_parm_s *parm) { @@ -62,7 +62,7 @@ prepare_decryption (const char *hexkeygrip, const char *desc, size_t n, seskeylen; int rc; - rc = gpgsm_agent_pkdecrypt (hexkeygrip, desc, enc_val, + rc = gpgsm_agent_pkdecrypt (ctrl, hexkeygrip, desc, enc_val, &seskey, &seskeylen); if (rc) { @@ -238,7 +238,7 @@ decrypt_filter (void *arg, /* Perform a decrypt operation. */ int -gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp) +gpgsm_decrypt (ctrl_t ctrl, int in_fd, FILE *out_fp) { int rc; Base64Context b64reader = NULL; @@ -424,7 +424,8 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp) recp); else { - rc = prepare_decryption (hexkeygrip, desc, enc_val, &dfparm); + rc = prepare_decryption (ctrl, + hexkeygrip, desc, enc_val, &dfparm); xfree (enc_val); if (rc) { |