security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

scd: Fix serial number detection for Yubikey 5. 

* scd/app.c (app_new_register): Handle serial number correctly.

--

GnuPG-bug-id: 5442
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Backported-from-master: c3a9ee0b65
This commit is contained in:
Werner Koch 2021-06-10 12:43:40 +02:00
parent c5d1e8fb5f
commit c2f02797cd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scd/app.c
View File

@ -299,17 +299,18 @@ app_new_register (int slot, ctrl_t ctrl, const char *name,
formfactor = (s0 && n == 1)? *s0 : 0;
s0 = find_tlv (buf+1, buflen-1, 0x02, &n); /* Serial */
if (s0 && n >= 4)
if (s0 && n <= 4)
{
app->serialno = xtrymalloc (3 + 1 + n);
app->serialno = xtrymalloc (3 + 1 + 4);
if (app->serialno)
{
app->serialnolen = 3 + 1 + n;
app->serialnolen = 3 + 1 + 4;
app->serialno[0] = 0xff;
app->serialno[1] = 0x02;
app->serialno[2] = 0x0;
app->serialno[3] = formfactor;
memcpy (app->serialno + 4, s0, n);
memset (app->serialno + 4, 0, 4 - n);
memcpy (app->serialno + 4 + 4 - n, s0, n);
err = app_munge_serialno (app);
}
}