diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/call-agent.c | 12 | ||||
| -rw-r--r-- | sm/gpgsm.c | 4 | ||||
| -rw-r--r-- | sm/gpgsm.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/sm/call-agent.c b/sm/call-agent.c index abce0387d..f2b7b6fba 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -1275,14 +1275,17 @@ learn_cb (void *opaque, const void *buffer, size_t length) return 0; } -/* Call the agent to learn about a smartcard */ + +/* Call the agent to learn about a smartcard. If SERIALNO is not NULL + * switch to the card with that s/n first. */ int -gpgsm_agent_learn (ctrl_t ctrl) +gpgsm_agent_learn (ctrl_t ctrl, const char *serialno) { int rc; struct learn_parm_s learn_parm; membuf_t data; size_t len; + char line[ASSUAN_LINELENGTH]; rc = start_agent (ctrl); if (rc) @@ -1297,7 +1300,10 @@ gpgsm_agent_learn (ctrl_t ctrl) learn_parm.ctrl = ctrl; learn_parm.ctx = agent_ctx; learn_parm.data = &data; - rc = assuan_transact (agent_ctx, "LEARN --send", + snprintf (line, sizeof line, "LEARN --send%s%s", + serialno? " -- ":"", + serialno? serialno:""); + rc = assuan_transact (agent_ctx, line, learn_cb, &learn_parm, NULL, NULL, learn_status_cb, &learn_parm); diff --git a/sm/gpgsm.c b/sm/gpgsm.c index b60f0bb46..4614938c2 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -2269,11 +2269,11 @@ main ( int argc, char **argv) case aLearnCard: - if (argc) + if (argc > 1) wrong_args ("--learn-card"); else { - int rc = gpgsm_agent_learn (&ctrl); + int rc = gpgsm_agent_learn (&ctrl, argc? *argv : NULL); if (rc) log_error ("error learning card: %s\n", gpg_strerror (rc)); } diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 78efe2379..4a4bd5ac4 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -539,7 +539,7 @@ int gpgsm_agent_istrusted (ctrl_t ctrl, ksba_cert_t cert, const char *hexfpr, struct rootca_flags_s *rootca_flags); int gpgsm_agent_havekey (ctrl_t ctrl, const char *hexkeygrip); int gpgsm_agent_marktrusted (ctrl_t ctrl, ksba_cert_t cert); -int gpgsm_agent_learn (ctrl_t ctrl); +int gpgsm_agent_learn (ctrl_t ctrl, const char *serialno); int gpgsm_agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc); gpg_error_t gpgsm_agent_get_confirmation (ctrl_t ctrl, const char *desc); gpg_error_t gpgsm_agent_send_nop (ctrl_t ctrl); |