]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
FIX: CoverityScan 123465 - Resource leak
[proxmark3-svn] / client / cmdhf14a.c
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 0527ad4d7bcee4eaa846d8961f08492d273f430c..b5a90b38163f197493955feac70e52ca9d182537 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -24,9 +24,8 @@
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
-#include "nonce2key/crapto1.h"
-
-#define llx PRIx64
+#include "nonce2key/nonce2key.h"
+#include "cmdhf.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
@@ -127,17 +126,61 @@ char* getTagInfo(uint8_t uid) {
        return manufactureMapping[len-1].desc; 
 }
 
        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("\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;
 }
 
        return 0;
 }
 
-int CmdHF14AReader(const char *Cmd)
-{
+int CmdHF14AList(const char *Cmd) {
+       //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+       CmdHFList("14a");
+       return 0;
+}
+
+int CmdHF14AReader(const char *Cmd) {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       clearCommandBuffer();
        SendCommand(&c);
        SendCommand(&c);
-
        UsbCommand resp;
        WaitForResponse(CMD_ACK,&resp);
        
        UsbCommand resp;
        WaitForResponse(CMD_ACK,&resp);
        
@@ -185,6 +228,7 @@ int CmdHF14AReader(const char *Cmd)
                        c.arg[1] = 0;
                        c.arg[2] = 0;
 
                        c.arg[1] = 0;
                        c.arg[2] = 0;
 
+                       clearCommandBuffer();
                        SendCommand(&c);
 
                        UsbCommand resp;
                        SendCommand(&c);
 
                        UsbCommand resp;
@@ -248,6 +292,7 @@ int CmdHF14AReader(const char *Cmd)
                c.arg[1] = 2;
                c.arg[2] = 0;
                memcpy(c.d.asBytes, rats, 2);
                c.arg[1] = 2;
                c.arg[2] = 0;
                memcpy(c.d.asBytes, rats, 2);
+               clearCommandBuffer();
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
                
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
                
@@ -345,16 +390,16 @@ int CmdHF14AReader(const char *Cmd)
                                                PrintAndLog("                     x0 -> <1 kByte");
                                                break;
                                        case 0x01:
                                                PrintAndLog("                     x0 -> <1 kByte");
                                                break;
                                        case 0x01:
-                                               PrintAndLog("                     x0 -> 1 kByte");
+                                               PrintAndLog("                     x1 -> 1 kByte");
                                                break;
                                        case 0x02:
                                                break;
                                        case 0x02:
-                                               PrintAndLog("                     x0 -> 2 kByte");
+                                               PrintAndLog("                     x2 -> 2 kByte");
                                                break;
                                        case 0x03:
                                                break;
                                        case 0x03:
-                                               PrintAndLog("                     x0 -> 4 kByte");
+                                               PrintAndLog("                     x3 -> 4 kByte");
                                                break;
                                        case 0x04:
                                                break;
                                        case 0x04:
-                                               PrintAndLog("                     x0 -> 8 kByte");
+                                               PrintAndLog("                     x4 -> 8 kByte");
                                                break;
                                }
                                switch (card.ats[pos + 3] & 0xf0) {
                                                break;
                                }
                                switch (card.ats[pos + 3] & 0xf0) {
@@ -395,14 +440,17 @@ int CmdHF14AReader(const char *Cmd)
 
        
        // try to see if card responses to "chinese magic backdoor" commands.
 
        
        // 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);
        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;
        
        // disconnect
        c.cmd = CMD_READER_ISO_14443a;
@@ -415,8 +463,7 @@ int CmdHF14AReader(const char *Cmd)
 }
 
 // Collect ISO14443 Type A UIDs
 }
 
 // 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)
        // requested number of UIDs
        int n = atoi(Cmd);
        // collect at least 1 (e.g. if no parameter was given)
@@ -447,44 +494,25 @@ int CmdHF14ACUIDs(const char *Cmd)
                }
        }
        PrintAndLog("End: %u", time(NULL));
                }
        }
        PrintAndLog("End: %u", time(NULL));
