FIX: two parentheses were missing.

FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325)
FIX: proper initialisation of variables ;)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d9f3e6fdbac84a26a8c743ca573ad0d9c7551427..72cbf8f76780e11403794c4a00aa1e3e5c2d6613 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -96,8 +96,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

-       uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
-       \r
+       uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};  \r

        char cmdp       = 0x00;\r
 \r
        if (strlen(Cmd)<3) {\r
        char cmdp       = 0x00;\r
 \r
        if (strlen(Cmd)<3) {\r


@@ -124,10 +123,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r

-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r

        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r

-  SendCommand(&c);\r
+       SendCommand(&c);\r

 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r


@@ -144,11 +143,9 @@ int CmdHF14AMfRdBl(const char *Cmd)
 {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
 {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r

-       uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       \r
+       uint8_t key[6] = {0, 0, 0, 0, 0, 0};    \r

        char cmdp       = 0x00;\r
 \r
        char cmdp       = 0x00;\r
 \r

-\r

        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
                PrintAndLog("        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r


@@ -168,9 +165,9 @@ int CmdHF14AMfRdBl(const char *Cmd)
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        \r
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        \r

-  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r

        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes, key, 6);\r

-  SendCommand(&c);\r
+       SendCommand(&c);\r

 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
 \r
        UsbCommand resp;\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r


@@ -432,13 +429,13 @@ int CmdHF14AMfDump(const char *Cmd)
 \r
 int CmdHF14AMfRestore(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMfRestore(const char *Cmd)\r
 {\r

-       uint8_t sectorNo,blockNo;\r
+       uint8_t sectorNo,blockNo = 0;\r

        uint8_t keyType = 0;\r
        uint8_t keyType = 0;\r

-       uint8_t key[6] = {0xFF};\r
+       uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};\r

        uint8_t bldata[16] = {0x00};\r
        uint8_t keyA[40][6];\r
        uint8_t keyB[40][6];\r
        uint8_t bldata[16] = {0x00};\r
        uint8_t keyA[40][6];\r
        uint8_t keyB[40][6];\r

-       uint8_t numSectors;\r
+       uint8_t numSectors = 0;\r

        \r
        FILE *fdump;\r
        FILE *fkeys;\r
        \r
        FILE *fdump;\r
        FILE *fkeys;\r


@@ -682,6 +679,8 @@ int CmdHF14AMfNested(const char *Cmd)
                                        e_sector[i].Key[j] = key64;\r
                                        e_sector[i].foundKey[j] = 1;\r
                                }\r
                                        e_sector[i].Key[j] = key64;\r
                                        e_sector[i].foundKey[j] = 1;\r
                                }\r

+                       }\r
+               }\r

                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("nested...");\r
                // nested sectors\r
                iterations = 0;\r
                PrintAndLog("nested...");\r


@@ -786,7 +785,7 @@ int CmdHF14AMfChk(const char *Cmd)
 \r
        FILE * f;\r
        char filename[FILE_PATH_SIZE]={0};\r
 \r
        FILE * f;\r
        char filename[FILE_PATH_SIZE]={0};\r

-       char buf[13];\r
+       char buf[13]  = {0x00};\r

        uint8_t *keyBlock = NULL, *p;\r
        uint8_t stKeyBlock = 20;\r
        \r
        uint8_t *keyBlock = NULL, *p;\r
        uint8_t stKeyBlock = 20;\r
        \r


@@ -1134,11 +1133,9 @@ int CmdHF14AMfEClear(const char *Cmd)
 \r
 int CmdHF14AMfESet(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMfESet(const char *Cmd)\r
 {\r

-       uint8_t memBlock[16];\r
+       uint8_t memBlock[16] = {0x00};\r

        uint8_t blockNo = 0;\r
 \r
        uint8_t blockNo = 0;\r
 \r

-       memset(memBlock, 0x00, sizeof(memBlock));\r
-\r

        if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("Usage:  hf mf eset <block number> <block data (32 hex symbols)>");\r
                PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");\r
        if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("Usage:  hf mf eset <block number> <block data (32 hex symbols)>");\r
                PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");\r


@@ -1163,7 +1160,7 @@ int CmdHF14AMfESet(const char *Cmd)
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r

-       char filename[FILE_PATH_SIZE];\r
+       char filename[FILE_PATH_SIZE] = {0x00};\r

        char *fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        char *fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r


@@ -1259,9 +1256,9 @@ int CmdHF14AMfELoad(const char *Cmd)
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r

-       char filename[FILE_PATH_SIZE];\r
+       char filename[FILE_PATH_SIZE] = {0x00};\r

        char * fnameptr = filename;\r
        char * fnameptr = filename;\r

-       uint8_t buf[64];\r
+       uint8_t buf[64] = {0x00};\r

        int i, j, len, numBlocks;\r
        int nameParamNo = 1;\r
        \r
        int i, j, len, numBlocks;\r
        int nameParamNo = 1;\r
        \r


@@ -1383,8 +1380,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 {\r
        int i;\r
        uint8_t numSectors;\r
 {\r
        int i;\r
        uint8_t numSectors;\r

-       uint8_t data[16];\r
-       uint64_t keyA, keyB;\r
+       uint8_t data[16] = {0x00};\r
+       uint64_t keyA, keyB = 0;\r

        \r
        if (param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r
        \r
        if (param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r


@@ -1627,10 +1624,9 @@ int CmdHF14AMfCLoad(const char *Cmd)
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r

-       uint8_t memBlock[16];\r
+       uint8_t memBlock[16] = {0x00};\r

        uint8_t blockNo = 0;\r
        int res;\r
        uint8_t blockNo = 0;\r
        int res;\r

-       memset(memBlock, 0x00, sizeof(memBlock));\r

 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("Usage:  hf mf cgetblk <block number>");\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
                PrintAndLog("Usage:  hf mf cgetblk <block number>");\r


@@ -1797,7 +1793,7 @@ int CmdHF14AMfSniff(const char *Cmd){
        int blockLen = 0;\r
        int pckNum = 0;\r
        int num = 0;\r
        int blockLen = 0;\r
        int pckNum = 0;\r
        int num = 0;\r

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

        uint8_t uid_len;\r
        uint8_t atqa[2] = {0x00};\r
        uint8_t sak;\r
        uint8_t uid_len;\r
        uint8_t atqa[2] = {0x00};\r
        uint8_t sak;\r