]> git.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
CHG: moved includes into header file where it belong
[proxmark3-svn] / client / cmdhf14a.c
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 1a31c71f101b82d019c3b11e86e3a61b32f541ab..b5a90b38163f197493955feac70e52ca9d182537 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -23,6 +23,9 @@
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
+#include "cmdhfmfu.h"
+#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);
@@ -123,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);
        
@@ -143,7 +190,7 @@ int CmdHF14AReader(const char *Cmd)
        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) {
-               PrintAndLog("iso14443a card select failed");
+               if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
                // disconnect
                c.arg[0] = 0;
                c.arg[1] = 0;
                // disconnect
                c.arg[0] = 0;
                c.arg[1] = 0;
@@ -163,19 +210,40 @@ int CmdHF14AReader(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 
-
-       PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
        PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
        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 [%d]", card.sak, resp.arg[0]);
 
-       // 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]));
-       }
-
        switch (card.sak) {
                case 0x00: 
        switch (card.sak) {
                case 0x00: 
+
+                       //***************************************test****************
+                       ul_switch_off_field();
+                       
+                       uint32_t tagT = GetHF14AMfU_Type();
+                       ul_print_type(tagT, 0);
+
+                       //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);
+                       
+                       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) {
+                               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;
                        // check if the tag answers to GETVERSION (0x60)
                        c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
                        c.arg[1] = 1;
@@ -184,17 +252,17 @@ int CmdHF14AReader(const char *Cmd)
                        SendCommand(&c);
                        WaitForResponse(CMD_ACK,&resp);
                
                        SendCommand(&c);
                        WaitForResponse(CMD_ACK,&resp);
                
-                       uint8_t version[8] = {0x00};
-                       memcpy(&version, resp.d.asBytes, resp.arg[0]);
-                       uint8_t isOK  = resp.arg[0] & 0xff;
-                       if ( isOK ){                    
-                               // size of tag, check version[4] == 0x0b == smaller.
-                               PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);
-                       }
-                       else {
-                               PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C");
+                       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;
                        break;
                case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
@@ -212,6 +280,11 @@ int CmdHF14AReader(const char *Cmd)
                default: ;
        }
 
                default: ;
        }
 
+       // Double & triple sized UID, can be mapped to a manufacturer.
+       if ( card.uidlen > 4 ) {
+               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+       }
+       
        // try to request ATS even if tag claims not to support it
        if (select_status == 2) {
                uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
        // try to request ATS even if tag claims not to support it
        if (select_status == 2) {
                uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
@@ -219,10 +292,11 @@ 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);
                
-           memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+           memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
                card.ats_len = resp.arg[0];                             // note: ats_len includes CRC Bytes
        } 
 
                card.ats_len = resp.arg[0];                             // note: ats_len includes CRC Bytes
        } 
 
@@ -316,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) {
@@ -366,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;
@@ -386,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)
@@ -418,105 +494,101 @@ int CmdHF14ACUIDs(const char *Cmd)
                }
        }
        PrintAndLog("End: %u", time(NULL));
                }
        }
        PrintAndLog("End: %u", time(NULL));
-
        return 1;
 }
 
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
        return 1;
 }
 
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
-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("");
-               PrintAndLog(" Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID");
-               PrintAndLog("");
-               PrintAndLog("   syntax: hf 14a sim <type> <uid>");
-               PrintAndLog("    types: 1 = MIFARE Classic");
-               PrintAndLog("           2 = MIFARE Ultralight");
-               PrintAndLog("           3 = MIFARE Desfire");
-               PrintAndLog("           4 = ISO/IEC 14443-4");
-               PrintAndLog("           5 = MIFARE Tnp3xxx");           
-               PrintAndLog("");
-               return 1;
+int CmdHF14ASim(const char *Cmd) {
+       bool errors = FALSE;
+       uint8_t flags = 0;
+       uint8_t tagtype = 1;    
+       uint8_t cmdp = 0;
+       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 't':
+                       case 'T':
+                               // Retrieve the tag type
+                               tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+                               if (tagtype == 0)
+                                       errors = true; 
+                               cmdp += 2;
+                               break;
+                       case 'u':
+                       case 'U':
+                               // 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 'x':
+                       case 'X':
+                               flags |= FLAG_NR_AR_ATTACK;
+                               cmdp++;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = true;
+                               break;
+                       }
+               if(errors) break;
        }
        }
