diff options
| author | NIIBE Yutaka <[email protected]> | 2022-05-20 04:43:08 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2022-05-20 04:43:08 +0000 |
| commit | 6a37240cf279b27cddcc88de93098c55f3f26701 (patch) | |
| tree | 88914046b1b56d7695528b883f81e1eef9829ff8 /agent/pkdecrypt.c | |
| parent | agent: Pop up dialog window for confirmation, when specified so. (diff) | |
| download | gnupg-6a37240cf279b27cddcc88de93098c55f3f26701.tar.gz gnupg-6a37240cf279b27cddcc88de93098c55f3f26701.zip | |
agent: Move confirmation handling into findkey.c.
* agent/agent.h (divert_tpm2_pksign, divert_tpm2_pkdecrypt): Fix API.
(divert_pksign, divert_pkdecrypt): Likewise.
* agent/divert-scd.c (ask_for_card): Remove.
(divert_pksign, divert_pkdecrypt): Don't call ask_for_card.
* agent/divert-tpm2.c (divert_tpm2_pksign, divert_tpm2_pkdecrypt):
Remove DESC_TEXT argument.
* agent/findkey.c (prompt_for_card): New (was: ask_for_card).
(agent_key_from_file): Call prompt_for_card when it's a key
on card.
* agent/pkdecrypt.c (agent_pkdecrypt): Follow the change of API.
* agent/pksign.c (agent_pksign_do): Likewise.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/pkdecrypt.c')
| -rw-r--r-- | agent/pkdecrypt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index ba3d90469..82818f863 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -89,11 +89,11 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text, } if (agent_is_tpm2_key (s_skey)) - err = divert_tpm2_pkdecrypt (ctrl, desc_text, ciphertext, shadow_info, + err = divert_tpm2_pkdecrypt (ctrl, ciphertext, shadow_info, &buf, &len, r_padding); else - err = divert_pkdecrypt (ctrl, desc_text, ctrl->keygrip, ciphertext, - shadow_info, &buf, &len, r_padding); + err = divert_pkdecrypt (ctrl, ctrl->keygrip, ciphertext, + &buf, &len, r_padding); if (err) { log_error ("smartcard decryption failed: %s\n", gpg_strerror (err)); |