security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd:p15: Add support for CardOS 5.4

Browse Source 
* scd/app-p15.c (CARD_TYPE_CARDOS_54): New.
This commit is contained in:
Mario Haustein via Gnupg-devel 2023-11-28 23:09:21 +01:00 committed by Werner Koch
parent 5d651fc8fd
commit 812f988059
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scd/app-p15.c
View File

@ -74,6 +74,7 @@ typedef enum
CARD_TYPE_MICARDO, CARD_TYPE_MICARDO,
CARD_TYPE_CARDOS_50, CARD_TYPE_CARDOS_50,
CARD_TYPE_CARDOS_53, CARD_TYPE_CARDOS_53,
CARD_TYPE_CARDOS_54,
CARD_TYPE_AET, /* A.E.T. Europe JCOP card. */ CARD_TYPE_AET, /* A.E.T. Europe JCOP card. */
CARD_TYPE_BELPIC, /* Belgian eID card specs. */ CARD_TYPE_BELPIC, /* Belgian eID card specs. */
CARD_TYPE_STARCOS_32 CARD_TYPE_STARCOS_32
@ -124,6 +125,8 @@ static struct
CARD_TYPE_CARDOS_50 }, /* CardOS 5.0 */ CARD_TYPE_CARDOS_50 }, /* CardOS 5.0 */
{ 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x03\x16"), { 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x03\x16"),
CARD_TYPE_CARDOS_53 }, /* CardOS 5.3 */ CARD_TYPE_CARDOS_53 }, /* CardOS 5.3 */
{ 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x04\x11"),
CARD_TYPE_CARDOS_54 }, /* CardOS 5.4 */
{ 24, X("\x3b\xfe\x18\x00\x00\x80\x31\xfe\x45\x53\x43\x45" { 24, X("\x3b\xfe\x18\x00\x00\x80\x31\xfe\x45\x53\x43\x45"
"\x36\x30\x2d\x43\x44\x30\x38\x31\x2d\x6e\x46\xa9"), "\x36\x30\x2d\x43\x44\x30\x38\x31\x2d\x6e\x46\xa9"),
CARD_TYPE_AET }, CARD_TYPE_AET },
@ -135,9 +138,10 @@ static struct
#undef X #undef X
/* Macro to test for CardOS 5.0 and 5.3. */ /* Macro to test for CardOS 5.0, 5.3 and 5.4. */
#define IS_CARDOS_5(a) ((a)->app_local->card_type == CARD_TYPE_CARDOS_50 \ #define IS_CARDOS_5(a) ((a)->app_local->card_type == CARD_TYPE_CARDOS_50 \
|| (a)->app_local->card_type == CARD_TYPE_CARDOS_53) || (a)->app_local->card_type == CARD_TYPE_CARDOS_53 \
|| (a)->app_local->card_type == CARD_TYPE_CARDOS_54)
/* The default PKCS-15 home DF */ /* The default PKCS-15 home DF */
#define DEFAULT_HOME_DF 0x5015 #define DEFAULT_HOME_DF 0x5015
@ -542,6 +546,7 @@ cardtype2str (card_type_t cardtype)
case CARD_TYPE_MICARDO: return "Micardo"; case CARD_TYPE_MICARDO: return "Micardo";
case CARD_TYPE_CARDOS_50: return "CardOS 5.0"; case CARD_TYPE_CARDOS_50: return "CardOS 5.0";
case CARD_TYPE_CARDOS_53: return "CardOS 5.3"; case CARD_TYPE_CARDOS_53: return "CardOS 5.3";
case CARD_TYPE_CARDOS_54: return "CardOS 5.4";
case CARD_TYPE_BELPIC: return "Belgian eID"; case CARD_TYPE_BELPIC: return "Belgian eID";
case CARD_TYPE_AET: return "AET"; case CARD_TYPE_AET: return "AET";
case CARD_TYPE_STARCOS_32:return "STARCOS 3.2"; case CARD_TYPE_STARCOS_32:return "STARCOS 3.2";
@ -6302,6 +6307,7 @@ app_select_p15 (app_t app)
{ {
case CARD_TYPE_CARDOS_50: case CARD_TYPE_CARDOS_50:
case CARD_TYPE_CARDOS_53: case CARD_TYPE_CARDOS_53:
case CARD_TYPE_CARDOS_54:
direct = 1; direct = 1;
break; break;
case CARD_TYPE_AET: case CARD_TYPE_AET: