]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
HitagS Improvements (#721)
[proxmark3-svn] / client / cmdhf14a.c
index 2d76f1098f69c7bf30b87f010d142fb4d08d6536..922a94492d9f2e1628fcdd7b9d885dac94bc4027 100644 (file)
@@ -136,6 +136,45 @@ int CmdHF14AList(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 
+int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+       SendCommand(&c);
+
+       UsbCommand resp;
+       WaitForResponse(CMD_ACK,&resp);
+       
+       memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+       uint64_t select_status = resp.arg[0];           // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+       
+       if(select_status == 0) {
+               PrintAndLog("E->iso14443a card select failed");
+               return 1;
+       }
+
+       if(select_status == 2) {
+               PrintAndLog("E->Card doesn't support iso14443-4 mode");
+               return 1;
+       }
+
+       if(select_status == 3) {
+               PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
+               PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
+               return 1;
+       }
+
+       PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
+       PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
+       PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
+       if(card->ats_len < 3) {                 // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+               PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
+               return 1;
+       }
+       PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
+       
+       return 0;
+}
+
 int CmdHF14AReader(const char *Cmd) {
        uint32_t cm = ISO14A_CONNECT;
        bool leaveSignalON = false;
 int CmdHF14AReader(const char *Cmd) {
        uint32_t cm = ISO14A_CONNECT;
        bool leaveSignalON = false;
@@ -648,20 +687,119 @@ void DropField() {
        SendCommand(&c);
 }
 
        SendCommand(&c);
 }
 
-int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+       static bool responseNum = false;
        uint16_t cmdc = 0;
        uint16_t cmdc = 0;
+       *dataoutlen = 0;
        
        if (activateField) {
        
        if (activateField) {
-               cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+               responseNum = false;
+               UsbCommand resp;
+
+               // Anticollision + SELECT card
+               UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_CLEAR_TRACE, 0, 0}};
+               SendCommand(&ca);
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+                       PrintAndLog("14aRAW ERROR: Proxmark connection timeout.");
+                       return 1;
+               }
+
+               // check result
+               if (resp.arg[0] == 0) {
+                       PrintAndLog("14aRAW ERROR: No card in field.");
+                       return 1;
+               }
+
+               if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+                       PrintAndLog("14aRAW ERROR: card not in iso14443-4. res=%d.", resp.arg[0]);
+                       return 1;
+               }
+
+               if (resp.arg[0] == 2) {         // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+                       // get ATS 
+                       UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}}; 
+                       uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+                       memcpy(cr.d.asBytes, rats, 2);
+                       SendCommand(&cr);
+                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+                               PrintAndLog("14aRAW ERROR: Proxmark connection timeout.");
+                               return 1;
+                       }
+                       
+                       if (resp.arg[0] <= 0) { // ats_len
+                               PrintAndLog("14aRAW ERROR: Can't get ATS.");
+                               return 1;
+                       }
+               }
        }
        }
+       
        if (leaveSignalON)
                cmdc |= ISO14A_NO_DISCONNECT;
 
        if (leaveSignalON)
                cmdc |= ISO14A_NO_DISCONNECT;
 
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+       uint8_t header[] = {0x0a | responseNum, 0x00};
+       responseNum ^= 1;
+       memcpy(c.d.asBytes, header, 2);
+       memcpy(&c.d.asBytes[2], datain, datainlen);
+       SendCommand(&c);
+       
+    uint8_t *recv;
+    UsbCommand resp;
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        recv = resp.d.asBytes;
+        int iLen = resp.arg[0];
+               
+        if(!iLen) {
+                       PrintAndLog("14aRAW ERROR: No card response.");
+            return 1;
+               }
+               
+               *dataoutlen = iLen - 2;
+               if (*dataoutlen < 0)
+                       *dataoutlen = 0;
+               
+               if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+                       PrintAndLog("14aRAW ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+                       return 2;
+               }
+               
+               if (recv[0] != header[0]) {
+                       PrintAndLog("14aRAW ERROR: iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+                       return 2;
+               }
+               
+               memcpy(dataout, &recv[2], *dataoutlen);
+               
+               // CRC Check
+               if (iLen == -1) {
+                       PrintAndLog("14aRAW ERROR: ISO 14443A CRC error.");
+                       return 3;
+               }
+
+
+    } else {
+        PrintAndLog("14aRAW ERROR: Reply timeout.");
+               return 4;
+    }
+       
+       return 0;
+}
+
+int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chaining) {
+       uint16_t cmdc = 0;
+
+       *chaining = false;
+       
+       if (activateField) {
+               cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+       }
+
        // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
        // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
        // here length USB_CMD_DATA_SIZE=512
        // timeout must be authomatically set by "get ATS"
        // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
        // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
        // here length USB_CMD_DATA_SIZE=512
        // timeout must be authomatically set by "get ATS"
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}}; 
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}}; 
        memcpy(c.d.asBytes, datain, datainlen);
        SendCommand(&c);
        
        memcpy(c.d.asBytes, datain, datainlen);
        SendCommand(&c);
        
