security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

scd: Handle canonical serialno and app specific serialno differently.

Browse source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-10-27 14:35:20 +09:00
parent 0f780b1aeb
commit e59d2b3632
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scd/command.c
View file

@ -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);