security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +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
This commit is contained in:
Werner Koch 2024-08-05 16:19:32 +02:00
parent f1e3a23d9e
commit a8cef7ebc2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scd/app-common.h
View File

@ -335,6 +335,7 @@ card_t app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str,
/*-- 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

@ -290,8 +290,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)
@ -1273,7 +1273,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)
{ {

8
scd/command.c
View File

@ -1878,6 +1878,8 @@ static const char hlp_getinfo[] =
" cmd_has_option CMD OPT\n" " cmd_has_option CMD OPT\n"
" - Returns OK if command CMD has option OPT.\n" " - Returns OK if command CMD has option OPT.\n"
" dump_state - Dump internal infos to the log stream.\n" " dump_state - Dump internal infos to the log stream.\n"
" manufacturer NUMBER\n"
" - Return a description of the OpenPGP manufacturer id.\n"
" apdu_strerror NUMBER\n" " apdu_strerror NUMBER\n"
" - Return a string for a status word.\n"; " - Return a string for a status word.\n";
static gpg_error_t static gpg_error_t
@ -2004,6 +2006,12 @@ cmd_getinfo (assuan_context_t ctx, char *line)
{ {
rc = app_send_active_apps (NULL, ctrl); rc = app_send_active_apps (NULL, 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 if ((s=has_leading_keyword (line, "apdu_strerror"))) else if ((s=has_leading_keyword (line, "apdu_strerror")))
{ {
unsigned long ul = strtoul (s, NULL, 0); unsigned long ul = strtoul (s, NULL, 0);