+
+       //Validations
+       if (errors) return usage_hf_14a_sim();
+
+       if ( useUIDfromEML ) 
+               flags |= FLAG_UID_IN_EMUL;
        
        
-       // Store the tag type
-       c.arg[0] = tagtype;
+       PrintAndLog("Press pm3-button to abort simulation");
        
        
-       // 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?
-       if (long_uid > 0xffffffff) {
-               PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",long_uid);
-               // Store the second part
-               c.arg[2] = (long_uid & 0xffffffff);
-               long_uid >>= 32;
-               // Store the first part, ignore the first byte, it is replaced by cascade byte (0x88)
-               c.arg[1] = (long_uid & 0xffffff);
-       } else {
-               PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",long_uid);
-               // Only store the first part
-               c.arg[1] = long_uid & 0xffffffff;
-       }
-/*
-               // At lease save the mandatory first part of the UID
-               c.arg[0] = long_uid & 0xffffffff;
-
-       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]);
+       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};     
+       memcpy(c.d.asBytes, uid, uidlen>>1);
+       clearCommandBuffer();
+       SendCommand(&c);        
+
+       while(!ukbhit()){
+               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);
+                               }
+                       }
+               }
        }
        }
-       
-       switch (c.arg[0]) {
-               case 1: {
-                       PrintAndLog("Emulating ISO/IEC 14443-3 type A tag with 4 byte UID");
-                       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)};
-               } break;
-               case 2: {
-                       PrintAndLog("Emulating ISO/IEC 14443-4 type A tag with 7 byte UID");
-               } break;
-               default: {
-                       PrintAndLog("Error: unkown tag type (%d)",c.arg[0]);
-                       PrintAndLog("syntax: hf 14a sim <uid>",c.arg[0]);
-                       PrintAndLog(" type1: 4 ",c.arg[0]);
-
-                       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);
-  }
-*/
-//     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;
+       return 0;
 }
 
 }
 
-int CmdHF14ASnoop(const char *Cmd) {
+int CmdHF14ASniff(const char *Cmd) {
        int param = 0;
        
        uint8_t ctmp = param_getchar(Cmd, 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 snoop [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 snoop 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);
@@ -525,11 +597,11 @@ int CmdHF14ASnoop(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;
@@ -547,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++;
@@ -568,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;
@@ -602,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;
@@ -619,7 +681,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
                 *buf=0;
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
                 *buf=0;
-                               if (++datalen>sizeof(data)){
+                               if (++datalen >= sizeof(data)){
                                        if (crc)
                                                PrintAndLog("Buffer is full, we can't add CRC to your data");
                                        break;
                                        if (crc)
                                                PrintAndLog("Buffer is full, we can't add CRC to your data");
                                        break;
@@ -637,7 +699,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                if (topazmode) {
                        ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
                } else {
                if (topazmode) {
                        ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
                } else {
-        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+                       ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
                }
         data[datalen++] = first;
         data[datalen++] = second;
                }
         data[datalen++] = first;
         data[datalen++] = second;
@@ -668,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) {
@@ -684,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.");
     }
@@ -719,22 +771,18 @@ static command_t CommandTable[] =
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
   {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
   {"sim",    CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
   {"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"},
+  {"sniff",  CmdHF14ASniff,        0, "sniff ISO 14443 Type A traffic"},
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };
 
 int CmdHF14A(const char *Cmd) {
   {"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;
+       clearCommandBuffer();
+       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