diff options
| author | NIIBE Yutaka <[email protected]> | 2020-11-20 06:35:27 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-11-20 08:19:45 +0000 |
| commit | 777019faf0b8f10a897c3ee477d35f9b29f02224 (patch) | |
| tree | 05874c988358062f7ab789c841ff5429ec645c4d /g10/call-agent.c | |
| parent | Fix the previous comment changes help doc string. (diff) | |
| download | gnupg-777019faf0b8f10a897c3ee477d35f9b29f02224.tar.gz gnupg-777019faf0b8f10a897c3ee477d35f9b29f02224.zip | |
gpg: Change API of agent_scd_serialno.
* 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 <[email protected]>
Diffstat (limited to 'g10/call-agent.c')
| -rw-r--r-- | g10/call-agent.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c index cc0da316b..9a3b43d9e 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -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; } |