diff options
| author | Werner Koch <wk@gnupg.org> | 2020-04-03 10:00:57 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-04-03 10:44:32 +0200 |
| commit | 15352b0eac335e7993fcd7720106a3a7d22caae1 (patch) | |
| tree | f8b1f0e63571b66ae293e19e3a291a2b71668e71 /g10/call-agent.h | |
| parent | scd:openpgp: New attribute "MANUFACTURER". (diff) | |
| download | gnupg2-15352b0eac335e7993fcd7720106a3a7d22caae1.tar.xz gnupg2-15352b0eac335e7993fcd7720106a3a7d22caae1.zip | |
gpg,card: Use the new MANUFACTURER attribute.
* tools/gpg-card.h (struct card_info_s): Add manufacturer fields.
* tools/card-call-scd.c (release_card_info): Release them.
(learn_status_cb): Parse MANUFACTURER attribute.
* tools/gpg-card.c (get_manufacturer): Remove.
(list_card): Use the new attribute.
* g10/call-agent.h (struct agent_card_info_s): Add manufacturer fields.
* g10/call-agent.c (agent_release_card_info): Release them.
(learn_status_cb): Parse MANUFACTURER attribute.
* g10/card-util.c (get_manufacturer): Remove.
(current_card_status): Use new attribute.
--
This does away with the duplicated OpenPGP vendor tables; they are now
at a better place (app-openpgp.c).
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/call-agent.h')
| -rw-r--r-- | g10/call-agent.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h index 8df5ff5a3..be5c777d4 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -32,6 +32,8 @@ struct agent_card_info_s int error; /* private. */ char *reader; /* Reader information. */ char *apptype; /* Malloced application type string. */ + unsigned int manufacturer_id; + char *manufacturer_name; /* malloced. */ char *serialno; /* malloced hex string. */ char *disp_name; /* malloced. */ char *disp_lang; /* malloced. */ |