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

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

10
agent/learncard.c
View file

@ -295,10 +295,14 @@ send_cert_back (ctrl_t ctrl, const char *id, void *assuan_context)
return 0;
}
/* Perform the learn operation. If ASSUAN_CONTEXT is not NULL and
SEND is true all new certificates are send back via Assuan. */
* SEND is true all new certificates are send back via Assuan. If
* DEMAND_SN is not NULL it has a string with the serial number of the
* card requested. */
int
agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force,
const char *demand_sn)
{
int rc;
struct kpinfo_cb_parm_s parm;
@ -328,7 +332,7 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
cparm.ctrl = ctrl;
/* Now gather all the available info. */
rc = agent_card_learn (ctrl, kpinfo_cb, &parm, certinfo_cb, &cparm,
rc = agent_card_learn (ctrl, demand_sn, kpinfo_cb, &parm, certinfo_cb, &cparm,
sinfo_cb, &sparm);
if (!rc && (parm.error || cparm.error || sparm.error))
rc = parm.error? parm.error : cparm.error? cparm.error : sparm.error;