security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-13 00:09:51 +02:00
Code Activity

scd: Don't overwrite serialno for Yubikey.

Browse Source 
* scd/app-openpgp.c (app_select_openpgp): Keep ->serialno.

--

GnuPG-bug-id: 5100
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-10-23 15:19:53 +09:00
parent 41505f0ae5
commit 65c91e601a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scd/app-openpgp.c
View File

@ -6080,9 +6080,16 @@ app_select_openpgp (app_t app)
app->appversion |= buffer[7]; app->appversion |= buffer[7];
manufacturer = (buffer[8]<<8 | buffer[9]); manufacturer = (buffer[8]<<8 | buffer[9]);
xfree (app->card->serialno); /* For Yubikey, serialno is set in app.c, already. */
app->card->serialno = buffer; if (app->card->cardtype == CARDTYPE_YUBIKEY)
app->card->serialnolen = buflen; xfree (buffer);
else
{
xfree (app->card->serialno);
app->card->serialno = buffer;
app->card->serialnolen = buflen;
}
buffer = NULL; buffer = NULL;
app->app_local = xtrycalloc (1, sizeof *app->app_local); app->app_local = xtrycalloc (1, sizeof *app->app_local);
if (!app->app_local) if (!app->app_local)