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/divert-tpm2.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/divert-tpm2.c')
| -rw-r--r-- | agent/divert-tpm2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/agent/divert-tpm2.c b/agent/divert-tpm2.c index 0741c6847..4cae66218 100644 --- a/agent/divert-tpm2.c +++ b/agent/divert-tpm2.c @@ -13,12 +13,11 @@ #include "../common/sexp-parse.h" int -divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text, +divert_tpm2_pksign (ctrl_t ctrl, const unsigned char *digest, size_t digestlen, int algo, const unsigned char *shadow_info, unsigned char **r_sig, size_t *r_siglen) { - (void)desc_text; (void)algo; return agent_tpm2d_pksign(ctrl, digest, digestlen, shadow_info, r_sig, r_siglen); @@ -76,7 +75,7 @@ divert_tpm2_writekey (ctrl_t ctrl, const unsigned char *grip, } int -divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text, +divert_tpm2_pkdecrypt (ctrl_t ctrl, const unsigned char *cipher, const unsigned char *shadow_info, char **r_buf, size_t *r_len, int *r_padding) @@ -86,8 +85,6 @@ divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text, *r_padding = -1; - (void)desc_text; - s = cipher; if (*s != '(') return gpg_error (GPG_ERR_INV_SEXP); |