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

15
g10/card-util.c
View file

@ -689,7 +689,6 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno)
int err;
strlist_t card_list, sl;
char *serialno0 = NULL;
char *serialno1 = NULL;
int all_cards = 0;
int any_card = 0;
@ -723,7 +722,7 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno)
tty_fprintf (fp, "\n");
any_card = 1;
err = agent_scd_serialno (&serialno1, sl->d);
err = agent_scd_serialno (NULL, sl->d);
if (err)
{
if (opt.verbose)
@ -733,19 +732,16 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno)
}
current_card_status (ctrl, fp, NULL, 0);
xfree (serialno1);
serialno1 = NULL;
if (!all_cards)
goto leave;
}
/* Select the original card again. */
err = agent_scd_serialno (&serialno1, serialno0);
err = agent_scd_serialno (NULL, serialno0);
leave:
xfree (serialno0);
xfree (serialno1);
free_strlist (card_list);
}
@ -2010,12 +2006,7 @@ factory_reset (void)
/* Then, connect the card again. */
if (!err)
{
char *serialno0;
err = agent_scd_serialno (&serialno0, NULL);
xfree (serialno0);
}
err = agent_scd_serialno (NULL, NULL);
leave:
if (locked)