security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg,card: Allow no version information of Yubikey.

Browse Source 
* g10/call-agent.c (learn_status_cb): Assume >= 2 when no version.
* tools/card-call-scd.c (learn_status_cb): Likewise.

--

GnuPG-bug-id: 5100
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-12-07 10:02:17 +09:00
parent 87d2c579cc
commit 1cd615afe3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/call-agent.c
View File

@ -531,7 +531,8 @@ learn_status_cb (void *opaque, const char *line)
xfree (parm->serialno); xfree (parm->serialno);
parm->serialno = store_serialno (line); parm->serialno = store_serialno (line);
parm->is_v2 = (strlen (parm->serialno) >= 16 parm->is_v2 = (strlen (parm->serialno) >= 16
&& xtoi_2 (parm->serialno+12) >= 2 ); && (xtoi_2 (parm->serialno+12) == 0 /* Yubikey */
|| xtoi_2 (parm->serialno+12) >= 2));
} }
else if (keywordlen == 7 && !memcmp (keyword, "APPTYPE", keywordlen)) else if (keywordlen == 7 && !memcmp (keyword, "APPTYPE", keywordlen))
{ {

3
tools/card-call-scd.c
View File

@ -823,7 +823,8 @@ learn_status_cb (void *opaque, const char *line)
xfree (parm->serialno); xfree (parm->serialno);
parm->serialno = store_serialno (line); parm->serialno = store_serialno (line);
parm->is_v2 = (strlen (parm->serialno) >= 16 parm->is_v2 = (strlen (parm->serialno) >= 16
&& xtoi_2 (parm->serialno+12) >= 2 ); && (xtoi_2 (parm->serialno+12) == 0 /* Yubikey */
|| xtoi_2 (parm->serialno+12) >= 2));
} }
else if (!memcmp (keyword, "CARDTYPE", keywordlen)) else if (!memcmp (keyword, "CARDTYPE", keywordlen))
{ {