aboutsummaryrefslogtreecommitdiffstats
path: root/agent/agent.h
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2020-01-13 07:43:53 +0000
committerNIIBE Yutaka <[email protected]>2020-01-13 07:43:53 +0000
commitc31266716dd69fee7bd64cf1e33d7631cd328e72 (patch)
treec79922a836ab7a893afd283c66d4d66d89120090 /agent/agent.h
parentscd: Implement direct access by KEYGRIP for GETATTR and READKEY. (diff)
downloadgnupg-c31266716dd69fee7bd64cf1e33d7631cd328e72.tar.gz
gnupg-c31266716dd69fee7bd64cf1e33d7631cd328e72.zip
agent: Extend agent_card_getattr with KEYGRIP.
* agent/agent.h (struct card_key_info_s): KEYGRIP null terminated. (agent_card_getattr): Add KEYGRIP argument. * agent/call-scd.c (agent_card_getattr): Handle KEYGRIP argument. (card_keyinfo_cb): Make KEYGRIP null terminated. * agent/command.c (cmd_readkey): Follow the change. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/agent.h')
-rw-r--r--agent/agent.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/agent/agent.h b/agent/agent.h
index b47cf4dc9..49cc2fd98 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -366,7 +366,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip);
struct card_key_info_s
{
struct card_key_info_s *next;
- char keygrip[40];
+ char keygrip[41];
char *serialno;
char *idstr;
};
@@ -613,7 +613,8 @@ gpg_error_t agent_card_writekey (ctrl_t ctrl, int force, const char *serialno,
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_getattr (ctrl_t ctrl, const char *name, char **result,
+ const char *keygrip);
int agent_card_scd (ctrl_t ctrl, const char *cmdline,
int (*getpin_cb)(void *, const char *,
const char *, char*, size_t),