Changeset 3318 for trunk/src/libopensc/card-atrust-acos.c

Timestamp:

02/01/08 14:31:02 (11 months ago)

Author:

ludovic.rousseau

Message:

Add support for the Austrian A-Trust ACOS card

Thanks to Franz Brandl for the patch
http://www.opensc-project.org/pipermail/opensc-devel/2008-February/010675.html

Files:

• trunk/src/libopensc/card-atrust-acos.c (modified) (6 diffs)

trunk/src/libopensc/card-atrust-acos.c

@@ -29 +29 @@
 /*****************************************************************************/
 
+#define ACOS_EMV_A03            "A-TRUST ACOS"
+#define ACOS_EMV_A05            "A-TRUST ACOS A05"
+
 static const char *atrust_acos_atrs[] = {
   "3B:BF:11:00:81:31:fe:45:45:50:41",
   "3B:BF:11:00:81:31:fe:45:4d:43:41",
+  "3B:BF:13:00:81:31:fe:45:45:50:41",
+  "3B:BF:13:00:81:31:fe:45:4d:43:41",
+  NULL
+};
+
+// sequence and number has to match atr table !
+static const char *atrust_acos_names[] = {
+  ACOS_EMV_A03,
+  ACOS_EMV_A03,
+  ACOS_EMV_A05,
+  ACOS_EMV_A05,
   NULL
 };
@@ -73 +87 @@
                 if (memcmp(card->atr, defatr, len) != 0)
                         continue;
+
                 match = 1;
+                card->name = atrust_acos_names[i];
+
                 break;
     }
@@ -90 +107 @@
                 return SC_ERROR_OUT_OF_MEMORY;
 
-        card->name = "A-TRUST ACOS";
         card->cla  = 0x00;
         card->drv_data = (void *)ex_data;
@@ -103 +119 @@
                 | SC_ALGORITHM_RSA_HASH_MD5_SHA1;
 
-        _sc_card_add_rsa_alg(card,1536, flags, 0x10001);
+        if (!strcmp(card->name, ACOS_EMV_A05))
+                flags |= SC_ALGORITHM_RSA_HASH_SHA256;
+
+        _sc_card_add_rsa_alg(card, 1536, flags, 0x10001);
 
         /* we need read_binary&friends with max 128 bytes per read */
@@ -508 +527 @@
 }
 
-
 /** atrust_acos_set_security_env
  * sets the security enviroment
@@ -726 +744 @@
                 r = sc_transmit_apdu(card, &apdu);
                 SC_TEST_RET(card->ctx, r, "APDU transmit failed");
+                if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00)
+                        SC_FUNC_RETURN(card->ctx, 4, sc_check_sw(card, apdu.sw1, apdu.sw2));
                 {
                         size_t len = apdu.resplen > outlen ? outlen : apdu.resplen;