Update cmdhf14a.c

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 5b4a0b2a401a48ead9d8e7375c3211047a40061b..d909cd8c8f9e1fa690ad93871955c0381d53e5a4 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -19,6 +19,7 @@
 #include "cmdmain.h"\r
 #include "cmdhfmfhard.h"\r
 #include "util.h"\r
 #include "cmdmain.h"\r
 #include "cmdhfmfhard.h"\r
 #include "util.h"\r

+#include "util_posix.h"\r

 #include "usb_cmd.h"\r
 #include "ui.h"\r
 #include "mifarehost.h"\r
 #include "usb_cmd.h"\r
 #include "ui.h"\r
 #include "mifarehost.h"\r


@@ -905,7 +906,7 @@ int CmdHF14AMfChk(const char *Cmd)
        char filename[FILE_PATH_SIZE]={0};\r
        char buf[13];\r
        uint8_t *keyBlock = NULL, *p;\r
        char filename[FILE_PATH_SIZE]={0};\r
        char buf[13];\r
        uint8_t *keyBlock = NULL, *p;\r

-       uint8_t stKeyBlock = 20;\r
+       uint16_t stKeyBlock = 20;\r

        \r
        int i, res;\r
        int     keycnt = 0;\r
        \r
        int i, res;\r
        int     keycnt = 0;\r


@@ -970,6 +971,7 @@ int CmdHF14AMfChk(const char *Cmd)
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r

+               free(keyBlock);\r

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


@@ -1120,7 +1122,8 @@ int CmdHF14AMfChk(const char *Cmd)
 }\r
 \r
 void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
 }\r
 \r
 void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r

-       #define ATTACK_KEY_COUNT 8 // keep same as define in iso14443a.c -> Mifare1ksim()\r
+       #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim()\r
+                                  // cannot be more than 7 or it will overrun c.d.asBytes(512)\r

        uint64_t key = 0;\r
        typedef struct {\r
                        uint64_t keyA;\r
        uint64_t key = 0;\r
        typedef struct {\r
                        uint64_t keyA;\r