security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-14 08:13:25 +02:00
Code Activity

scd:p15: Make signing work for Nexus cards.

Browse Source 
* scd/app-p15.c (CARD_PRODUCT_NEXUS): New.
(read_p15_info): Detect Nexus cards.
(get_dispserialno): Use product_id instead of comparing the
manufacturer_id.
(do_sign): Handle Nexus like BELPIC.

(cherry picked from commit b83d86b988bbb05b25dba250a5f01b33b3dbb824)
This commit is contained in:
Werner Koch 2023-07-04 14:32:08 +02:00
parent f194986cd8
commit e1576eee04
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scd/app-p15.c
View File

@ -87,7 +87,8 @@ typedef enum
CARD_PRODUCT_UNKNOWN, CARD_PRODUCT_UNKNOWN,
CARD_PRODUCT_RSCS, /* Rohde&Schwarz Cybersecurity */ CARD_PRODUCT_RSCS, /* Rohde&Schwarz Cybersecurity */
CARD_PRODUCT_DTRUST, /* D-Trust GmbH (bundesdruckerei.de) */ CARD_PRODUCT_DTRUST, /* D-Trust GmbH (bundesdruckerei.de) */
CARD_PRODUCT_GENUA /* GeNUA mbH */ CARD_PRODUCT_GENUA, /* GeNUA mbH */
CARD_PRODUCT_NEXUS /* Technology Nexus */
} }
card_product_t; card_product_t;
@ -550,6 +551,7 @@ cardproduct2str (card_product_t cardproduct)
case CARD_PRODUCT_RSCS: return "R&S"; case CARD_PRODUCT_RSCS: return "R&S";
case CARD_PRODUCT_DTRUST: return "D-Trust"; case CARD_PRODUCT_DTRUST: return "D-Trust";
case CARD_PRODUCT_GENUA: return "GeNUA"; case CARD_PRODUCT_GENUA: return "GeNUA";
case CARD_PRODUCT_NEXUS: return "Nexus";
} }
return ""; return "";
} }
@ -3614,14 +3616,20 @@ read_p15_info (app_t app)
release_lists (app); release_lists (app);
if (IS_CARDOS_5 (app) /* Set a product type from the manufacturer_id. */
&& app->app_local->manufacturer_id if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id)
&& !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH"))
{ {
if (!app->app_local->card_product) const char *manu = app->app_local->manufacturer_id;
if (app->app_local->card_product)
; /* Already set. */
else if (!ascii_strcasecmp (manu, "GeNUA mbH"))
app->app_local->card_product = CARD_PRODUCT_GENUA; app->app_local->card_product = CARD_PRODUCT_GENUA;
else if (!ascii_strcasecmp (manu, "Technology Nexus"))
app->app_local->card_product = CARD_PRODUCT_NEXUS;
} }
/* Read the ODF so that we know the location of all directory /* Read the ODF so that we know the location of all directory
files. */ files. */
/* Fixme: We might need to get a non-standard ODF FID from TokenInfo. */ /* Fixme: We might need to get a non-standard ODF FID from TokenInfo. */
@ -5080,9 +5088,7 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
if (serial && (n=strlen (serial)) > 8) if (serial && (n=strlen (serial)) > 8)
memmove (serial, serial + n - 8, 9); memmove (serial, serial + n - 8, 9);
} }
else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id else if (app->app_local->card_product == CARD_PRODUCT_NEXUS
&& !ascii_strcasecmp (app->app_local->manufacturer_id,
"Technology Nexus")
&& APP_CARD(app)->serialno && APP_CARD(app)->serialnolen == 4+9 && APP_CARD(app)->serialno && APP_CARD(app)->serialnolen == 4+9
&& !memcmp (APP_CARD(app)->serialno, "\xff\x00\x00\xff", 4) && !memcmp (APP_CARD(app)->serialno, "\xff\x00\x00\xff", 4)
&& !any_control_or_space_mem (APP_CARD(app)->serialno + 4, 9)) && !any_control_or_space_mem (APP_CARD(app)->serialno + 4, 9))
@ -5616,11 +5622,12 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto leave; goto leave;
} }
if (app->app_local->card_type == CARD_TYPE_BELPIC) if (app->app_local->card_type == CARD_TYPE_BELPIC
|| app->app_local->card_product == CARD_PRODUCT_NEXUS)
{ {
/* This card wants only the plain hash w/o any prefix. */ /* The default for these cards is to use a plain hash. We
/* FIXME: We may want to remove this code because it is unlikely * assume that due to the used certificate the correct hash
* that such cards are still in use. */ * algo is used. */
memcpy (frame, indata, indatalen); memcpy (frame, indata, indatalen);
framelen = indatalen; framelen = indatalen;
} }