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/skclist.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/skclist.c')
| -rw-r--r-- | g10/skclist.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/g10/skclist.c b/g10/skclist.c index a4dffe3d7..c9f7d126a 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -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); } |