diff options
| author | NIIBE Yutaka <[email protected]> | 2020-10-27 05:35:20 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-10-27 05:35:20 +0000 |
| commit | e59d2b3632d8c778bd2c4375a1c3ba9c786c4360 (patch) | |
| tree | b44212957ea9cad33df660801ff119837898df33 /scd/command.c | |
| parent | g10: Make call to agent_scd_serialno more robust. (diff) | |
| download | gnupg-e59d2b3632d8c778bd2c4375a1c3ba9c786c4360.tar.gz gnupg-e59d2b3632d8c778bd2c4375a1c3ba9c786c4360.zip | |
scd: Handle canonical serialno and app specific serialno differently.
* scd/app-common.h (card_get_serialno): Add IS_CANONICAL arg.
* scd/app.c (app_send_devinfo): Use app specific serialno.
(card_get_serialno): Support two different cases.
(app_get_serialno): Return app specific serialno.
(send_serialno_and_app_status): Return canonical serialno.
* scd/command.c (cmd_serialno): Return app specific serialno.
(cmd_learn): Return canonical serialno.
--
GnuPG-bug-id: 5100
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/command.c')
| -rw-r--r-- | scd/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scd/command.c b/scd/command.c index 56d422a4a..b8f7bccab 100644 --- a/scd/command.c +++ b/scd/command.c @@ -346,7 +346,7 @@ cmd_serialno (assuan_context_t ctx, char *line) return rc; } - serial = card_get_serialno (ctrl->card_ctx); + serial = card_get_serialno (ctrl->card_ctx, 0); if (!serial) return gpg_error (GPG_ERR_INV_VALUE); @@ -522,7 +522,7 @@ cmd_learn (assuan_context_t ctx, char *line) send_status_direct (ctrl, "READER", reader); /* No need to free the string of READER. */ - serial = card_get_serialno (ctrl->card_ctx); + serial = card_get_serialno (ctrl->card_ctx, 1); if (!serial) return gpg_error (GPG_ERR_INV_VALUE); |