Changeset 3306

Timestamp:

12/19/07 09:58:29 (13 months ago)

Author:

jps

Message:

support for Siemens CardOS V4.2C

Location:

trunk/src

Files:

• libopensc/card-cardos.c (modified) (3 diffs)
• libopensc/cards.h (modified) (1 diff)
• pkcs15init/pkcs15-cardos.c (modified) (1 diff)
• tools/cardos-info.c (modified) (2 diffs)

trunk/src/libopensc/card-cardos.c

@@ -94 +94 @@
                         sc_debug(card->ctx, "found cardos m4.01");
                         card->type = SC_CARD_TYPE_CARDOS_M4_01;
-                } else if (card->atr[11] >= 0x08) {
-                        sc_debug(card->ctx, "found cardos v4.3b or higher");
+                } else if (card->atr[11] == 0x08) {
+                        sc_debug(card->ctx, "found cardos v4.3b");
                         card->type = SC_CARD_TYPE_CARDOS_M4_3;
-                } else if (card->atr[11] >= 0x09) {
-                        sc_debug(card->ctx, "found cardos v4.2b or higher");
+                } else if (card->atr[11] == 0x09) {
+                        sc_debug(card->ctx, "found cardos v4.2b");
                         card->type = SC_CARD_TYPE_CARDOS_M4_2B;
+                } else if (card->atr[11] >= 0x0B) {
+                        sc_debug(card->ctx, "found cardos v4.2c or higher");
+                        card->type = SC_CARD_TYPE_CARDOS_M4_2C;
                 } else {
                         sc_debug(card->ctx, "found cardos m4.2");
@@ -168 +171 @@
                 card->caps |= SC_CARD_CAP_APDU_EXT;
         } else if (card->type == SC_CARD_TYPE_CARDOS_M4_3 
-                || card->type == SC_CARD_TYPE_CARDOS_M4_2B) {
+                || card->type == SC_CARD_TYPE_CARDOS_M4_2B
+                || card->type == SC_CARD_TYPE_CARDOS_M4_2C) {
                 card->caps |= SC_CARD_CAP_RSA_2048;
                 card->caps |= SC_CARD_CAP_APDU_EXT;
@@ -646 +650 @@
         } else if (card->type == SC_CARD_TYPE_CARDOS_M4_2 ||
                    card->type == SC_CARD_TYPE_CARDOS_M4_3 ||
-                   card->type == SC_CARD_TYPE_CARDOS_M4_2B) {
+                   card->type == SC_CARD_TYPE_CARDOS_M4_2B ||
+                   card->type == SC_CARD_TYPE_CARDOS_M4_2C) {
                 u8        sbuf[SC_MAX_APDU_BUFFER_SIZE];
                 size_t    len = sizeof(sbuf);

trunk/src/libopensc/cards.h

@@ -43 +43 @@
         SC_CARD_TYPE_CARDOS_M4_2,
         SC_CARD_TYPE_CARDOS_M4_3,
-        SC_CARD_TYPE_CARDOS_M4_2B, /* 4.2b is the latest after 4.3b */
+        SC_CARD_TYPE_CARDOS_M4_2B, /* 4.2b is after 4.3b */
+        SC_CARD_TYPE_CARDOS_M4_2C,
 
         /* flex/cyberflex drivers */

trunk/src/pkcs15init/pkcs15-cardos.c

@@ -623 +623 @@
 
         if (key_info->modulus_length > 1024 && (card->type == SC_CARD_TYPE_CARDOS_M4_2 ||
-            card->type == SC_CARD_TYPE_CARDOS_M4_3 ||card->type == SC_CARD_TYPE_CARDOS_M4_2B)) {
+            card->type == SC_CARD_TYPE_CARDOS_M4_3 ||card->type == SC_CARD_TYPE_CARDOS_M4_2B ||
+            card->type == SC_CARD_TYPE_CARDOS_M4_2C )) {
                 r = cardos_store_key_component(card, algorithm, key_id, pin_id, 0,
                         key->p.data, key->p.len, 0, 0);

trunk/src/tools/cardos-info.c

@@ -137 +137 @@
                 return 1;
         }
-
         printf("OS Version: %d.%d", apdu.resp[0], apdu.resp[1]);
         if (apdu.resp[0] == 0xc8 && apdu.resp[1] == 0x02) {
@@ -153 +152 @@
         } else if (apdu.resp[0] == 0xc8 && apdu.resp[1] == 0x09) {
                 printf(" (that's CardOS M4.2b)\n");
+        } else if (apdu.resp[0] == 0xc8 && apdu.resp[1] == 0x0B) {
+                printf(" (that's CardOS M4.2c)\n");     
         } else {
                 printf(" (unknown Version)\n");