FIX: maybe I should actually send the uid bytes with the command request....

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8448731e9c7bd21588f67bb4e1c04a9660d0d3da..1d2de683fed5cd572f071b3791f7787f5459f489 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -521,14 +521,12 @@ int CmdHF14AMfDump(const char *Cmd)
 \r
        int size = GetCardSize();               \r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
        int size = GetCardSize();               \r
        char cmdp = param_getchar(Cmd, 0);\r

-       \r
-       PrintAndLog("Got %d",size);\r
-       \r
-       return 0;\r
-       \r
+\r

        if  ( size > -1) \r
        if  ( size > -1) \r

-               cmdp = (char)48+size;\r
-       \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


@@ -548,7 +546,7 @@ int CmdHF14AMfDump(const char *Cmd)
        }\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
        }\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r

-               PrintAndLog("Could not find file dumpkeys.bin");\r
+               PrintAndLog("Could not find file dumpkeys.bin");                \r

                return 1;\r
        }\r
        \r
                return 1;\r
        }\r
        \r


@@ -556,6 +554,7 @@ int CmdHF14AMfDump(const char *Cmd)
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
                        PrintAndLog("File reading error.");\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
                        PrintAndLog("File reading error.");\r

+                       fclose(fin);\r

                        return 2;\r
                }\r
        }\r
                        return 2;\r
                }\r
        }\r


@@ -564,10 +563,13 @@ int CmdHF14AMfDump(const char *Cmd)
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r
                        PrintAndLog("File reading error.");\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r
                        PrintAndLog("File reading error.");\r

+                       fclose(fin);\r

                        return 2;\r
                }\r
        }\r
        \r
                        return 2;\r
                }\r
        }\r
        \r

+       fclose(fin);\r
+       \r

        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r


@@ -673,7 +675,6 @@ int CmdHF14AMfDump(const char *Cmd)
                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
        \r
                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
        \r

-       fclose(fin);\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -1169,11 +1170,12 @@ int CmdHF14AMfChk(const char *Cmd)
                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r
                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r

+                               fclose(f);\r

                        } else {\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r
                        } else {\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                free(keyBlock);\r
                                return 1;\r

-                       fclose(f);\r
+                       \r

                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r


@@ -1454,6 +1456,7 @@ int CmdHF14AMfELoad(const char *Cmd)
                                break;\r
                        }\r
                        PrintAndLog("File reading error.");\r
                                break;\r
                        }\r
                        PrintAndLog("File reading error.");\r

+                       fclose(f);\r

                        return 2;\r
                }\r
                if (strlen(buf) < 32){\r
                        return 2;\r
                }\r
                if (strlen(buf) < 32){\r


@@ -1478,6 +1481,7 @@ int CmdHF14AMfELoad(const char *Cmd)
        \r
        if ((blockNum != 16*4) && (blockNum != 32*4 + 8*16)) {\r
                PrintAndLog("File content error. There must be 64 or 256 blocks.");\r
        \r
        if ((blockNum != 16*4) && (blockNum != 32*4 + 8*16)) {\r
                PrintAndLog("File content error. There must be 64 or 256 blocks.");\r

+               fclose(f);\r

                return 4;\r
        }\r
        PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);\r
                return 4;\r
        }\r
        PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);\r


@@ -1610,8 +1614,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r

-       uint8_t uid[8];\r
-       uint8_t oldUid[8];\r
+       uint8_t uid[8] = {0x00};\r
+       uint8_t oldUid[8] = {0x00};\r

        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r