]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves...
[proxmark3-svn] / client / cmdhf14a.c
index 8f53bebed5c0c409a8bd3cd32bf62c3ac8687cb3..6411a919fe684f7632783e45374a20357296a56c 100644 (file)
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
+#include "cmdhfmf.h"
 #include "cmdhfmfu.h"
 #include "nonce2key/nonce2key.h"
-
-#define llx PRIx64
+#include "cmdhf.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
@@ -64,7 +64,7 @@ const manufactureName manufactureMapping[] = {
        { 0x17, "KSW Microtec GmbH Germany" },
        { 0x18, "ZMD AG Germany" },
        { 0x19, "XICOR, Inc. USA" },
-       { 0x1A, "Sony Corporation Japan Identifier Company Country" },
+       { 0x1A, "Sony Corporation Japan" },
        { 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
        { 0x1C, "Emosyn USA" },
        { 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
@@ -94,7 +94,7 @@ const manufactureName manufactureMapping[] = {
        { 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
        { 0x36, "IDS Microchip AG Switzerland" },
        { 0x37, "Kovio USA" },
-       { 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
+       { 0x38, "HMT Microelectronic Ltd Switzerland" },
        { 0x39, "Silicon Craft Technology Thailand" },
        { 0x3A, "Advanced Film Device Inc. Japan" },
        { 0x3B, "Nitecrest Ltd UK" },
@@ -106,7 +106,7 @@ const manufactureName manufactureMapping[] = {
        { 0x41, "Renesas Electronics Corporation Japan" },
        { 0x42, "3Alogics Inc Korea" },
        { 0x43, "Top TroniQ Asia Limited Hong Kong" },
-       { 0x44, "Gentag Inc (USA) USA" },
+       { 0x44, "Gentag Inc. USA" },
        { 0x00, "no tag-info available" } // must be the last entry
 };
 
@@ -127,19 +127,65 @@ char* getTagInfo(uint8_t uid) {
        return manufactureMapping[len-1].desc; 
 }
 
-int CmdHF14AList(const char *Cmd)
-{
-       PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+int usage_hf_14a_sim(void) {
+//     PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
+       PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
+       PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
+       PrintAndLog("  Options : ");
+       PrintAndLog("    h     : this help");
+       PrintAndLog("    t     : 1 = MIFARE Classic");
+       PrintAndLog("            2 = MIFARE Ultralight");
+       PrintAndLog("            3 = MIFARE Desfire");
+       PrintAndLog("            4 = ISO/IEC 14443-4");
+       PrintAndLog("            5 = MIFARE Tnp3xxx");
+       PrintAndLog("            6 = MIFARE Mini");
+       PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
+//     PrintAndLog("    u     : 4, 7 or 10 byte UID");
+       PrintAndLog("    u     : 4, 7 byte UID");
+       PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
+       PrintAndLog("    v     : (Optional) show maths used for cracking reader. Useful for debugging.");
+       PrintAndLog("\n   sample : hf 14a sim t 1 u 11223344 x");
+       PrintAndLog("          : hf 14a sim t 1 u 11223344");
+       PrintAndLog("          : hf 14a sim t 1 u 11223344556677");
+//     PrintAndLog("          : hf 14a sim t 1 u 11223445566778899AA\n");
+       return 0;
+}
+int usage_hf_14a_sniff(void){
+       PrintAndLog("It get data from the field and saves it into command buffer.");
+       PrintAndLog("Buffer accessible from command 'hf list 14a'");
+       PrintAndLog("Usage:  hf 14a sniff [c][r]");
+       PrintAndLog("c - triggered by first data from card");
+       PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+       PrintAndLog("sample: hf 14a sniff c r");
+       return 0;
+}
+int usage_hf_14a_raw(void){
+       PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+       PrintAndLog("       -h    this help");
+       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");
+       return 0;
+}
+
+int CmdHF14AList(const char *Cmd) {
+       //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+       CmdHFList("14a");
        return 0;
 }
 
-int CmdHF14AReader(const char *Cmd)
-{
+int CmdHF14AReader(const char *Cmd) {
+       UsbCommand cDisconnect = {CMD_READER_ISO_14443a, {0,0,0}};
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       clearCommandBuffer();
        SendCommand(&c);
-
        UsbCommand resp;
-       WaitForResponse(CMD_ACK,&resp);
+       WaitForResponse(CMD_ACK, &resp);
        
        iso14a_card_select_t card;
        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@@ -148,22 +194,14 @@ int CmdHF14AReader(const char *Cmd)
        
        if(select_status == 0) {
                if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
-               // disconnect
-               c.arg[0] = 0;
-               c.arg[1] = 0;
-               c.arg[2] = 0;
-               SendCommand(&c);
+               SendCommand(&cDisconnect);
                return 0;
        }
 
        if(select_status == 3) {
                PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
                PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-               // disconnect
-               c.arg[0] = 0;
-               c.arg[1] = 0;
-               c.arg[2] = 0;
-               SendCommand(&c);
+               SendCommand(&cDisconnect);
                return 0;
        }
 
@@ -174,21 +212,21 @@ int CmdHF14AReader(const char *Cmd)
        switch (card.sak) {
                case 0x00: 
 
-                       //***************************************test****************
+                       // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
                        ul_switch_off_field();
                        
                        uint32_t tagT = GetHF14AMfU_Type();
-                       ul_print_type(tagT, 0);
+                       if (tagT != UL_ERROR)
+                               ul_print_type(tagT, 0);
 
-                       //reconnect for further tests
+                       // reconnect for further tests
                        c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
                        c.arg[1] = 0;
                        c.arg[2] = 0;
-
+                       clearCommandBuffer();
                        SendCommand(&c);
-
                        UsbCommand resp;
-                       WaitForResponse(CMD_ACK,&resp);
+                       WaitForResponse(CMD_ACK, &resp);
                        
                        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
@@ -198,27 +236,6 @@ int CmdHF14AReader(const char *Cmd)
                                ul_switch_off_field();
                                return 0;
                        }
-
-                       /*  orig
-                       // check if the tag answers to GETVERSION (0x60)
-                       c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
-                       c.arg[1] = 1;
-                       c.arg[2] = 0;
-                       c.d.asBytes[0] = 0x60;
-                       SendCommand(&c);
-                       WaitForResponse(CMD_ACK,&resp);
-               
-                       uint8_t version[10] = {0};
-                       memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
-                       uint8_t len  = resp.arg[0] & 0xff;
-                       switch ( len){
-                               // todo, identify "Magic UL-C tags".  // they usually have a static nonce response to 0x1A command.
-                               // 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;
-                       }
-                       */
                        break;
                case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
@@ -248,6 +265,7 @@ int CmdHF14AReader(const char *Cmd)
                c.arg[1] = 2;
                c.arg[2] = 0;
                memcpy(c.d.asBytes, rats, 2);
+               clearCommandBuffer();
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
                
@@ -333,59 +351,29 @@ int CmdHF14AReader(const char *Cmd)
                                PrintAndLog("                  %02x -> Length is %d bytes",
                                                card.ats[pos + 1], card.ats[pos + 1]);
                                switch (card.ats[pos + 2] & 0xf0) {
-                                       case 0x10:
-                                               PrintAndLog("                     1x -> MIFARE DESFire");
-                                               break;
-                                       case 0x20:
-                                               PrintAndLog("                     2x -> MIFARE Plus");
-                                               break;
+                                       case 0x10: PrintAndLog("                     1x -> MIFARE DESFire"); break;
+                                       case 0x20: PrintAndLog("                     2x -> MIFARE Plus"); break;
                                }
                                switch (card.ats[pos + 2] & 0x0f) {
-                                       case 0x00:
-                                               PrintAndLog("                     x0 -> <1 kByte");
-                                               break;
-                                       case 0x01:
-                                               PrintAndLog("                     x0 -> 1 kByte");
-                                               break;
-                                       case 0x02:
-                                               PrintAndLog("                     x0 -> 2 kByte");
-                                               break;
-                                       case 0x03:
-                                               PrintAndLog("                     x0 -> 4 kByte");
-                                               break;
-                                       case 0x04:
-                                               PrintAndLog("                     x0 -> 8 kByte");
-                                               break;
+                                       case 0x00: PrintAndLog("                     x0 -> <1 kByte"); break;
+                                       case 0x01: PrintAndLog("                     x1 -> 1 kByte"); break;
+                                       case 0x02: PrintAndLog("                     x2 -> 2 kByte"); break;
+                                       case 0x03: PrintAndLog("                     x3 -> 4 kByte"); break;
+                                       case 0x04: PrintAndLog("                     x4 -> 8 kByte"); break;
                                }
                                switch (card.ats[pos + 3] & 0xf0) {
-                                       case 0x00:
-                                               PrintAndLog("                        0x -> Engineering sample");
-                                               break;
-                                       case 0x20:
-                                               PrintAndLog("                        2x -> Released");
-                                               break;
+                                       case 0x00: PrintAndLog("                        0x -> Engineering sample"); break;
+                                       case 0x20: PrintAndLog("                        2x -> Released"); break;
                                }
                                switch (card.ats[pos + 3] & 0x0f) {
-                                       case 0x00:
-                                               PrintAndLog("                        x0 -> Generation 1");
-                                               break;
-                                       case 0x01:
-                                               PrintAndLog("                        x1 -> Generation 2");
-                                               break;
-                                       case 0x02:
-                                               PrintAndLog("                        x2 -> Generation 3");
-                                               break;
+                                       case 0x00: PrintAndLog("                        x0 -> Generation 1"); break;
+                                       case 0x01: PrintAndLog("                        x1 -> Generation 2"); break;
+                                       case 0x02: PrintAndLog("                        x2 -> Generation 3"); break;
                                }
                                switch (card.ats[pos + 4] & 0x0f) {
-                                       case 0x00:
-                                               PrintAndLog("                           x0 -> Only VCSL supported");
-                                               break;
-                                       case 0x01:
-                                               PrintAndLog("                           x1 -> VCS, VCSL, and SVC supported");
-                                               break;
-                                       case 0x0E:
-                                               PrintAndLog("                           xE -> no VCS command supported");
-                                               break;
+                                       case 0x00: PrintAndLog("                           x0 -> Only VCSL supported"); break;
+                                       case 0x01: PrintAndLog("                           x1 -> VCS, VCSL, and SVC supported"); break;
+                                       case 0x0E: PrintAndLog("                           xE -> no VCS command supported"); break;
                                }
                        }
                }
@@ -395,28 +383,26 @@ int CmdHF14AReader(const char *Cmd)
 
        
        // try to see if card responses to "chinese magic backdoor" commands.
+       uint8_t isOK = 0;
+       clearCommandBuffer();
        c.cmd = CMD_MIFARE_CIDENT;
        c.arg[0] = 0;
        c.arg[1] = 0;
        c.arg[2] = 0;   
        SendCommand(&c);
-       WaitForResponse(CMD_ACK,&resp);
-       uint8_t isOK  = resp.arg[0] & 0xff;
-       PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+               isOK  = resp.arg[0] & 0xff;
+
+       PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
        
        // disconnect
-       c.cmd = CMD_READER_ISO_14443a;
-       c.arg[0] = 0;
-       c.arg[1] = 0;
-       c.arg[2] = 0;
-       SendCommand(&c);
+       SendCommand(&cDisconnect);
 
        return select_status;
 }
 
 // Collect ISO14443 Type A UIDs
-int CmdHF14ACUIDs(const char *Cmd)
-{
+int CmdHF14ACUIDs(const char *Cmd) {
        // requested number of UIDs
        int n = atoi(Cmd);
        // collect at least 1 (e.g. if no parameter was given)
@@ -447,44 +433,24 @@ int CmdHF14ACUIDs(const char *Cmd)
                }
        }
        PrintAndLog("End: %u", time(NULL));
-
        return 1;
 }
 
-
-static int usage_hf_14a_sim(void)
-{
-       PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
-       PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
-       PrintAndLog("  Options : ");
-       PrintAndLog("    h     : this help");
-       PrintAndLog("    t     : 1 = MIFARE Classic");
-       PrintAndLog("            2 = MIFARE Ultralight");
-       PrintAndLog("            3 = MIFARE Desfire");
-       PrintAndLog("            4 = ISO/IEC 14443-4");
-       PrintAndLog("            5 = MIFARE Tnp3xxx");
-       PrintAndLog("            6 = MIFARE Mini");
-       PrintAndLog("    u     : 4 or 7 byte UID");
-       PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
-       PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
-       PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
-       return 0;
-}
-
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
-int CmdHF14ASim(const char *Cmd)
-{
+int CmdHF14ASim(const char *Cmd) {
+       #define ATTACK_KEY_COUNT 8
        bool errors = FALSE;
        uint8_t flags = 0;
-       uint8_t tagtype = 1;
-       uint64_t uid = 0;
+       uint8_t tagtype = 1;    
        uint8_t cmdp = 0;
-       
-       while(param_getchar(Cmd, cmdp) != 0x00)
-       {
-               switch(param_getchar(Cmd, cmdp))
-               {
+       uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+       int uidlen = 0;
+       bool useUIDfromEML = TRUE;
+       bool verbose = false;
+
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
                        case 'h':
                        case 'H':
                                return usage_hf_14a_sim();
@@ -498,20 +464,25 @@ int CmdHF14ASim(const char *Cmd)
                                break;
                        case 'u':
                        case 'U':
-                               // Retrieve the full 4 or 7 byte long uid 
-                               uid = param_get64ex(Cmd, cmdp+1, 0, 16);
-                               if (uid == 0 )
-                                       errors = TRUE;
-                                
-                               if (uid > 0xffffffff) {
-                                       PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",uid);
-                                       flags |= FLAG_7B_UID_IN_DATA;
-                               } else {
-                                       PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",uid);
-                                       flags |= FLAG_4B_UID_IN_DATA;
+                               // Retrieve the full 4,7,10 byte long uid 
+                               param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+                               switch(uidlen) {
+                                       //case 20: flags |= FLAG_10B_UID_IN_DATA; break;
+                                       case 14: flags |= FLAG_7B_UID_IN_DATA; break;
+                                       case  8: flags |= FLAG_4B_UID_IN_DATA; break;
+                                       default: errors = TRUE; break;
+                               }                               
+                               if (!errors) {
+                                       PrintAndLog("Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+                                       useUIDfromEML = FALSE;
                                }
                                cmdp += 2;
                                break;
+                       case 'v':
+                       case 'V':
+                               verbose = true;
+                               cmdp++;
+                               break;
                        case 'x':
                        case 'X':
                                flags |= FLAG_NR_AR_ATTACK;
@@ -528,46 +499,35 @@ int CmdHF14ASim(const char *Cmd)
        //Validations
        if (errors) return usage_hf_14a_sim();
 
-       PrintAndLog("Press pm3-button to abort simulation");
+       if ( useUIDfromEML ) 
+               flags |= FLAG_UID_IN_EMUL;
        
-       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
+       PrintAndLog("Press pm3-button to abort simulation");
        
-       num_to_bytes(uid, 7, c.d.asBytes);
+       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};     
+       memcpy(c.d.asBytes, uid, uidlen>>1);
+       clearCommandBuffer();
        SendCommand(&c);        
 
-       uint8_t data[40];
-       uint8_t key[6];
+       nonces_t data[ATTACK_KEY_COUNT*2];
+       UsbCommand resp;
 
-       while(!ukbhit()){
-               UsbCommand resp;
-               WaitForResponseTimeout(CMD_ACK,&resp,1500);
-               PrintAndLog("CMD_SIMULATE_MIFARE_CARD [%04X] -- %04X", CMD_SIMULATE_MIFARE_CARD, resp.arg[0]);
-               if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
-                       memset(data, 0x00, sizeof(data));
-                       memset(key, 0x00, sizeof(key));
-                       int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
-                       memcpy(data, resp.d.asBytes, len);
-                       tryMfk32(uid, data, key);
-                       //tryMfk64(uid, data, key);
-                       PrintAndLog("--");
-               }
+       while( !ukbhit() ){
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+
+               if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+               if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+                       
+               memcpy( data, resp.d.asBytes, sizeof(data) );
+               readerAttack(data, TRUE, verbose);
        }
        return 0;
 }
 
 int CmdHF14ASniff(const char *Cmd) {
-       int param = 0;
-       
+       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.");
-               PrintAndLog("Buffer accessible from command 'hf list 14a'");
-               PrintAndLog("Usage:  hf 14a sniff [c][r]");
-               PrintAndLog("c - triggered by first data from card");
-               PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
-               PrintAndLog("sample: hf 14a sniff c r");
-               return 0;
-       }       
+       if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
        
        for (int i = 0; i < 2; i++) {
                ctmp = param_getchar(Cmd, i);
@@ -576,11 +536,11 @@ int CmdHF14ASniff(const char *Cmd) {
        }
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+  clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
-
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;
@@ -598,19 +558,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        uint16_t datalen=0;
        uint32_t temp;
 
-    if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-t] <milliseconds> [-b] <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");
-        return 0;
-    }
-
+    if (strlen(cmd)<2) return usage_hf_14a_raw();
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
@@ -619,6 +567,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
+                               case 'H':
+                               case 'h':
+                                       return usage_hf_14a_raw();
                 case 'r': 
                     reply = FALSE;
                     break;
@@ -653,8 +604,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                                        topazmode = TRUE;
                                        break;
                 default:
-                    PrintAndLog("Invalid option");
-                    return 0;
+                    return usage_hf_14a_raw();
             }
             i+=2;
             continue;
@@ -711,19 +661,25 @@ int CmdHF14ACmdRaw(const char *cmd) {
                c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
        }
 
-    if(power)
+    if(power) {
         c.arg[0] |= ISO14A_NO_DISCONNECT;
-
-    if(datalen>0)
+       }
+       
+    if(datalen>0) {
         c.arg[0] |= ISO14A_RAW;
-
-       if(topazmode)
+       }
+       
+       if(topazmode) {
                c.arg[0] |= ISO14A_TOPAZMODE;
-               
+       }
+                       
        // Max buffer is USB_CMD_DATA_SIZE
-    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
-    memcpy(c.d.asBytes,data,datalen);
+       datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+               
+    c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
+    memcpy(c.d.asBytes, data, datalen);
 
+       clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {
@@ -735,36 +691,22 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
-
-static void waitCmd(uint8_t iSelect)
-{
-    uint8_t *recv;
+static void waitCmd(uint8_t iSelect) {
     UsbCommand resp;
-    char *hexout;
+    uint16_t len = 0;
 
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        recv = resp.d.asBytes;
-        uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
-        PrintAndLog("received %i octets",iLen);
-        if(!iLen)
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {        
+        len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
+        PrintAndLog("received %i octets", len);
+        if(!len)
             return;
-        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?");
-        }
+               PrintAndLog("%s", sprint_hex(resp.d.asBytes, len) );
     } else {
         PrintAndLog("timeout while waiting for reply.");
     }
 }
 
-static command_t CommandTable[] = 
-{
+static command_t CommandTable[] = {
   {"help",   CmdHelp,              1, "This help"},
   {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
@@ -776,16 +718,12 @@ static command_t CommandTable[] =
 };
 
 int CmdHF14A(const char *Cmd) {
-       // flush
-       WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-       // parse
+       clearCommandBuffer();
        CmdsParse(CommandTable, Cmd);
        return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
   CmdsHelp(CommandTable);
   return 0;
 }
Impressum, Datenschutz