]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
add 14a apdu send framing (based on RRG repo PR86 by Merlokk) (#795)
authorpwpiwi <pwpiwi@users.noreply.github.com>
Tue, 12 Mar 2019 06:46:49 +0000 (07:46 +0100)
committerGitHub <noreply@github.com>
Tue, 12 Mar 2019 06:46:49 +0000 (07:46 +0100)
armsrc/epa.c
armsrc/iso14443a.c
armsrc/iso14443a.h
client/cmdhf14a.c
client/fido/fidocore.c
include/mifare.h

index 01aff30235bf3d2d02e5d231244e47378d5abba0..0e999e1ed34b0650559359e83c83d40203879c66 100644 (file)
@@ -116,7 +116,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
        switch(iso_type)
        {
                case 'a':
-                       return iso14_apdu(apdu, (uint16_t) length, response, NULL);
+                       return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
                        break;
                case 'b':
                        return iso14443b_apdu(apdu, length, response);
index 2fffe8373cfee3f02112b022438f3edc31d7f371..0247820ec81ea6dfb9ef0cc2d3d6cc573a9b98cf 100644 (file)
@@ -1938,13 +1938,16 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX 
 */    
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
        uint8_t parity[MAX_PARITY_SIZE];
        uint8_t real_cmd[cmd_len + 4];
        
        if (cmd_len) {
                // ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
                real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00) 
+               if (send_chaining) {
+                       real_cmd[0] |= 0x10;
+               }
                // put block number into the PCB
                real_cmd[0] |= iso14_pcb_blocknum;
                memcpy(real_cmd + 1, cmd, cmd_len);
@@ -2066,7 +2069,7 @@ void ReaderIso14443a(UsbCommand *c)
 
        if(param & ISO14A_APDU && !cantSELECT) {
                uint8_t res;
-               arg0 = iso14_apdu(cmd, len, buf, &res);
+               arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
                FpgaDisableTracing();
                LED_B_ON();
                cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
index 396b21008ecd474515e628b66fda5e1b1b72ba8a..6954a29b29e2b242901cf82b2e8776dc96e861c9 100644 (file)
@@ -49,7 +49,7 @@ extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res);
+extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 extern void iso14a_set_trigger(bool enable);
 extern void iso14a_set_timeout(uint32_t timeout);
index 2bf84d224364bc2d40772bcd738c564d76fd910e..9611a2d175153dab1b7b0f62f4e80a28e50f54f6 100644 (file)
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
-// 2011, 2017 Merlok
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
+// 2011, 2017 - 2019 Merlok
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
+// iso14a apdu input frame length
+static uint16_t frameLength = 0;
+uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
+
 int CmdHF14AList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list 14a' instead");
@@ -48,11 +52,11 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
 
        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
-       
+       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;
@@ -72,19 +76,19 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
        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
+       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;
-       
+
        CLIParserInit("hf 14a reader", "Executes ISO1443A anticollision-select group of commands.", NULL);
        void* argtable[] = {
                arg_param_begin,
@@ -97,7 +101,7 @@ int CmdHF14AReader(const char *Cmd) {
                CLIParserFree();
                return 0;
        }
-       
+
        leaveSignalON = arg_get_lit(1);
        if (arg_get_lit(2)) {
                cm = cm - ISO14A_CONNECT;
@@ -105,24 +109,24 @@ int CmdHF14AReader(const char *Cmd) {
        if (arg_get_lit(3)) {
                cm |= ISO14A_NO_RATS;
        }
-       
+
        CLIParserFree();
-       
+
        if (leaveSignalON)
-               cm |= ISO14A_NO_DISCONNECT; 
-       
+               cm |= ISO14A_NO_DISCONNECT;
+
        UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
        SendCommand(&c);
 
        if (ISO14A_CONNECT & cm) {
                UsbCommand resp;
                WaitForResponse(CMD_ACK,&resp);
-               
+
                iso14a_card_select_t card;
                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
-               
+               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("iso14443a card select failed");
                        return 1;
@@ -137,7 +141,7 @@ int CmdHF14AReader(const char *Cmd) {
                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
+               if(card.ats_len >= 3) {         // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
                        PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
                }
                if (leaveSignalON) {
@@ -148,7 +152,7 @@ int CmdHF14AReader(const char *Cmd) {
        if (!leaveSignalON) {
                PrintAndLog("Field dropped.");
        }
-       
+
        return 0;
 }
 
@@ -159,12 +163,12 @@ int CmdHF14AInfo(const char *Cmd)
 
        UsbCommand resp;
        WaitForResponse(CMD_ACK,&resp);
-       
+
        iso14a_card_select_t card;
        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
-       
+       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) {
                if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
                // disconnect
@@ -192,7 +196,7 @@ int CmdHF14AInfo(const char *Cmd)
 
        bool isMifareClassic = true;
        switch (card.sak) {
-               case 0x00: 
+               case 0x00:
                        isMifareClassic = false;
 
                        //***************************************test****************
@@ -201,7 +205,7 @@ int CmdHF14AInfo(const char *Cmd)
                        c.arg[1] = 0;
                        c.arg[2] = 0;
                        SendCommand(&c);
-                       
+
                        uint32_t tagT = GetHF14AMfU_Type();
                        ul_print_type(tagT, 0);
 
@@ -214,11 +218,11 @@ int CmdHF14AInfo(const char *Cmd)
 
                        UsbCommand resp;
                        WaitForResponse(CMD_ACK,&resp);
-                       
+
                        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-                       select_status = resp.arg[0];            // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
-                       
+                       select_status = resp.arg[0];        // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+
                        if(select_status == 0) {
                                //PrintAndLog("iso14443a card select failed");
                                // disconnect
@@ -246,7 +250,7 @@ int CmdHF14AInfo(const char *Cmd)
                                // UL-EV1, size, check version[6] == 0x0b (smaller)  0x0b * 4 == 48
                                case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);break;
                                case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
-                               case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;    
+                               case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
                        }
                        */
                        break;
@@ -281,12 +285,12 @@ int CmdHF14AInfo(const char *Cmd)
                memcpy(c.d.asBytes, rats, 2);
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
-               
-           memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
-               card.ats_len = resp.arg[0];                             // note: ats_len includes CRC Bytes
-       } 
 
-       if(card.ats_len >= 3) {                 // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+               memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
+               card.ats_len = resp.arg[0];             // note: ats_len includes CRC Bytes
+       }
+
+       if(card.ats_len >= 3) {         // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
                bool ta1 = 0, tb1 = 0, tc1 = 0;
                int pos;
 
@@ -298,8 +302,8 @@ int CmdHF14AInfo(const char *Cmd)
                if (card.ats[0] != card.ats_len - 2) {
                        PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
                }
-               
-               if (card.ats[0] > 1) {          // there is a format byte (T0)
+
+               if (card.ats[0] > 1) {      // there is a format byte (T0)
                        ta1 = (card.ats[1] & 0x10) == 0x10;
                        tb1 = (card.ats[1] & 0x20) == 0x20;
                        tc1 = (card.ats[1] & 0x40) == 0x40;
@@ -308,10 +312,7 @@ int CmdHF14AInfo(const char *Cmd)
                                        "TC1 is%s present, FSCI is %d (FSC = %ld)",
                                (ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
                                fsci,
-                               fsci < 5 ? (fsci - 2) * 8 : 
-                                       fsci < 8 ? (fsci - 3) * 32 :
-                                       fsci == 8 ? 256 :
-                                       -1
+                               fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
                                );
                }
                pos = 2;
@@ -357,7 +358,7 @@ int CmdHF14AInfo(const char *Cmd)
                                } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
                                        tip = "-> MIFARE Plus S 2K or 4K";
                                }
-                       } 
+                       }
                        PrintAndLog("       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
                        if (card.ats[pos] == 0xC1) {
                                PrintAndLog("               c1 -> Mifare or (multiple) virtual cards of various type");
@@ -424,23 +425,23 @@ int CmdHF14AInfo(const char *Cmd)
                PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");
        }
 
-       
+
        // try to see if card responses to "chinese magic backdoor" commands.
        (void)mfCIdentify();
-       
-       if (isMifareClassic) {          
+
+       if (isMifareClassic) {
                switch(DetectClassicPrng()) {
                case 0:
-                       PrintAndLog("Prng detection: HARDENED (hardnested)");           
+                       PrintAndLog("Prng detection: HARDENED (hardnested)");
                        break;
                case 1:
                        PrintAndLog("Prng detection: WEAK");
                        break;
                default:
-                       PrintAndLog("Prng detection error.");           
+                       PrintAndLog("Prng detection error.");
                }
        }
-       
+
        return select_status;
 }
 
@@ -459,7 +460,7 @@ int CmdHF14ACUIDs(const char *Cmd)
                // execute anticollision procedure
                UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
                SendCommand(&c);
-    
+
                UsbCommand resp;
                WaitForResponse(CMD_ACK,&resp);
 
@@ -486,10 +487,10 @@ int CmdHF14ACUIDs(const char *Cmd)
 int CmdHF14ASim(const char *Cmd)
 {
        UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{0,0,0}};
-       
+
        // Retrieve the tag type
        uint8_t tagtype = param_get8ex(Cmd,0,0,10);
-       
+
        // When no argument was given, just print help message
        if (tagtype == 0) {
                PrintAndLog("");
@@ -500,15 +501,15 @@ int CmdHF14ASim(const char *Cmd)
                PrintAndLog("           2 = MIFARE Ultralight");
                PrintAndLog("           3 = MIFARE Desfire");
                PrintAndLog("           4 = ISO/IEC 14443-4");
-               PrintAndLog("           5 = MIFARE Tnp3xxx");           
+               PrintAndLog("           5 = MIFARE Tnp3xxx");
                PrintAndLog("");
                return 1;
        }
-       
+
        // Store the tag type
        c.arg[0] = tagtype;
-       
-       // Retrieve the full 4 or 7 byte long uid 
+
+       // Retrieve the full 4 or 7 byte long uid
        uint64_t long_uid = param_get64ex(Cmd,1,0,16);
 
        // Are we handling the (optional) second part uid?
@@ -531,7 +532,7 @@ int CmdHF14ASim(const char *Cmd)
        if (c.arg[1] == 0) {
                PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
        }
-       
+
        switch (c.arg[0]) {
                case 1: {
                        PrintAndLog("Emulating ISO/IEC 14443-3 type A tag with 4 byte UID");
@@ -547,25 +548,26 @@ int CmdHF14ASim(const char *Cmd)
 
                        return 1;
                } break;
-       }       
+       }
 */
 /*
   unsigned int hi = 0, lo = 0;
   int n = 0, i = 0;
   while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-    hi= (hi << 4) | (lo >> 28);
-    lo= (lo << 4) | (n & 0xf);
+       hi= (hi << 4) | (lo >> 28);
+       lo= (lo << 4) | (n & 0xf);
   }
 */
-//     UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
+//  UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
 //  PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
   SendCommand(&c);
   return 0;
 }
 
+
 int CmdHF14ASnoop(const char *Cmd) {
        int param = 0;
-       
+
        uint8_t ctmp = param_getchar(Cmd, 0) ;
        if (ctmp == 'h' || ctmp == 'H') {
                PrintAndLog("It get data from the field and saves it into command buffer.");
@@ -575,8 +577,8 @@ int CmdHF14ASnoop(const char *Cmd) {
                PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
                PrintAndLog("sample: hf 14a snoop c r");
                return 0;
-       }       
-       
+       }
+
        for (int i = 0; i < 2; i++) {
                ctmp = param_getchar(Cmd, i);
                if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
@@ -588,16 +590,18 @@ int CmdHF14ASnoop(const char *Cmd) {
        return 0;
 }
 
+
 void DropField() {
-       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}}; 
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
 }
 
+
 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;
        *dataoutlen = 0;
-       
+
        if (activateField) {
                responseNum = false;
                UsbCommand resp;
@@ -621,9 +625,9 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                        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}}; 
+               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);
@@ -631,52 +635,52 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                                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;
 
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+       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) {
+
+       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;
+                       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.");
@@ -684,72 +688,140 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                }
 
 
-    } else {
-        PrintAndLog("14aRAW ERROR: Reply timeout.");
+       } 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;
-       
+static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
+       UsbCommand resp;
+
+       frameLength = 0;
+
+       if (card)
+               memset(card, 0, sizeof(iso14a_card_select_t));
+
+       DropField();
+
+       // Anticollision + SELECT card
+       UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       SendCommand(&ca);
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+               PrintAndLogEx(ERR, "Proxmark connection timeout.");
+               return 1;
+       }
+
+       // check result
+       if (resp.arg[0] == 0) {
+               PrintAndLogEx(ERR, "No card in field.");
+               return 1;
+       }
+
+       if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+               PrintAndLogEx(ERR, "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
+               // try to get ATS although SAK indicated that it is not ISO14443-4 compliant
+               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)) {
+                       PrintAndLogEx(ERR, "Proxmark connection timeout.");
+                       return 1;
+               }
+
+               if (resp.arg[0] <= 0) { // ats_len
+                       PrintAndLogEx(ERR, "Can't get ATS.");
+                       return 1;
+               }
+       }
+
+       // get frame length from ATS
+       iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
+       if (vcard->ats_len > 1) {
+               uint8_t fsci = vcard->ats[1] & 0x0f;
+               if (fsci < sizeof(atsFSC))
+                       frameLength = atsFSC[fsci];
+       }
+
+       if (card) {
+               memcpy(card, vcard, sizeof(iso14a_card_select_t));
+       }
+
+       if (disconnect) {
+               DropField();
+       }
+
+       return 0;
+}
+
+
+static int ExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout)
+{
+       *chainingout = false;
+
        if (activateField) {
-               cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+               // select with no disconnect and set frameLength
+               int selres = SelectCard14443_4(false, NULL);
+               if (selres)
+                       return selres;
        }
 
+       uint16_t cmdc = 0;
+       if (chainingin)
+               cmdc = ISO14A_SEND_CHAINING;
+
        // "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 | ISO14A_NO_DISCONNECT | 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);
-       
-    uint8_t *recv;
-    UsbCommand resp;
 
-       if (activateField) {
-               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                       PrintAndLog("APDU ERROR: Proxmark connection timeout.");
-                       return 1;
-               }
-               if (resp.arg[0] != 1) {
-                       PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
-                       DropField();
-                       return 1;
-               }
-       }
+       uint8_t *recv;
+       UsbCommand resp;
 
