]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
fix WaitForResponse (without timeout)
[proxmark3-svn] / client / cmdhf14a.c
index 8064724cc3185a66b2e86f0c38c4bb8baaf9646c..58315582742ed8850c15e1277f7f9f065cfa0791 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
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
+#include <ctype.h>
 #include "util.h"
 #include "util_posix.h"
 #include "iso14443crc.h"
-#include "data.h"
-#include "proxmark3.h"
+#include "comms.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
+#include "cliparser/cliparser.h"
 #include "emv/apduinfo.h"
 #include "emv/emvcore.h"
+#include "taginfo.h"
 
 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};
 
-const manufactureName manufactureMapping[] = {
-       // ID,  "Vendor Country"
-       { 0x01, "Motorola UK" },
-       { 0x02, "ST Microelectronics SA France" },
-       { 0x03, "Hitachi, Ltd Japan" }, 
-       { 0x04, "NXP Semiconductors Germany" }, 
-       { 0x05, "Infineon Technologies AG Germany" }, 
-       { 0x06, "Cylink USA" }, 
-       { 0x07, "Texas Instrument France" },
-       { 0x08, "Fujitsu Limited Japan" }, 
-       { 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" }, 
-       { 0x0A, "NEC Japan" }, 
-       { 0x0B, "Oki Electric Industry Co. Ltd Japan" },
-       { 0x0C, "Toshiba Corp. Japan" },
-       { 0x0D, "Mitsubishi Electric Corp. Japan" },
-       { 0x0E, "Samsung Electronics Co. Ltd Korea" },
-       { 0x0F, "Hynix / Hyundai, Korea" },
-       { 0x10, "LG-Semiconductors Co. Ltd Korea" },
-       { 0x11, "Emosyn-EM Microelectronics USA" },
-       { 0x12, "INSIDE Technology France" },
-       { 0x13, "ORGA Kartensysteme GmbH Germany" },
-       { 0x14, "SHARP Corporation Japan" },
-       { 0x15, "ATMEL France" },
-       { 0x16, "EM Microelectronic-Marin SA Switzerland" },
-       { 0x17, "KSW Microtec GmbH Germany" },
-       { 0x18, "ZMD AG Germany" },
-       { 0x19, "XICOR, Inc. USA" },
-       { 0x1A, "Sony Corporation Japan Identifier Company Country" },
-       { 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
-       { 0x1C, "Emosyn USA" },
-       { 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
-       { 0x1E, "Magellan Technology Pty Limited Australia" },
-       { 0x1F, "Melexis NV BO Switzerland" },
-       { 0x20, "Renesas Technology Corp. Japan" },
-       { 0x21, "TAGSYS France" },
-       { 0x22, "Transcore USA" },
-       { 0x23, "Shanghai belling corp., ltd. China" },
-       { 0x24, "Masktech Germany Gmbh Germany" },
-       { 0x25, "Innovision Research and Technology Plc UK" },
-       { 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },
-       { 0x27, "Cypak AB Sweden" },
-       { 0x28, "Ricoh Japan" },
-       { 0x29, "ASK France" },
-       { 0x2A, "Unicore Microsystems, LLC Russian Federation" },
-       { 0x2B, "Dallas Semiconductor/Maxim USA" },
-       { 0x2C, "Impinj, Inc. USA" },
-       { 0x2D, "RightPlug Alliance USA" },
-       { 0x2E, "Broadcom Corporation USA" },
-       { 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },
-       { 0x30, "BeeDar Technology Inc. USA" },
-       { 0x31, "RFIDsec Denmark" },
-       { 0x32, "Schweizer Electronic AG Germany" },
-       { 0x33, "AMIC Technology Corp Taiwan" }, 
-       { 0x34, "Mikron JSC Russia" },
-       { 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
-       { 0x36, "IDS Microchip AG Switzerland" },
-       { 0x37, "Kovio USA" },
-       { 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
-       { 0x39, "Silicon Craft Technology Thailand" },
-       { 0x3A, "Advanced Film Device Inc. Japan" },
-       { 0x3B, "Nitecrest Ltd UK" },
-       { 0x3C, "Verayo Inc. USA" },
-       { 0x3D, "HID Global USA" },
-       { 0x3E, "Productivity Engineering Gmbh Germany" },
-       { 0x3F, "Austriamicrosystems AG (reserved) Austria" }, 
-       { 0x40, "Gemalto SA France" },
-       { 0x41, "Renesas Electronics Corporation Japan" },
-       { 0x42, "3Alogics Inc Korea" },
-       { 0x43, "Top TroniQ Asia Limited Hong Kong" },
-       { 0x44, "Gentag Inc (USA) USA" },
-       { 0x00, "no tag-info available" } // must be the last entry
-};
+int CmdHF14AList(const char *Cmd)
+{
+       PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+       return 0;
+}
 
-// get a product description based on the UID
-//             uid[8]  tag uid
-// returns description of the best match       
-char* getTagInfo(uint8_t uid) {
+int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+       SendCommand(&c);
 
-       int i;
-       int len = sizeof(manufactureMapping) / sizeof(manufactureName);
-       
-       for ( i = 0; i < len; ++i ) 
-               if ( uid == manufactureMapping[i].uid) 
-                       return manufactureMapping[i].desc;
+       UsbCommand resp;
+       WaitForResponse(CMD_NACK, &resp);
 
-       //No match, return default
-       return manufactureMapping[len-1].desc; 
-}
+       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));
 
-int CmdHF14AList(const char *Cmd)
-{
-       PrintAndLog("Deprecated command, use 'hf list 14a' instead");
        return 0;
 }
 
 int CmdHF14AReader(const char *Cmd) {
        uint32_t cm = ISO14A_CONNECT;
-       bool disconnectAfter = true;
-       
-       int cmdp = 0;
-       while(param_getchar(Cmd, cmdp) != 0x00) {
-               switch(param_getchar(Cmd, cmdp)) {
-               case 'h':
-               case 'H':
-                       PrintAndLog("Usage: hf 14a reader [k|x] [3]");
-                       PrintAndLog("       k    keep the field active after command executed");
-                       PrintAndLog("       x    just drop the signal field");
-                       PrintAndLog("       3    ISO14443-3 select only (skip RATS)");
-                       return 0;
-               case '3':
-                       cm |= ISO14A_NO_RATS; 
-                       break;
-               case 'k':
-               case 'K':
-                       disconnectAfter = false;
-                       break;
-               case 'x':
-               case 'X':
-                       cm = cm - ISO14A_CONNECT;
-                       break;
-               default:
-                       PrintAndLog("Unknown command.");
-                       return 1;
-               }       
-               
-               cmdp++;
+       bool leaveSignalON = false;
+
+       CLIParserInit("hf 14a reader", "Executes ISO1443A anticollision-select group of commands.", NULL);
+       void* argtable[] = {
+               arg_param_begin,
+               arg_lit0("kK",  "keep",    "keep the field active after command executed"),
+               arg_lit0("xX",  "drop",    "just drop the signal field"),
+               arg_lit0("3",   NULL,      "ISO14443-3 select only (skip RATS)"),
+               arg_param_end
+       };
+       if (CLIParserParseString(Cmd, argtable, arg_getsize(argtable), true)){
+               CLIParserFree();
+               return 0;
        }
 
-       if (!disconnectAfter)
-               cm |= ISO14A_NO_DISCONNECT; 
-       
+       leaveSignalON = arg_get_lit(1);
+       if (arg_get_lit(2)) {
+               cm = cm - ISO14A_CONNECT;
+       }
+       if (arg_get_lit(3)) {
+               cm |= ISO14A_NO_RATS;
+       }
+
+       CLIParserFree();
+
+       if (leaveSignalON)
+               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;
@@ -191,36 +140,40 @@ 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 [%d]", 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(" 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(" ATS : %s", sprint_hex(card.ats, card.ats_len));
                }
-               if (!disconnectAfter) {
+               if (leaveSignalON) {
                        PrintAndLog("Card is selected. You can now start sending commands");
                }
        }
 
-       if (disconnectAfter) {
+       if (!leaveSignalON) {
                PrintAndLog("Field dropped.");
        }
-       
+
        return 0;
 }
 
-int CmdHF14AInfo(const char *Cmd)
-{
+
+int CmdHF14AInfo(const char *Cmd) {
+
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        SendCommand(&c);
 
        UsbCommand resp;
-       WaitForResponse(CMD_ACK,&resp);
+       if (!WaitForResponseTimeout(CMD_NACK, &resp, 500)) {
+               if (Cmd[0] != 's') PrintAndLog("Error: No response from Proxmark.\n");
+               return 0;
+       }
        
        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
-       
-       if(select_status == 0) {
+       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
                c.arg[0] = 0;
@@ -243,11 +196,11 @@ int CmdHF14AInfo(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 [%d]", card.sak, resp.arg[0]);
+       PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
        bool isMifareClassic = true;
        switch (card.sak) {
-               case 0x00: 
+               case 0x00:
                        isMifareClassic = false;
 
                        //***************************************test****************
@@ -256,7 +209,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);
 
@@ -268,13 +221,13 @@ int CmdHF14AInfo(const char *Cmd)
                        SendCommand(&c);
 
                        UsbCommand resp;
-                       WaitForResponse(CMD_ACK,&resp);
-                       
+                       WaitForResponse(CMD_NACK,&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
-                       
-                       if(select_status == 0) {
+                       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
                                c.arg[0] = 0;
@@ -301,7 +254,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;
@@ -323,8 +276,8 @@ int CmdHF14AInfo(const char *Cmd)
 
        // Double & triple sized UID, can be mapped to a manufacturer.
        // HACK: does this apply for Ultralight cards?
-       if ( card.uidlen > 4 ) {
-               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+       if (card.uidlen > 4) {
+               PrintAndLog("MANUFACTURER : %s", getManufacturerName(card.uid[0]));
        }
 
        // try to request ATS even if tag claims not to support it
@@ -336,12 +289,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;
 
@@ -353,8 +306,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;
@@ -363,10 +316,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;
@@ -412,7 +362,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");
@@ -479,23 +429,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.
-       mfCIdentify();
-       
-       if (isMifareClassic) {          
-               switch(DetectClassicPrng()) {
+       (void)mfCIdentify();
+
+       if (isMifareClassic) {
+               switch (DetectClassicPrng()) {
                case 0:
-                       PrintAndLog("Prng detection: HARDEND (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;
 }
 
@@ -514,9 +464,9 @@ 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);
+               WaitForResponse(CMD_NACK,&resp);
 
                iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
 
@@ -541,10 +491,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("");
@@ -555,15 +505,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?
@@ -586,7 +536,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");
@@ -602,25 +552,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.");
@@ -630,8 +581,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;
@@ -643,60 +594,236 @@ 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 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;
-       
+       *dataoutlen = 0;
+
        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;
 
-       // "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}}; 
-       memcpy(c.d.asBytes, datain, datainlen);
+       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 (activateField) {
+       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;
+}
+
+
+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)) {
-                       PrintAndLog("APDU ERROR: Proxmark connection timeout.");
+                       PrintAndLogEx(ERR, "Proxmark connection timeout.");
                        return 1;
                }
-               if (resp.arg[0] != 1) {
-                       PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
+
+               if (resp.arg[0] <= 0) { // ats_len
+                       PrintAndLogEx(ERR, "Can't get ATS.");
                        return 1;
                }
        }
 
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.d.asBytes;
-        int iLen = resp.arg[0];
-               
-               *dataoutlen = iLen - 2;
-               if (*dataoutlen < 0)
-                       *dataoutlen = 0;
-               
+       // 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) {
+               // 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}};
+       memcpy(c.d.asBytes, datain, datainlen);
+       SendCommand(&c);
+
+       uint8_t *recv;
+       UsbCommand resp;
+
+       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;
                }
-               
-               memcpy(dataout, recv, *dataoutlen);
-               
-        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 < 2 && iLen >= 0) {
+                       PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
+                       return 2;
                }
 
                // check block TODO
@@ -704,24 +831,93 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
                        PrintAndLog("APDU ERROR: Block type mismatch.");
                        return 2;
                }
-               
+
+               memcpy(dataout, recv, dlen);
+
+               // chaining
+               if ((res & 0x10) != 0) {
+                       *chainingout = true;
+               }
+
                // CRC Check
                if (iLen == -1) {
                        PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
                        return 3;
                }
+       } else {
+               PrintAndLog("APDU ERROR: Reply timeout.");
+               return 4;
+       }
 
-               // check apdu length
-               if (iLen < 4) {
-                       PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
-                       return 2;
+       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;
+
+       // 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;
                }
-               
-    } else {
-        PrintAndLog("APDU ERROR: Reply timeout.");
-               return 4;
-    }
-       
+       }
+
+       while (chaining) {
+               // I-block with chaining
+               res = ExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+
+               if (res) {
+                       if (!leaveSignalON)
+                               DropField();
+
+                       return 100;
+               }
+       }
+
+       if (!leaveSignalON)
+               DropField();
+
        return 0;
 }
 
@@ -729,78 +925,119 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 int CmdHF14AAPDU(const char *cmd) {
        uint8_t data[USB_CMD_DATA_SIZE];
        int datalen = 0;
+       uint8_t header[5];
+       int headerlen = 0;
        bool activateField = false;
        bool leaveSignalON = false;
        bool decodeTLV = false;
-       
-       if (strlen(cmd) < 2) {
-               PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
-               PrintAndLog("Command sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)");
-               PrintAndLog("       -s    activate field and select card");
-               PrintAndLog("       -k    leave the signal field ON after receive response");
-               PrintAndLog("       -t    executes TLV decoder if it possible. TODO!!!!");
-               return 0;
+       bool decodeAPDU = false;
+       bool makeAPDU = false;
+       bool extendedAPDU = false;
+       int le = 0;
+       int res = 0;
+
+       CLIParserInit("hf 14a apdu",
+                                 "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL). Works with all APDU types from ISO 7816-4:2013",
+                                 "Examples:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n"
+                                 "\thf 14a apdu -sd 00A404000E325041592E5359532E444446303100 - decode APDU\n"
+                                 "\thf 14a apdu -sm 00A40400 325041592E5359532E4444463031 -l 256 - encode standard APDU\n"
+                                 "\thf 14a apdu -sm 00A40400 325041592E5359532E4444463031 -el 65536 - encode extended APDU\n");
+
+       void* argtable[] = {
+               arg_param_begin,
+               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("dD",  "decapdu",  "decode APDU request if it possible"),
+               arg_str0("mM",  "make",     "<head (CLA INS P1 P2) hex>", "make APDU with head from this field and data from data field. Must be 4 bytes length: <CLA INS P1 P2>"),
+               arg_lit0("eE",  "extended", "make extended length APDU (requires `-m`)"),
+               arg_int0("lL",  "le",       "<Le (int)>", "Le APDU parameter (requires `-m`)"),
+               arg_strx1(NULL, NULL,       "<APDU (hex) | data (hex)>", "APDU (without `-m`), or data (with `-m`)"),
+               arg_param_end
+       };
+       CLIExecWithReturn(cmd, argtable, false);
+
+       activateField = arg_get_lit(1);
+       leaveSignalON = arg_get_lit(2);
+       decodeTLV = arg_get_lit(3);
+       decodeAPDU = arg_get_lit(4);
+
+       res = CLIParamHexToBuf(arg_get_str(5), header, sizeof(header), &headerlen);
+       makeAPDU = headerlen > 0;
+       if (res || (makeAPDU && headerlen != 4)) {
+               PrintAndLogEx(ERR, "header length must be exactly 4 bytes");
+               CLIParserFree();
+               return 1;
        }
+       extendedAPDU = arg_get_lit(6);
+       le = arg_get_int_def(7, 0);
 
-       int cmdp = 0;
-       while(param_getchar(cmd, cmdp) != 0x00) {
-               char c = param_getchar(cmd, cmdp);
-               if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-                       switch (param_getchar_indx(cmd, 1, cmdp)) {
-                               case 's':
-                               case 'S':
-                                       activateField = true;
-                                       break;
-                               case 'k':
-                               case 'K':
-                                       leaveSignalON = true;
-                                       break;
-                               case 't':
-                               case 'T':
-                                       decodeTLV = true;
-                                       break;
-                               default:
-                                       PrintAndLog("Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-                                       return 1;
-                       }
-                       
-               if (isxdigit(c)) {
-                       // len = data + PCB(1b) + CRC(2b)
-                       switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
-                       case 1:
-                               PrintAndLog("Invalid HEX value.");
-                               return 1;
-                       case 2:
-                               PrintAndLog("APDU too large.");
-                               return 1;
-                       case 3:
-                               PrintAndLog("Hex must have even number of digits.");
-                               return 1;
-                       }
-                       
-                       // we get all the hex to end of line with spaces
-                       break;
+       if (makeAPDU) {
+               uint8_t apdudata[USB_CMD_DATA_SIZE] = {0};
+               int apdudatalen = 0;
+
+               CLIGetHexBLessWithReturn(8, apdudata, &apdudatalen, 1 + 2);
+
+               APDUStruct apdu;
+               apdu.cla = header[0];
+               apdu.ins = header[1];
+               apdu.p1 = header[2];
+               apdu.p2 = header[3];
+
+               apdu.lc = apdudatalen;
+               apdu.data = apdudata;
+
+               apdu.extended_apdu = extendedAPDU;
+               apdu.le = le;
+
+               if (APDUEncode(&apdu, data, &datalen)) {
+                       PrintAndLogEx(ERR, "can't make apdu with provided parameters.");
+                       CLIParserFree();
+                       return 2;
+               }
+       } else {
+               if (extendedAPDU) {
+                       PrintAndLogEx(ERR, "`-e` without `-m`.");
+                       CLIParserFree();
+                       return 3;
+               }
+               if (le > 0) {
+                       PrintAndLogEx(ERR, "`-l` without `-m`.");
+                       CLIParserFree();
+                       return 3;
                }
-               
-               cmdp++;
+
+               // len = data + PCB(1b) + CRC(2b)
+               CLIGetHexBLessWithReturn(8, data, &datalen, 1 + 2);
        }
 
-       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);
+       CLIParserFree();
+//  PrintAndLog("---str [%d] %s", arg_get_str(4)->count, arg_get_str(4)->sval[0]);
+       PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
+
+       if (decodeAPDU) {
+               APDUStruct apdu;
+
+               if (APDUDecode(data, datalen, &apdu) == 0)
+                       APDUPrint(apdu);
+               else
+                       PrintAndLogEx(WARNING, "can't decode APDU.");
+       }
+
+       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;
 }
 
@@ -816,102 +1053,57 @@ int CmdHF14ACmdRaw(const char *cmd) {
        bool bTimeout = false;
        uint32_t timeout = 0;
        bool topazmode = false;
-       char buf[5]="";
-       int i = 0;
        uint8_t data[USB_CMD_DATA_SIZE];
-       uint16_t datalen = 0;
-       uint32_t temp;
-
-       if (strlen(cmd)<2) {
-               PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
-               PrintAndLog("       -r    do not read response");
-               PrintAndLog("       -c    calculate and append CRC");
-               PrintAndLog("       -p    leave the signal field ON after receive");
-               PrintAndLog("       -a    active signal field ON without select");
-               PrintAndLog("       -s    active signal field ON with select");
-               PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
-               PrintAndLog("       -t    timeout in ms");
-               PrintAndLog("       -T    use Topaz protocol to send command");
-               PrintAndLog("       -3    ISO14443-3 select only (skip RATS)");
+       int datalen = 0;
+
+       // extract parameters
+       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"\
+               "\thf 14a raw -psc 60 00         -- select and mifare AUTH\n");
+       void* argtable[] = {
+               arg_param_begin,
+               arg_lit0("rR",  "nreply",  "do not read response"),
+               arg_lit0("cC",  "crc",     "calculate and append CRC"),
+               arg_lit0("pP",  "power",   "leave the signal field ON after receive"),
+               arg_lit0("aA",  "active",  "active signal field ON without select"),
+               arg_lit0("sS",  "actives", "active signal field ON with select"),
+               arg_int0("bB",  "bits",    NULL, "number of bits to send. Useful for send partial byte"),
+               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_strx1(NULL, NULL,      "<data (hex)>", NULL),
+               arg_param_end
+       };
+       // defaults
+       arg_get_int(6) = 0;
+       arg_get_int(7) = 0;
+
+       if (CLIParserParseString(cmd, argtable, arg_getsize(argtable), false)){
+               CLIParserFree();
                return 0;
        }
 
-
-       // strip
-       while (*cmd==' ' || *cmd=='\t') cmd++;
-
-       while (cmd[i]!='\0') {
-               if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
-               if (cmd[i]=='-') {
-                       switch (cmd[i+1]) {
-                               case 'r': 
-                                       reply = false;
-                                       break;
-                               case 'c':
-                                       crc = true;
-                                       break;
-                               case 'p':
-                                       power = true;
-                                       break;
-                               case 'a':
-                                       active = true;
-                                       break;
-                               case 's':
-                                       active_select = true;
-                                       break;
-                               case 'b': 
-                                       sscanf(cmd+i+2,"%d",&temp);
-                                       numbits = temp & 0xFFFF;
-                                       i+=3;
-                                       while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                                       i-=2;
-                                       break;
-                               case 't':
-                                       bTimeout = true;
-                                       sscanf(cmd+i+2,"%d",&temp);
-                                       timeout = temp;
-                                       i+=3;
-                                       while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                                       i-=2;
-                                       break;
-                               case 'T':
-                                       topazmode = true;
-                                       break;
-                               case '3':
-                                       no_rats = true;
-                                       break;
-                               default:
-                                       PrintAndLog("Invalid option");
-                                       return 0;
-                       }
-                       i+=2;
-                       continue;
-               }
-               if ((cmd[i]>='0' && cmd[i]<='9') ||
-                   (cmd[i]>='a' && cmd[i]<='f') ||
-                   (cmd[i]>='A' && cmd[i]<='F') ) {
-                       buf[strlen(buf)+1]=0;
-                       buf[strlen(buf)]=cmd[i];
-                       i++;
-
-                       if (strlen(buf)>=2) {
-                               sscanf(buf,"%x",&temp);
-                               data[datalen]=(uint8_t)(temp & 0xff);
-                               *buf=0;
-                               if (datalen > sizeof(data)-1) {
-                                       if (crc)
-                                               PrintAndLog("Buffer is full, we can't add CRC to your data");
-                                       break;
-                               } else {
-                                       datalen++;
-                               }
-                       }
-                       continue;
-               }
-               PrintAndLog("Invalid char on input");
-               return 0;
+       reply = !arg_get_lit(1);
+       crc = arg_get_lit(2);
+       power = arg_get_lit(3);
+       active = arg_get_lit(4);
+       active_select = arg_get_lit(5);
+       numbits = arg_get_int(6) & 0xFFFF;
+       timeout = arg_get_int(7);
+       bTimeout = (timeout > 0);
+       topazmode = arg_get_lit(8);
+       no_rats = arg_get_lit(9);
+       // len = data + CRC(2b)
+       if (CLIParamHexToBuf(arg_get_str(10), data, sizeof(data) -2, &datalen)) {
+               CLIParserFree();
+               return 1;
        }
 
+       CLIParserFree();
+
+       // logic
        if(crc && datalen>0 && datalen<sizeof(data)-2)
        {
                uint8_t first, second;
@@ -932,7 +1124,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;
@@ -975,13 +1167,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){
@@ -992,47 +1184,44 @@ 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) {
-       // flush
-       WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-       // parse
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+       (void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+       CmdsParse(CommandTable, Cmd);
+       return 0;
 }
 
 int CmdHelp(const char *Cmd)
Impressum, Datenschutz