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

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

10
g10/call-agent.c
View file

@ -1408,7 +1408,9 @@ agent_scd_serialno (char **r_serialno, const char *demand)
char *serialno = NULL;
char line[ASSUAN_LINELENGTH];
*r_serialno = NULL;
if (r_serialno)
*r_serialno = NULL;
err = start_agent (NULL, (1 | FLAG_FOR_CARD_SUPPRESS_ERRORS));
if (err)
return err;
@ -1427,7 +1429,11 @@ agent_scd_serialno (char **r_serialno, const char *demand)
return err;
}
*r_serialno = serialno;
if (r_serialno)
*r_serialno = serialno;
else
xfree (serialno);
return 0;
}