@@ -675,6 +813,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
                }
                if (resp.arg[0] != 1) {
                        PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
                }
                if (resp.arg[0] != 1) {
                        PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
+                       DropField();
                        return 1;
                }
        }
                        return 1;
                }
        }
@@ -682,45 +821,76 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
+               uint8_t res = resp.arg[1];
                
                
-               *dataoutlen = iLen - 2;
-               if (*dataoutlen < 0)
-                       *dataoutlen = 0;
+               int dlen = iLen - 2;
+               if (dlen < 0)
+                       dlen = 0;
+               *dataoutlen += dlen;
                
                if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
                        PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
                        return 2;
                }
                
                
                if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
                        PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
                        return 2;
                }
                
-               memcpy(dataout, recv, *dataoutlen);
-               
         if(!iLen) {
                        PrintAndLog("APDU ERROR: No APDU response.");
             return 1;
                }
 
         if(!iLen) {
                        PrintAndLog("APDU ERROR: No APDU response.");
             return 1;
                }
 
+               // check apdu length
+               if (iLen < 4 && iLen >= 0) {
+                       PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
+                       return 2;
+               }
+               
                // check block TODO
                if (iLen == -2) {
                        PrintAndLog("APDU ERROR: Block type mismatch.");
                        return 2;
                }
                // check block TODO
                if (iLen == -2) {
                        PrintAndLog("APDU ERROR: Block type mismatch.");
                        return 2;
                }
+
+               memcpy(dataout, recv, dlen);
+               
+               // chaining
+               if ((res & 0x10) != 0) {
+                       *chaining = true;
+               }
                
                // CRC Check
                if (iLen == -1) {
                        PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
                        return 3;
                }
                
                // CRC Check
                if (iLen == -1) {
                        PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
                        return 3;
                }
-
-               // check apdu length
-               if (iLen < 4) {
-                       PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
-                       return 2;
-               }
-               
     } else {
         PrintAndLog("APDU ERROR: Reply timeout.");
                return 4;
     }
     } else {
         PrintAndLog("APDU ERROR: Reply timeout.");
                return 4;
     }
+
+       return 0;
+}
+
+
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+       *dataoutlen = 0;
+       bool chaining = false;
+       
+       int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+
+       while (chaining) {
+               // I-block with chaining
+               res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+               
+               if (res) {
+                       if (!leaveSignalON)
+                               DropField();
+                       
+                       return 100;
+               }
+       }       
+       
+       if (!leaveSignalON)
+               DropField();
        
        return 0;
 }
        
        return 0;
 }
@@ -742,7 +912,7 @@ int CmdHF14AAPDU(const char *cmd) {
                arg_lit0("sS",  "select",  "activate field and select card"),
                arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
                arg_lit0("tT",  "tlv",     "executes TLV decoder if it possible"),
                arg_lit0("sS",  "select",  "activate field and select card"),
                arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
                arg_lit0("tT",  "tlv",     "executes TLV decoder if it possible"),
-               arg_str1(NULL,  NULL,      "<APDU (hex)>", NULL),
+               arg_strx1(NULL, NULL,      "<APDU (hex)>", NULL),
                arg_param_end
        };
        CLIExecWithReturn(cmd, argtable, false);
                arg_param_end
        };
        CLIExecWithReturn(cmd, argtable, false);
@@ -751,7 +921,7 @@ int CmdHF14AAPDU(const char *cmd) {
        leaveSignalON = arg_get_lit(2);
        decodeTLV = arg_get_lit(3);
        // len = data + PCB(1b) + CRC(2b)
        leaveSignalON = arg_get_lit(2);
        decodeTLV = arg_get_lit(3);
        // len = data + PCB(1b) + CRC(2b)
-       CLIGetStrBLessWithReturn(4, data, &datalen, 1 + 2);
+       CLIGetHexBLessWithReturn(4, data, &datalen, 1 + 2);
 
 
        CLIParserFree();
 
 
        CLIParserFree();
@@ -807,7 +977,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                arg_int0("t",   "timeout", NULL, "timeout in ms"),
                arg_lit0("T",   "topaz",   "use Topaz protocol to send command"),
                arg_lit0("3",   NULL,      "ISO14443-3 select only (skip RATS)"),
                arg_int0("t",   "timeout", NULL, "timeout in ms"),
                arg_lit0("T",   "topaz",   "use Topaz protocol to send command"),
                arg_lit0("3",   NULL,      "ISO14443-3 select only (skip RATS)"),
-               arg_str1(NULL,  NULL,      "<data (hex)>", NULL),
+               arg_strx1(NULL, NULL,      "<data (hex)>", NULL),
                arg_param_end
        };
        // defaults
                arg_param_end
        };
        // defaults
Impressum, Datenschutz