-    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];
-               
+
                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(!iLen) {
+
+               // I-block ACK
+               if ((res & 0xf2) == 0xa2) {
+                       *dataoutlen = 0;
+                       *chainingout = true;
+                       return 0;
+               }
+
+               if(!iLen) {
                        PrintAndLog("APDU ERROR: No APDU response.");
-            return 1;
+                       return 1;
                }
 
                // check apdu length
-               if (iLen < 4 && iLen >= 0) {
+               if (iLen < 2 && 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.");
@@ -757,21 +829,21 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
                }
 
                memcpy(dataout, recv, dlen);
-               
+
                // chaining
                if ((res & 0x10) != 0) {
-                       *chaining = true;
+                       *chainingout = true;
                }
-               
+
                // CRC Check
                if (iLen == -1) {
                        PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
                        return 3;
                }
-    } else {
-        PrintAndLog("APDU ERROR: Reply timeout.");
+       } else {
+               PrintAndLog("APDU ERROR: Reply timeout.");
                return 4;
-    }
+       }
 
        return 0;
 }
@@ -780,24 +852,68 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
 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);
+       int res;
+
+       // 3 byte here - 1b framing header, 2b crc16
+       if ( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3) ) {
+               int clen = 0;
+
+               bool vActivateField = activateField;
+
+               do {
+                       int vlen = MIN(frameLength - 3, datainlen - clen);
+                       bool chainBlockNotLast = ((clen + vlen) < datainlen);
+
+                       *dataoutlen = 0;
+                       res = ExchangeAPDU(chainBlockNotLast, &datain[clen], vlen, vActivateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+                       if (res) {
+                               if (!leaveSignalON)
+                                       DropField();
+
+                               return 200;
+                       }
+
+                       // check R-block ACK
+                       if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
+                               if (!leaveSignalON)
+                                       DropField();
+
+                               return 201;
+                       }
+
+                       clen += vlen;
+                       vActivateField = false;
+                       if (*dataoutlen) {
+                               if (clen != datainlen)
+                                       PrintAndLogEx(WARNING, "APDU: I-block/R-block sequence error. Data len=%d, Sent=%d, Last packet len=%d", datainlen, clen, *dataoutlen);
+                               break;
+                       }
+               } while (clen < datainlen);
+       } else {
+               res = ExchangeAPDU(false, datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+               if (res) {
+                       if (!leaveSignalON)
+                               DropField();
+
+                       return res;
+               }
+       }
 
        while (chaining) {
                // I-block with chaining
-               res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
-               
+               res = ExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+
                if (res) {
                        if (!leaveSignalON)
                                DropField();
-                       
+
                        return 100;
                }
-       }       
-       
+       }
+
        if (!leaveSignalON)
                DropField();
