REM: removed a debug function call, PrintToSendBuffer

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8d15f73142494390c69b9129313bad559cdfbbe2..6665c3e87ebfff82d1515ad347ad046d556bba39 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -27,8 +27,6 @@
 #include "nonce2key/nonce2key.h"
 #include "cmdhf.h"
 
 #include "nonce2key/nonce2key.h"
 #include "cmdhf.h"
 

-#define llx PRIx64
-

 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
 


@@ -128,9 +126,9 @@ char* getTagInfo(uint8_t uid) {
        return manufactureMapping[len-1].desc; 
 }
 
        return manufactureMapping[len-1].desc; 
 }
 

-

 int usage_hf_14a_sim(void) {
 int usage_hf_14a_sim(void) {

-       PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
+//     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("Usage: hf 14a sim t <type> u <uid> x");
        PrintAndLog("  Options : ");
        PrintAndLog("    h     : this help");


@@ -141,10 +139,13 @@ int usage_hf_14a_sim(void) {
        PrintAndLog("            5 = MIFARE Tnp3xxx");
        PrintAndLog("            6 = MIFARE Mini");
        PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
        PrintAndLog("            5 = MIFARE Tnp3xxx");
        PrintAndLog("            6 = MIFARE Mini");
        PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");

-       PrintAndLog("    u     : 4 or 7 byte UID");
+//     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("    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");
+       PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344 x");
+       PrintAndLog("          : hf 14a sim t 1 u 1122344");
+       PrintAndLog("          : hf 14a sim t 1 u 1122344556677");
+//     PrintAndLog("          : hf 14a sim t 1 u 11223445566778899AA\n");

        return 0;
 }
 int usage_hf_14a_sniff(void){
        return 0;
 }
 int usage_hf_14a_sniff(void){


@@ -170,15 +171,13 @@ int usage_hf_14a_raw(void){
        return 0;
 }
 
        return 0;
 }
 

-int CmdHF14AList(const char *Cmd)
-{
+int CmdHF14AList(const char *Cmd) {

        //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
        CmdHFList("14a");
        return 0;
 }
 
        //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
        CmdHFList("14a");
        return 0;
 }
 

-int CmdHF14AReader(const char *Cmd)
-{
+int CmdHF14AReader(const char *Cmd) {

        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        clearCommandBuffer();
        SendCommand(&c);


@@ -464,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)


@@ -496,24 +494,25 @@ 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)
-{
+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;

+       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))
-               {
+       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();


@@ -527,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;


@@ -557,28 +556,28 @@ int CmdHF14ASim(const char *Cmd)
        //Validations
        if (errors) return usage_hf_14a_sim();
 
        //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);        
 
        clearCommandBuffer();
        SendCommand(&c);        
 

-       uint8_t data[40];
-       uint8_t key[6];
-       UsbCommand resp;

        while(!ukbhit()){
                if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                        if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
                                memset(data, 0x00, sizeof(data));
        while(!ukbhit()){
                if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                        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);
                                int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
                                memcpy(data, resp.d.asBytes, len);

-                               tryMfk32(uid, data, key);
-                               tryMfk32_moebius(uid, data, key);
-                               //tryMfk64(uid, data, key);
-                               PrintAndLog("--");
+                               key = 0;
+                               
+                               if ( flags & FLAG_NR_AR_ATTACK ) {
+                                       bool found = tryMfk32(data, &key);
+                                       found ^= tryMfk32_moebius(data, &key);
+                               }

                        }
                }
        }
                        }
                }
        }


@@ -731,10 +730,12 @@ 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);
 
        clearCommandBuffer();
     SendCommand(&c);


@@ -749,26 +750,15 @@ int CmdHF14ACmdRaw(const char *cmd) {
 }
 
 static void waitCmd(uint8_t iSelect) {
 }
 
 static void waitCmd(uint8_t iSelect) {

-    uint8_t *recv;

     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.");
     }


@@ -787,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;
 }