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

gpg: Change API of agent_scd_serialno.

Browse source 
* g10/call-agent.c (agent_scd_serialno): Extend API to allow with
R_SERIALNO == NULL.
* g10/card-util.c (card_status): Use NULL for agent_scd_serialno.
(factory_reset): Likewise.
* g10/skclist.c (build_sk_list): Likewise.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-11-20 15:35:27 +09:00
parent cc8b99d18e
commit 777019faf0
3 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/skclist.c
View file

@ -131,17 +131,15 @@ build_sk_list (ctrl_t ctrl,
{
struct agent_card_info_s info;
PKT_public_key *pk;
char *serialno;
memset (&info, 0, sizeof(info));
pk = xmalloc_clear (sizeof *pk);
pk->req_usage = use;
/* Check if a card is available. If any, use the key as a hint. */
err = agent_scd_serialno (&serialno, NULL);
err = agent_scd_serialno (NULL, NULL);
if (!err)
{
xfree (serialno);
err = agent_scd_getattr ("KEY-FPR", &info);
if (err)
log_error ("error retrieving key fingerprint from card: %s\n",
@ -382,8 +380,6 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
/* Loop over the list of secret keys. */
do
{
char *serialno;
name = NULL;
keyblock = NULL;
switch (c->state)
@ -410,10 +406,9 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
case 3: /* Init list of card keys to try. */
c->card_keyinfo_list = NULL;
err = agent_scd_serialno (&serialno, NULL);
err = agent_scd_serialno (NULL, NULL);
if (!err)
{
xfree (serialno);
err = agent_scd_keyinfo (NULL, GCRY_PK_USAGE_ENCR,
&c->card_keyinfo_list);
}