diff options
| author | Werner Koch <[email protected]> | 2017-02-22 08:40:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-02-22 08:40:50 +0000 |
| commit | 78d875a0f83bc046279b951aea76cd74f3c44fd8 (patch) | |
| tree | 509767cdcabddb39dd9603813ff492d76f863929 /agent/pkdecrypt.c | |
| parent | tests: No spelling fix for test text. (diff) | |
| download | gnupg-78d875a0f83bc046279b951aea76cd74f3c44fd8.tar.gz gnupg-78d875a0f83bc046279b951aea76cd74f3c44fd8.zip | |
agent: Prepare to pass an additional parameter to the getpin callback.
* agent/call-scd.c (writekey_parm_s, inq_needpin_s): Merge into ...
(inq_needpin_parm_s): new struct. Add new field 'getpin_cb_desc'.
Change users to set all fields.
(inq_needpin): Pass GETPIN_CB_DESC to the GETPIN_CB.
(agent_card_pksign): Add arg 'desc_text' and change arg 'getpin_cb' to
take an additional arg 'desc_text'.
(agent_card_pkdecrypt): Ditto.
(agent_card_writekey): Change arg 'getpin_cb' to take an additional
arg 'desc_text'.
(agent_card_scd): Ditto.
* agent/divert-scd.c (getpin_cb): Add new arg 'desc_text'.
(divert_pksign): Add new arg 'desc_text' and pass is to
agent_card_pksign.
(divert_pkdecrypt): Add new arg 'desc_text' and pass is to
agent_card_pkdecrypt.
* agent/pkdecrypt.c (agent_pkdecrypt): Pass DESC_TEXT to
divert_pkdecrypt.
* agent/pksign.c (agent_pksign_do): Pass DESC_TEXT to
divert_pksign.
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/pkdecrypt.c')
| -rw-r--r-- | agent/pkdecrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index 3d0f5aac6..f1023b433 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -86,7 +86,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text, goto leave; } - rc = divert_pkdecrypt (ctrl, ciphertext, shadow_info, + rc = divert_pkdecrypt (ctrl, desc_text, ciphertext, shadow_info, &buf, &len, r_padding); if (rc) { |