-
        return 1;
 }
 
        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
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
-int CmdHF14ASim(const char *Cmd)
-{
+int CmdHF14ASim(const char *Cmd) {
        bool errors = FALSE;
        uint8_t flags = 0;
        bool errors = FALSE;
        uint8_t flags = 0;
-       uint8_t tagtype = 1;
-       uint64_t uid = 0;
+       uint8_t tagtype = 1;    
        uint8_t cmdp = 0;
        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;
+       uint8_t data[40];
+       uint64_t key = 0;
+       UsbCommand resp;
+       bool useUIDfromEML = TRUE;
+
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
                        case 'h':
                        case 'H':
                                return usage_hf_14a_sim();
                        case 'h':
                        case 'H':
                                return usage_hf_14a_sim();
@@ -498,17 +526,17 @@ int CmdHF14ASim(const char *Cmd)
                                break;
                        case 'u':
                        case 'U':
                                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;
                                }
                                cmdp += 2;
                                break;
@@ -528,141 +556,39 @@ int CmdHF14ASim(const char *Cmd)
        //Validations
        if (errors) return usage_hf_14a_sim();
 
        //Validations
        if (errors) return usage_hf_14a_sim();
 
+       if ( useUIDfromEML ) 
+               flags |= FLAG_UID_IN_EMUL;
+       
        PrintAndLog("Press pm3-button to abort simulation");
        
        PrintAndLog("Press pm3-button to abort simulation");
        
-       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
-       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);        
 
        while(!ukbhit()){
        SendCommand(&c);        
 
        while(!ukbhit()){
-               UsbCommand resp;
-               WaitForResponseTimeout(CMD_ACK,&resp,1500);
-               PrintAndLog("Got %04X %02X", resp.arg[0], resp.arg[0]);
-               if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
-                       uint8_t data[40];
-                       uint8_t key[6];
-                       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("--");
-                       memset(data,0x00, 40);
+               if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+                       if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
+                               memset(data, 0x00, sizeof(data));
+                               int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
+                               memcpy(data, resp.d.asBytes, len);
+                               key = 0;
+                               
+                               if ( flags & FLAG_NR_AR_ATTACK ) {
+                                       bool found = tryMfk32(data, &key);
+                                       found ^= tryMfk32_moebius(data, &key);
+                               }
+                       }
                }
        }
        return 0;
 }
 
                }
        }
        return 0;
 }
 
