diff options
author | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
commit | bfbd80feb95fba36292cd9dab43016f17b1e6972 (patch) | |
tree | 9afbfd29e8aeb78fa34a1a49d8b8071554d4f593 /g10/server.c | |
parent | * options.skel: Make the example for force-v3-sigs match reality (it (diff) | |
download | gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.tar.gz gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.zip |
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes.
Doc updates.
Diffstat (limited to 'g10/server.c')
-rw-r--r-- | g10/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/server.c b/g10/server.c index f67a34677..1c534f1e5 100644 --- a/g10/server.c +++ b/g10/server.c @@ -231,7 +231,7 @@ cmd_recipient (assuan_context_t ctx, char *line) remusr = rcpts; */ - err = find_and_check_key (line, PUBKEY_USAGE_ENC, hidden, + err = find_and_check_key (ctrl, line, PUBKEY_USAGE_ENC, hidden, &ctrl->server_local->recplist); if (err) @@ -324,7 +324,7 @@ cmd_encrypt (assuan_context_t ctx, char *line) /* fixme: err = ctrl->audit? 0 : start_audit_session (ctrl);*/ - err = encrypt_crypt (inp_fd, NULL, NULL, 0, + err = encrypt_crypt (ctrl, inp_fd, NULL, NULL, 0, ctrl->server_local->recplist, out_fd); @@ -368,7 +368,7 @@ cmd_decrypt (assuan_context_t ctx, char *line) return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL); glo_ctrl.lasterr = 0; - err = decrypt_message_fd (inp_fd, out_fd); + err = decrypt_message_fd (ctrl, inp_fd, out_fd); if (!err) err = glo_ctrl.lasterr; |