aboutsummaryrefslogtreecommitdiffstats
path: root/agent/divert-scd.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-03-05 11:08:27 +0000
committerWerner Koch <[email protected]>2019-03-05 11:08:27 +0000
commitbcc89a6df24c79690436340f65c7ab13c65c2c45 (patch)
tree468d19f96c0648f2c210ad57009703596ac0e280 /agent/divert-scd.c
parentsm: Print Yubikey attestation extensions with --dump-cert. (diff)
downloadgnupg-bcc89a6df24c79690436340f65c7ab13c65c2c45.tar.gz
gnupg-bcc89a6df24c79690436340f65c7ab13c65c2c45.zip
agent: Minor change to the KEYTOCARD command.
* agent/command.c (cmd_keytocard): Make timestamp optional. Use modern parser function. * agent/call-scd.c (agent_card_writekey): Rename an arg and for clarity return gpg_error_t instead of int. * agent/divert-scd.c (divert_writekey): Ditto. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/divert-scd.c')
-rw-r--r--agent/divert-scd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 02fe5295a..e89c74a19 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -597,12 +597,13 @@ divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
return rc;
}
-int
+
+gpg_error_t
divert_writekey (ctrl_t ctrl, int force, const char *serialno,
- const char *id, const char *keydata, size_t keydatalen)
+ const char *keyref, const char *keydata, size_t keydatalen)
{
- return agent_card_writekey (ctrl, force, serialno, id, keydata, keydatalen,
- getpin_cb, ctrl);
+ return agent_card_writekey (ctrl, force, serialno, keyref,
+ keydata, keydatalen, getpin_cb, ctrl);
}
int