-int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
-
-       struct Crypto1State *s,*t;
-       uint64_t key;     // recovered key
-       uint32_t uid;     // serial number
-       uint32_t nt;      // tag challenge
-       uint32_t nr0_enc; // first encrypted reader challenge
-       uint32_t ar0_enc; // first encrypted reader response
-       uint32_t nr1_enc; // second encrypted reader challenge
-       uint32_t ar1_enc; // second encrypted reader response   
-       bool isSuccess = FALSE;
-       int counter = 0;
-       
-       uid     = myuid;//(uint32_t)bytes_to_num(data +  0, 4);
-       nt              = *(uint32_t*)(data+8);
-       nr0_enc = *(uint32_t*)(data+12);
-       ar0_enc = *(uint32_t*)(data+16);
-       nr1_enc = *(uint32_t*)(data+32);
-       ar1_enc = *(uint32_t*)(data+36);
-
-       // PrintAndLog("Recovering key for:");
-       // PrintAndLog("    uid: %08x",uid);
-       // PrintAndLog("     nt: %08x",nt);
-       // PrintAndLog(" {nr_0}: %08x",nr0_enc);
-       // PrintAndLog(" {ar_0}: %08x",ar0_enc);
-       // PrintAndLog(" {nr_1}: %08x",nr1_enc);
-       // PrintAndLog(" {ar_1}: %08x",ar1_enc);
-
-       s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
-  
-       for(t = s; t->odd | t->even; ++t) {
-               lfsr_rollback_word(t, 0, 0);
-               lfsr_rollback_word(t, nr0_enc, 1);
-               lfsr_rollback_word(t, uid ^ nt, 0);
-               crypto1_get_lfsr(t, &key);
-               crypto1_word(t, uid ^ nt, 0);
-               crypto1_word(t, nr1_enc, 1);
-               if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
-                       PrintAndLog("Found Key: [%012"llx"]",key);
-                       isSuccess = TRUE;
-                       ++counter;
-                       if (counter==10)
-                               break;
-               }
-       }
-       free(s);
-       return isSuccess;
-}
-
-int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
-
-       struct Crypto1State *revstate;
-       uint64_t key;     // recovered key
-       uint32_t uid;     // serial number
-       uint32_t nt;      // tag challenge
-       uint32_t nr_enc;  // encrypted reader challenge
-       uint32_t ar_enc;  // encrypted reader response
-       uint32_t at_enc;  // encrypted tag response
-       uint32_t ks2;     // keystream used to encrypt reader response
-       uint32_t ks3;     // keystream used to encrypt tag response
-
-       struct Crypto1State mpcs = {0, 0};
-       struct Crypto1State *pcs;
-       pcs = &mpcs;
-       
-
-
-       uid     = myuid;//(uint32_t)bytes_to_num(data +  0, 4);
-       nt              = *(uint32_t*)(data+8);
-       nr_enc = *(uint32_t*)(data+12);
-       ar_enc = *(uint32_t*)(data+16);
-       
-       crypto1_word(pcs, nr_enc , 1);
-       at_enc = prng_successor(nt, 96) ^ crypto1_word(pcs, 0, 0);
-
-       // printf("Recovering key for:\n");
-       // printf("  uid: %08x\n",uid);
-       // printf("   nt: %08x\n",nt);
-       // printf(" {nr}: %08x\n",nr_enc);
-       // printf(" {ar}: %08x\n",ar_enc);
-       // printf(" {at}: %08x\n",at_enc);
-
-       // Extract the keystream from the messages
-       ks2 = ar_enc ^ prng_successor(nt, 64);
-       ks3 = at_enc ^ prng_successor(nt, 96);
-
-       revstate = lfsr_recovery64(ks2, ks3);
-       lfsr_rollback_word(revstate, 0, 0);
-       lfsr_rollback_word(revstate, 0, 0);
-       lfsr_rollback_word(revstate, nr_enc, 1);
-       lfsr_rollback_word(revstate, uid ^ nt, 0);
-       crypto1_get_lfsr(revstate, &key);
-       PrintAndLog("Found Key: [%012"llx"]",key);
-       crypto1_destroy(revstate);
-       crypto1_destroy(pcs);
-       return 0;
-}
-
 int CmdHF14ASniff(const char *Cmd) {
        int param = 0;
        
        uint8_t ctmp = param_getchar(Cmd, 0) ;
 int CmdHF14ASniff(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.");
-               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);
        
        for (int i = 0; i < 2; i++) {
                ctmp = param_getchar(Cmd, i);
@@ -671,11 +597,11 @@ int CmdHF14ASniff(const char *Cmd) {
        }
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
        }
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+  clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
   SendCommand(&c);
   return 0;
 }
 
-
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;
@@ -693,19 +619,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        uint16_t datalen=0;
        uint32_t temp;
 
        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++;
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
@@ -714,6 +628,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
         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;
                 case 'r': 
                     reply = FALSE;
                     break;
@@ -748,8 +665,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                                        topazmode = TRUE;
                                        break;
                 default:
                                        topazmode = TRUE;
                                        break;
                 default:
-                    PrintAndLog("Invalid option");
-                    return 0;
+                    return usage_hf_14a_raw();
             }
             i+=2;
             continue;
             }
             i+=2;
             continue;
@@ -814,11 +730,14 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
        if(topazmode)
                c.arg[0] |= ISO14A_TOPAZMODE;
 
        if(topazmode)
                c.arg[0] |= ISO14A_TOPAZMODE;
-               
+                       
        // Max buffer is USB_CMD_DATA_SIZE
        // 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) {
     SendCommand(&c);
 
     if (reply) {
@@ -830,29 +749,16 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
     return 0;
 }
 
-
-static void waitCmd(uint8_t iSelect)
-{
-    uint8_t *recv;
+static void waitCmd(uint8_t iSelect) {
     UsbCommand resp;
     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;
             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.");
     }
     } else {
         PrintAndLog("timeout while waiting for reply.");
     }
@@ -871,16 +777,12 @@ static command_t CommandTable[] =
 };
 
 int CmdHF14A(const char *Cmd) {
 };
 
 int CmdHF14A(const char *Cmd) {
-       // flush
-       WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-       // parse
+       clearCommandBuffer();
        CmdsParse(CommandTable, Cmd);
        return 0;
 }
 
        CmdsParse(CommandTable, Cmd);
        return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
   CmdsHelp(CommandTable);
   return 0;
 }
   CmdsHelp(CommandTable);
   return 0;
 }
Proxmark3 GIT tracking
Impressum, Datenschutz