security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-15 08:23:24 +02:00
Code Activity

scd: Add "card_list" sub command for GETINFO.

Browse Source 
* scd/app.c (app_send_card_list): New.
* scd/command.c (cmd_getinfo): Fix "status" sub command.
Add "card_list" sub command.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-01-18 15:19:38 +09:00
parent a09f258b14
commit 8b1f24a29e
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scd/app-common.h
View File

@ -123,6 +123,7 @@ size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff);
/*-- app.c --*/ /*-- app.c --*/
app_t app_list_start (void); app_t app_list_start (void);
void app_list_finish (void); void app_list_finish (void);
void app_send_card_list (ctrl_t ctrl);
void app_dump_state (void); void app_dump_state (void);
void application_notify_card_reset (int slot); void application_notify_card_reset (int slot);

18
scd/app.c
View File

@ -1103,3 +1103,21 @@ app_list_finish (void)
{ {
npth_mutex_unlock (&app_list_lock); npth_mutex_unlock (&app_list_lock);
} }
void
app_send_card_list (ctrl_t ctrl)
{
app_t a;
char buf[65];
npth_mutex_lock (&app_list_lock);
for (a = app_top; a; a = a->next)
{
if (DIM (buf) < 2 * a->serialnolen + 1)
continue;
bin2hex (a->serialno, a->serialnolen, buf);
send_status_direct (ctrl, "SERIALNO", buf);
}
npth_mutex_unlock (&app_list_lock);
}

18
scd/command.c
View File

@ -1392,7 +1392,10 @@ static const char hlp_getinfo[] =
"\n" "\n"
"app_list - Return a list of supported applications. One\n" "app_list - Return a list of supported applications. One\n"
" application per line, fields delimited by colons,\n" " application per line, fields delimited by colons,\n"
" first field is the name."; " first field is the name.\n"
"\n"
"card_list - Return a list of serial numbers of active cards,\n"
" using a status response.";
static gpg_error_t static gpg_error_t
cmd_getinfo (assuan_context_t ctx, char *line) cmd_getinfo (assuan_context_t ctx, char *line)
{ {
@ -1422,10 +1425,11 @@ cmd_getinfo (assuan_context_t ctx, char *line)
else if (!strcmp (line, "status")) else if (!strcmp (line, "status"))
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
app_t app = ctrl->app_ctx; char flag;
char flag = 'r';
if (!ctrl->server_local->card_removed && app) if (open_card (ctrl))
flag = 'r';
else
flag = 'u'; flag = 'u';
rc = assuan_send_data (ctx, &flag, 1); rc = assuan_send_data (ctx, &flag, 1);
@ -1455,6 +1459,12 @@ cmd_getinfo (assuan_context_t ctx, char *line)
rc = 0; rc = 0;
xfree (s); xfree (s);
} }
else if (!strcmp (line, "card_list"))
{
ctrl_t ctrl = assuan_get_pointer (ctx);
app_send_card_list (ctrl);
}
else else
rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT"); rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
return rc; return rc;