From 0801f49b0dc7102943f0e9fa51061f50f5708ca6 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 16 Jan 2017 10:33:08 +0900 Subject: agent: Ask specific SERIALNO for pksign/pkdecrypt. * agent/call-scd.c (agent_card_serialno): Add DEMAND argument. * agent/command-ssh.c (card_key_available): Follow the change. * agent/learncard.c (agent_handle_learn): Likewise. * agent/divert-scd.c (ask_for_card): Use DEMAND argument. Signed-off-by: NIIBE Yutaka --- agent/call-scd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'agent/call-scd.c') diff --git a/agent/call-scd.c b/agent/call-scd.c index ba59c1825..15a2ba529 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -679,16 +679,22 @@ get_serialno_cb (void *opaque, const char *line) /* Return the serial number of the card or an appropriate error. The serial number is returned as a hexstring. */ int -agent_card_serialno (ctrl_t ctrl, char **r_serialno) +agent_card_serialno (ctrl_t ctrl, char **r_serialno, const char *demand) { int rc; char *serialno = NULL; + char line[ASSUAN_LINELENGTH]; rc = start_scd (ctrl); if (rc) return rc; - rc = assuan_transact (ctrl->scd_local->ctx, "SERIALNO", + if (!demand) + strcpy (line, "SERIALNO"); + else + snprintf (line, DIM(line), "SERIALNO --demand=%s", demand); + + rc = assuan_transact (ctrl->scd_local->ctx, line, NULL, NULL, NULL, NULL, get_serialno_cb, &serialno); if (rc) -- cgit v1.2.3