mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-22 19:58:29 +01:00
scd:p15: Fix logic for appending product name to MANUFACTURER.
* scd/app-p15.c (do_getattr): Append product name to MANUFACTURER if manufacturer_id does not already contain a bracket and if we have a product name.
This commit is contained in:
parent
c9859967c0
commit
aa62881404
@ -4578,8 +4578,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
|
|||||||
else if (!strcmp (name, "MANUFACTURER"))
|
else if (!strcmp (name, "MANUFACTURER"))
|
||||||
{
|
{
|
||||||
if (app->app_local->manufacturer_id
|
if (app->app_local->manufacturer_id
|
||||||
&& (app->app_local->card_product
|
&& !strchr (app->app_local->manufacturer_id, '[')
|
||||||
|| strchr (app->app_local->manufacturer_id, '[')))
|
&& app->app_local->card_product)
|
||||||
return send_status_printf (ctrl, "MANUFACTURER", "0 %s [%s]",
|
return send_status_printf (ctrl, "MANUFACTURER", "0 %s [%s]",
|
||||||
app->app_local->manufacturer_id,
|
app->app_local->manufacturer_id,
|
||||||
cardproduct2str (app->app_local->card_product));
|
cardproduct2str (app->app_local->card_product));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user