diff options
| author | Werner Koch <[email protected]> | 2019-03-05 11:08:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-03-05 11:08:27 +0000 |
| commit | bcc89a6df24c79690436340f65c7ab13c65c2c45 (patch) | |
| tree | 468d19f96c0648f2c210ad57009703596ac0e280 /agent/agent.h | |
| parent | sm: Print Yubikey attestation extensions with --dump-cert. (diff) | |
| download | gnupg-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/agent.h')
| -rw-r--r-- | agent/agent.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/agent/agent.h b/agent/agent.h index ee5a31eef..3a29dc817 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -548,8 +548,9 @@ int divert_pkdecrypt (ctrl_t ctrl, const char *desc_text, char **r_buf, size_t *r_len, int *r_padding); int divert_generic_cmd (ctrl_t ctrl, const char *cmdline, void *assuan_context); -int divert_writekey (ctrl_t ctrl, int force, const char *serialno, - const char *id, const char *keydata, size_t keydatalen); +gpg_error_t divert_writekey (ctrl_t ctrl, int force, const char *serialno, + const char *keyref, + const char *keydata, size_t keydatalen); /*-- call-scd.c --*/ @@ -586,12 +587,12 @@ int agent_card_pkdecrypt (ctrl_t ctrl, int agent_card_readcert (ctrl_t ctrl, const char *id, char **r_buf, size_t *r_buflen); int agent_card_readkey (ctrl_t ctrl, const char *id, unsigned char **r_buf); -int agent_card_writekey (ctrl_t ctrl, int force, const char *serialno, - const char *id, const char *keydata, - size_t keydatalen, - int (*getpin_cb)(void *, const char *, - const char *, char*, size_t), - void *getpin_cb_arg); +gpg_error_t agent_card_writekey (ctrl_t ctrl, int force, const char *serialno, + const char *keyref, + const char *keydata, size_t keydatalen, + int (*getpin_cb)(void *, const char *, + const char *, char*, size_t), + void *getpin_cb_arg); gpg_error_t agent_card_getattr (ctrl_t ctrl, const char *name, char **result); gpg_error_t agent_card_cardlist (ctrl_t ctrl, strlist_t *result); int agent_card_scd (ctrl_t ctrl, const char *cmdline, |