FIX: Mental note to self, bitnumber 4 is used, not the value 4 which would be bitnum...

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 909045d34364d9bc1b35ee15af9d4e039414dba1..1bcc384a50a8cc8d739265a62b4897ed0c5c9a6a 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -11,15 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>

-#include "proxmark3.h"
-#include "ui.h"
-#include "util.h"
-#include "graph.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#include "cmdlf.h"

 #include "cmdlfem4x.h"
 #include "cmdlfem4x.h"

-#include "lfdemod.h"
+

 char *global_em410xId;
 
 static int CmdHelp(const char *Cmd);
 char *global_em410xId;
 
 static int CmdHelp(const char *Cmd);


@@ -47,7 +40,7 @@ int CmdEM410xRead(const char *Cmd)
        uint32_t hi=0;
        uint64_t lo=0;
 
        uint32_t hi=0;
        uint64_t lo=0;
 

-       if(!AskEm410xDemod("", &hi, &lo)) return 0;
+       if(!AskEm410xDemod("", &hi, &lo, false)) return 0;

        PrintAndLog("EM410x pattern found: ");
        printEM410x(hi, lo);
        if (hi){
        PrintAndLog("EM410x pattern found: ");
        printEM410x(hi, lo);
        if (hi){


@@ -55,7 +48,8 @@ int CmdEM410xRead(const char *Cmd)
                return 0;
        }
        char id[12] = {0x00};
                return 0;
        }
        char id[12] = {0x00};

-       sprintf(id, "%010llx",lo);
+       //sprintf(id, "%010llx",lo);
+        sprintf(id, "%010"PRIu64, lo); 

        
        global_em410xId = id;
        return 1;
        
        global_em410xId = id;
        return 1;


@@ -70,22 +64,23 @@ int CmdEM410xSim(const char *Cmd)
        uint8_t uid[5] = {0x00};
 
        if (cmdp == 'h' || cmdp == 'H') {
        uint8_t uid[5] = {0x00};
 
        if (cmdp == 'h' || cmdp == 'H') {

-               PrintAndLog("Usage:  lf em4x 410xsim <UID>");
+               PrintAndLog("Usage:  lf em4x em410xsim <UID> <clock>");

                PrintAndLog("");
                PrintAndLog("");

-               PrintAndLog("     sample: lf em4x 410xsim 0F0368568B");
+               PrintAndLog("     sample: lf em4x em410xsim 0F0368568B");

                return 0;
        }
                return 0;
        }

+       /* clock is 64 in EM410x tags */
+       uint8_t clock = 64;

 
        if (param_gethex(Cmd, 0, uid, 10)) {
                PrintAndLog("UID must include 10 HEX symbols");
                return 0;
        }
 
        if (param_gethex(Cmd, 0, uid, 10)) {
                PrintAndLog("UID must include 10 HEX symbols");
                return 0;
        }

+       param_getdec(Cmd, 1, &clock);

        
        

-       PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+       PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);

        PrintAndLog("Press pm3-button to about simulation");
 
        PrintAndLog("Press pm3-button to about simulation");
 

-       /* clock is 64 in EM410x tags */
-       int clock = 64;

 
        /* clear our graph */
        ClearGraph(0);
 
        /* clear our graph */
        ClearGraph(0);


@@ -169,7 +164,7 @@ int CmdEM410xWrite(const char *Cmd)
 {
        uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
        int card = 0xFF; // invalid card value
 {
        uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
        int card = 0xFF; // invalid card value

-       unsigned int clock = 0; // invalid clock value
+       uint32_t clock = 0; // invalid clock value

 
        sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
 
 
        sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
 


@@ -194,21 +189,13 @@ int CmdEM410xWrite(const char *Cmd)
        }
 
        // Check Clock
        }
 
        // Check Clock

-       if (card == 1)
-       {

                // Default: 64
                // Default: 64

-               if (clock == 0)
-                       clock = 64;
+       if (clock == 0)
+               clock = 64;

 
 

-               // Allowed clock rates: 16, 32 and 64
-               if ((clock != 16) && (clock != 32) && (clock != 64)) {
-                       PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32 and 64.\n", clock);
-                       return 0;
-               }
-       }
-       else if (clock != 0)
-       {
-               PrintAndLog("Error! Clock rate is only supported on T55x7 tags.\n");
+       // Allowed clock rates: 16, 32, 40 and 64
+       if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
+               PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);

                return 0;
        }
 
                return 0;
        }
 


@@ -218,18 +205,17 @@ int CmdEM410xWrite(const char *Cmd)
                //   provide for backwards-compatibility for older firmware, and to avoid
                //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
                //   the clock rate in bits 8-15 of the card value
                //   provide for backwards-compatibility for older firmware, and to avoid
                //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
                //   the clock rate in bits 8-15 of the card value

-               card = (card & 0xFF) | (((uint64_t)clock << 8) & 0xFF00);
-       }
-       else if (card == 0)
+               card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+       }       else if (card == 0) {

                PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
                PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);

-       else {
+               card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+       } else {

                PrintAndLog("Error! Bad card type selected.\n");
                return 0;
        }
 
        UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
        SendCommand(&c);
                PrintAndLog("Error! Bad card type selected.\n");
                return 0;
        }
 
        UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
        SendCommand(&c);

-

        return 0;
 }
 
        return 0;
 }
 


@@ -455,7 +441,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
                else
                        phaseoff = 0;
                i += 2;
                else
                        phaseoff = 0;
                i += 2;

-               if (ASKmanDemod(tmp2, false, false) < 1) {
+               if (ASKDemod(tmp2, false, false, 1) < 1) {

                        save_restoreGB(0);
                        return 0;
                }
                        save_restoreGB(0);
                        return 0;
                }


@@ -604,11 +590,11 @@ static command_t CommandTable[] =
 {
        {"help", CmdHelp, 1, "This help"},
        {"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  
 {
        {"help", CmdHelp, 1, "This help"},
        {"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  

-       {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
+       {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},

        {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
        {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
        {"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
        {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
        {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
        {"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },

-       {"em410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
+       {"em410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},

        {"em4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
        {"readword", CmdReadWord, 1, "<Word> -- Read EM4xxx word data"},
        {"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},
        {"em4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
        {"readword", CmdReadWord, 1, "<Word> -- Read EM4xxx word data"},
        {"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},


@@ -617,14 +603,13 @@ static command_t CommandTable[] =
        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };
 

-int CmdLFEM4X(const char *Cmd)
-{
+int CmdLFEM4X(const char *Cmd) {
+       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;
 }