ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.

minor code clean up.

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1948848e6452ddd161391cf383d205f01f0cecb9..7a33afbba343a545d19bcebf98cea8dac44d6bf8 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -587,7 +587,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        };\r
 \r
                        nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
                        };\r
 \r
                        nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r

-                       for (i = 141; i < 1200; i++) {\r
+                       for (i = 101; i < 1200; i++) {\r

                                nttmp = prng_successor(nttmp, 1);\r
                                if (nttmp == nt2) break;\r
                        }\r
                                nttmp = prng_successor(nttmp, 1);\r
                                if (nttmp == nt2) break;\r
                        }\r

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index e91a87c1d0f9a0fbe756deaa2693faa45d22feb6..1859819194c66bd2e1ddd41230d6a2e85e0b4b01 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -19,7 +19,7 @@
 #include "crapto1.h"\r
 #include "mifareutil.h"\r
 \r
 #include "crapto1.h"\r
 #include "mifareutil.h"\r
 \r

-int MF_DBGLEVEL = MF_DBG_ERROR;\r
+int MF_DBGLEVEL = MF_DBG_ALL;\r

 \r
 // memory management\r
 uint8_t* get_bigbufptr_recvrespbuf(void) {\r
 \r
 // memory management\r
 uint8_t* get_bigbufptr_recvrespbuf(void) {\r

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 703e4c8becefc785ddace74167ac945d94d2613a..cbe94efe22900afad7b1171a88f4ca8bc6cc3d16 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -278,14 +278,7 @@ int CmdHF14AMfDump(const char *Cmd)
        \r
        UsbCommand resp;\r
 \r
        \r
        UsbCommand resp;\r
 \r

-       int size = GetCardSize();               \r

        char cmdp = param_getchar(Cmd, 0);\r
        char cmdp = param_getchar(Cmd, 0);\r

-\r
-       if  ( size > -1) \r
-               cmdp = (char)(48+size);\r
-\r
-       PrintAndLog("Got %d",cmdp);\r
-               \r

        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r
        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r

diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index 2282f64e08a3a98e210d9cee7d5d095344e95dbf..38f9aab9128a48e1758ba3a79e46a2926c3be90f 100644 (file)
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -16,6 +16,7 @@ int CmdEMdemodASK(const char *Cmd);
 int CmdEM410xRead(const char *Cmd);
 int CmdEM410xSim(const char *Cmd);
 int CmdEM410xWatch(const char *Cmd);
 int CmdEM410xRead(const char *Cmd);
 int CmdEM410xSim(const char *Cmd);
 int CmdEM410xWatch(const char *Cmd);

+int CmdEM410xWatchnSpoof(const char *Cmd);

 int CmdEM410xWrite(const char *Cmd);
 int CmdEM4x50Read(const char *Cmd);
 int CmdReadWord(const char *Cmd);
 int CmdEM410xWrite(const char *Cmd);
 int CmdEM4x50Read(const char *Cmd);
 int CmdReadWord(const char *Cmd);