-       
+
        return 0;
 }
 
@@ -809,8 +925,8 @@ int CmdHF14AAPDU(const char *cmd) {
        bool leaveSignalON = false;
        bool decodeTLV = false;
 
-       CLIParserInit("hf 14a apdu", 
-               "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)", 
+       CLIParserInit("hf 14a apdu",
+               "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
                "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
 
        void* argtable[] = {
@@ -822,7 +938,7 @@ int CmdHF14AAPDU(const char *cmd) {
                arg_param_end
        };
        CLIExecWithReturn(cmd, argtable, false);
-       
+
        activateField = arg_get_lit(1);
        leaveSignalON = arg_get_lit(2);
        decodeTLV = arg_get_lit(3);
@@ -831,23 +947,23 @@ int CmdHF14AAPDU(const char *cmd) {
 
 
        CLIParserFree();
-//     PrintAndLog("---str [%d] %s", arg_get_str(4)->count, arg_get_str(4)->sval[0]);
+//  PrintAndLog("---str [%d] %s", arg_get_str(4)->count, arg_get_str(4)->sval[0]);
        PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
-       
+
        int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
 
        if (res)
                return res;
 
        PrintAndLog("<<<< %s", sprint_hex(data, datalen));
-       
-       PrintAndLog("APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1])); 
+
+       PrintAndLog("APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
 
        // TLV decoder
        if (decodeTLV && datalen > 4) {
                TLVPrintFromBuffer(data, datalen - 2);
        }
-       
+
        return 0;
 }
 
@@ -867,7 +983,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        int datalen = 0;
 
        // extract parameters
-       CLIParserInit("hf 14a raw", "Send raw hex data to tag", 
+       CLIParserInit("hf 14a raw", "Send raw hex data to tag",
                "Sample:\n"\
                "\thf 14a raw -pa -b7 -t1000 52  -- execute WUPA\n"\
                "\thf 14a raw -p 9320            -- anticollision\n"\
@@ -889,12 +1005,12 @@ int CmdHF14ACmdRaw(const char *cmd) {
        // defaults
        arg_get_int(6) = 0;
        arg_get_int(7) = 0;
-       
+
        if (CLIParserParseString(cmd, argtable, arg_getsize(argtable), false)){
                CLIParserFree();
                return 0;
        }
-       
+
        reply = !arg_get_lit(1);
        crc = arg_get_lit(2);
        power = arg_get_lit(3);
@@ -902,7 +1018,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        active_select = arg_get_lit(5);
        numbits = arg_get_int(6) & 0xFFFF;
        timeout = arg_get_int(7);
-       bTimeout = (timeout > 0);       
+       bTimeout = (timeout > 0);
        topazmode = arg_get_lit(8);
        no_rats = arg_get_lit(9);
        // len = data + CRC(2b)
@@ -910,10 +1026,10 @@ int CmdHF14ACmdRaw(const char *cmd) {
                CLIParserFree();
                return 1;
        }
-       
-       CLIParserFree();        
-       
-       // logic 
+
+       CLIParserFree();
+
+       // logic
        if(crc && datalen>0 && datalen<sizeof(data)-2)
        {
                uint8_t first, second;
@@ -934,7 +1050,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        }
 
        if(bTimeout){
-               #define MAX_TIMEOUT 40542464    // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+               #define MAX_TIMEOUT 40542464    // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
                c.arg[0] |= ISO14A_SET_TIMEOUT;
                if(timeout > MAX_TIMEOUT) {
                        timeout = MAX_TIMEOUT;
@@ -977,13 +1093,13 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
 
 static int waitCmd(uint8_t iSelect) {
-    uint8_t *recv;
-    UsbCommand resp;
-    char *hexout;
+       uint8_t *recv;
+       UsbCommand resp;
+       char *hexout;
 
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        recv = resp.d.asBytes;
-        uint8_t iLen = resp.arg[0];
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+               recv = resp.d.asBytes;
+               uint8_t iLen = resp.arg[0];
                if (iSelect){
                        iLen = resp.arg[1];
                        if (iLen){
@@ -994,38 +1110,38 @@ static int waitCmd(uint8_t iSelect) {
                } else {
                        PrintAndLog("received %i bytes:", iLen);
                }
-        if(!iLen)
-            return 1;
-        hexout = (char *)malloc(iLen * 3 + 1);
-        if (hexout != NULL) {
-            for (int i = 0; i < iLen; i++) { // data in hex
-                sprintf(&hexout[i * 3], "%02X ", recv[i]);
-            }
-            PrintAndLog("%s", hexout);
-            free(hexout);
-        } else {
-            PrintAndLog("malloc failed your client has low memory?");
+               if(!iLen)
+                       return 1;
+               hexout = (char *)malloc(iLen * 3 + 1);
+               if (hexout != NULL) {
+                       for (int i = 0; i < iLen; i++) { // data in hex
+                               sprintf(&hexout[i * 3], "%02X ", recv[i]);
+                       }
+                       PrintAndLog("%s", hexout);
+                       free(hexout);
+               } else {
+                       PrintAndLog("malloc failed your client has low memory?");
                        return 2;
-        }
-    } else {
-        PrintAndLog("timeout while waiting for reply.");
+               }
+       } else {
+               PrintAndLog("timeout while waiting for reply.");
                return 3;
-    }
+       }
        return 0;
 }
 
-static command_t CommandTable[] = 
+static command_t CommandTable[] =
 {
-  {"help",   CmdHelp,              1, "This help"},
-  {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
-  {"reader", CmdHF14AReader,       0, "Start acting like an ISO14443 Type A reader"},
-  {"info",   CmdHF14AInfo,         0, "Reads card and shows information about it"},
-  {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
-  {"sim",    CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},
-  {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
-  {"apdu",   CmdHF14AAPDU,         0, "Send an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol"},
-  {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
-  {NULL, NULL, 0, NULL}
+       {"help",     CmdHelp,              1, "This help"},
+       {"list",     CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
+       {"reader",   CmdHF14AReader,       0, "Start acting like an ISO14443 Type A reader"},
+       {"info",     CmdHF14AInfo,         0, "Reads card and shows information about it"},
+       {"cuids",    CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
+       {"sim",      CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},
+       {"snoop",    CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
+       {"apdu",     CmdHF14AAPDU,         0, "Send an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol"},
+       {"raw",      CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
+       {NULL,       NULL,                 0, NULL}
 };
 
 int CmdHF14A(const char *Cmd) {
index 13768b756dbb5dbbe28e8abf75c5eae197c9a4c5..6e021ea60c9fb8bebc17a7316c4f229e0081d782 100644 (file)
@@ -267,9 +267,9 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
        uint32_t verifyflags = 0;
        res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
        if (res) {
-               PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+               PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res<0)?-res:res, ecdsa_get_error(res));
        } else {
-               PrintAndLog("Certificate OK.");
+               PrintAndLog("Certificate OK.\n");
        }
        
        if (verbose) {
index b821f32b5cb590ec347e9681ce59727a9cd2631f..bb07adcd2e5b2cef8b4c236fd74601950de6c927 100644 (file)
@@ -36,7 +36,8 @@ typedef enum ISO14A_COMMAND {
        ISO14A_NO_SELECT =                      (1 << 7),
        ISO14A_TOPAZMODE =                      (1 << 8),
        ISO14A_NO_RATS =                        (1 << 9),
-       ISO14A_CLEAR_TRACE =            (1 << 10)
+       ISO14A_SEND_CHAINING =      (1 << 10),
+       ISO14A_CLEAR_TRACE =            (1 << 11)
 } iso14a_command_t;
 
 typedef struct {
Impressum, Datenschutz