1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

gpgsm: Extend --learn-card by an optional s/n argument.

* agent/command.c (cmd_learn): Allow for s/n argument.
* agent/learncard.c (agent_handle_learn): Ditto.
* agent/call-scd.c (agent_card_learn): Ditto.  Pass it on to scd.

* scd/command.c (cmd_switchcard): Factor most code out to ...
(switchcard_core): new.
(cmd_learn): Add option --demand to specify a s/n.

* sm/gpgsm.c (main): Allow a s/n argument for --learn-card.
--

This help Kleopatra to get a stable certificate listing.
GnuPG-bug-id: 7379
This commit is contained in:
Werner Koch 2025-03-17 17:37:08 +01:00
parent 5420c4ebde
commit f463586a96
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
9 changed files with 99 additions and 39 deletions

View file

@ -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);