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

scd:p15: Use APP_CARD macro at some other places.

Browse Source 
--

This makes back porting easier.
This commit is contained in:
Werner Koch 2022-05-06 11:37:47 +02:00
parent adf387b3f1
commit 326f6fa166
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/app-p15.c
View File

@ -5074,15 +5074,15 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id
&& !ascii_strcasecmp (app->app_local->manufacturer_id, && !ascii_strcasecmp (app->app_local->manufacturer_id,
"Technology Nexus") "Technology Nexus")
&& app->serialno && app->serialnolen == 4+9 && APP_CARD(app)->serialno && APP_CARD(app)->serialnolen == 4+9
&& !memcmp (app->serialno, "\xff\x00\x00\xff", 4) && !memcmp (APP_CARD(app)->serialno, "\xff\x00\x00\xff", 4)
&& !any_control_or_space_mem (app->serialno + 4, 9)) && !any_control_or_space_mem (APP_CARD(app)->serialno + 4, 9))
{ {
/* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */ /* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */
serial = xtrymalloc (9+2+1); serial = xtrymalloc (9+2+1);
if (serial) if (serial)
{ {
s = app->serialno + 4; s = APP_CARD(app)->serialno + 4;
for (i=0; i < 4; i++) for (i=0; i < 4; i++)
serial[i] = *s++; serial[i] = *s++;
serial[i++] = ' '; serial[i++] = ' ';