security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-29 19:48:43 +01:00
Code Activity

scd: New getinfo subcommand "manufacturer"

Browse Source 
* scd/command.c (cmd_getinfo): Add subcommand "manufacturer".
* scd/app-openpgp.c (get_manufacturer): Rename to ...
(app_openpgp_manufacturer): this and make global.
--

Example:

  $ gpg-connect-agent 'scd getinfo manufacturer 42' /bye
  D Magrathea
  OK

Backported-from-master: a8cef7ebc2
This commit is contained in:
Werner Koch 2024-08-07 11:20:59 +02:00
parent dfc400a2d9
commit 1d0874c3d2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scd/app-common.h
View File

@ -286,6 +286,7 @@ gpg_error_t app_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
/*-- app-openpgp.c --*/ /*-- app-openpgp.c --*/
gpg_error_t app_select_openpgp (app_t app); gpg_error_t app_select_openpgp (app_t app);
const char *app_openpgp_manufacturer (unsigned int no);
/*-- app-nks.c --*/ /*-- app-nks.c --*/
gpg_error_t app_select_nks (app_t app); gpg_error_t app_select_nks (app_t app);

6
scd/app-openpgp.c
View File

@ -279,8 +279,8 @@ static gpg_error_t change_keyattr_from_string
/* Return the OpenPGP card manufacturer name. */ /* Return the OpenPGP card manufacturer name. */
static const char * const char *
get_manufacturer (unsigned int no) app_openpgp_manufacturer (unsigned int no)
{ {
/* Note: Make sure that there is no colon or linefeed in the string. */ /* Note: Make sure that there is no colon or linefeed in the string. */
switch (no) switch (no)
@ -1207,7 +1207,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
return send_status_printf return send_status_printf
(ctrl, table[idx].name, "%u %s", (ctrl, table[idx].name, "%u %s",
app->app_local->manufacturer, app->app_local->manufacturer,
get_manufacturer (app->app_local->manufacturer)); app_openpgp_manufacturer (app->app_local->manufacturer));
} }
if (table[idx].special == -9) if (table[idx].special == -9)
{ {

32
scd/command.c
View File

@ -1470,15 +1470,18 @@ static const char hlp_getinfo[] =
" application per line, fields delimited by colons,\n" " application per line, fields delimited by colons,\n"
" first field is the name.\n" " first field is the name.\n"
" card_list - Return a list of serial numbers of active cards,\n" " card_list - Return a list of serial numbers of active cards,\n"
" using a status response."; " using a status response."
" manufacturer NUMBER\n"
" - Return a description of the OpenPGP manufacturer id.\n";
static gpg_error_t static gpg_error_t
cmd_getinfo (assuan_context_t ctx, char *line) cmd_getinfo (assuan_context_t ctx, char *line)
{ {
int rc = 0; int rc = 0;
const char *s;
if (!strcmp (line, "version")) if (!strcmp (line, "version"))
{ {
const char *s = VERSION; s = VERSION;
rc = assuan_send_data (ctx, s, strlen (s)); rc = assuan_send_data (ctx, s, strlen (s));
} }
else if (!strcmp (line, "pid")) else if (!strcmp (line, "pid"))
@ -1490,7 +1493,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
} }
else if (!strcmp (line, "socket_name")) else if (!strcmp (line, "socket_name"))
{ {
const char *s = scd_get_socket_name (); s = scd_get_socket_name ();
if (s) if (s)
rc = assuan_send_data (ctx, s, strlen (s)); rc = assuan_send_data (ctx, s, strlen (s));
@ -1518,30 +1521,35 @@ cmd_getinfo (assuan_context_t ctx, char *line)
} }
else if (!strcmp (line, "reader_list")) else if (!strcmp (line, "reader_list"))
{ {
char *s = apdu_get_reader_list (); char *p = apdu_get_reader_list ();
if (s) if (p)
rc = pretty_assuan_send_data (ctx, s, strlen (s)); rc = pretty_assuan_send_data (ctx, p, strlen (p));
else else
rc = gpg_error (GPG_ERR_NO_DATA); rc = gpg_error (GPG_ERR_NO_DATA);
xfree (s); xfree (p);
} }
else if (!strcmp (line, "deny_admin")) else if (!strcmp (line, "deny_admin"))
rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0; rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
else if (!strcmp (line, "app_list")) else if (!strcmp (line, "app_list"))
{ {
char *s = get_supported_applications (); char *p = get_supported_applications ();
if (s) if (p)
rc = assuan_send_data (ctx, s, strlen (s)); rc = assuan_send_data (ctx, p, strlen (p));
else else
rc = 0; rc = 0;
xfree (s); xfree (p);
} }
else if (!strcmp (line, "card_list")) else if (!strcmp (line, "card_list"))
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
app_send_card_list (ctrl); app_send_card_list (ctrl);
} }
else if ((s=has_leading_keyword (line, "manufacturer")))
{
unsigned long ul = strtoul (s, NULL, 0);
s = app_openpgp_manufacturer (ul);
rc = assuan_send_data (ctx, s, strlen (s));
}
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;