added initial test to emulate memory of mf ul tag

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 22b2a328fb476f824e417ffc3c1ebc2ce0e69d35..9676e6f7a63e28fe2ae64a196947220d2ed00861 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -15,7 +15,6 @@
 #include "proxmark3.h"\r
 \r
 // MIFARE\r
 #include "proxmark3.h"\r
 \r
 // MIFARE\r

-\r

 int compar_int(const void * a, const void * b) {\r
        return (*(uint64_t*)b - *(uint64_t*)a);\r
 }\r
 int compar_int(const void * a, const void * b) {\r
        return (*(uint64_t*)b - *(uint64_t*)a);\r
 }\r


@@ -65,7 +64,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        memset(resultKeys, 0x00, 16 * 6);\r
 \r
        // flush queue\r
        memset(resultKeys, 0x00, 16 * 6);\r
 \r
        // flush queue\r

-       while (!WaitForResponseTimeout(CMD_ACK,NULL,500));\r
+       WaitForResponseTimeout(CMD_ACK,NULL,100);\r

        \r
   UsbCommand c = {CMD_MIFARE_NESTED, {blockNo, keyType, trgBlockNo + trgKeyType * 0x100}};\r
        memcpy(c.d.asBytes, key, 6);\r
        \r
   UsbCommand c = {CMD_MIFARE_NESTED, {blockNo, keyType, trgBlockNo + trgKeyType * 0x100}};\r
        memcpy(c.d.asBytes, key, 6);\r


@@ -327,7 +326,10 @@ int loadTraceCard(uint8_t *tuid) {
        blockNum = 0;\r
        while(!feof(f)){\r
                memset(buf, 0, sizeof(buf));\r
        blockNum = 0;\r
        while(!feof(f)){\r
                memset(buf, 0, sizeof(buf));\r

-               fgets(buf, sizeof(buf), f);\r
+               if (fgets(buf, sizeof(buf), f) == NULL) {\r
+      PrintAndLog("File reading error.");\r
+                       return 2;\r
+    }\r

 \r
                if (strlen(buf) < 32){\r
                        if (feof(f)) break;\r
 \r
                if (strlen(buf) < 32){\r
                        if (feof(f)) break;\r