diff options
author | Ingo Klöcker <[email protected]> | 2021-05-18 07:44:53 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2021-05-18 20:54:12 +0000 |
commit | aa6288140481bccc366e87fcdc6781dc82d0af31 (patch) | |
tree | cc5acdf899f5fc984136fa30114dec9382853751 | |
parent | po: In German always use "Passwort" instead of "Passphrase". (diff) | |
download | gnupg-aa6288140481bccc366e87fcdc6781dc82d0af31.tar.gz gnupg-aa6288140481bccc366e87fcdc6781dc82d0af31.zip |
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.
-rw-r--r-- | scd/app-p15.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scd/app-p15.c b/scd/app-p15.c index 90f6b4c99..3aa8122f5 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -4578,8 +4578,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name) else if (!strcmp (name, "MANUFACTURER")) { 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]", app->app_local->manufacturer_id, cardproduct2str (app->app_local->card_product)); |