CHG: this makefile should compile on Ubuntu 1404 without problems. The QT4-5 detect...

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index e10b24d054781dafe9c036a0d034c852b56b3cd6..d104d7d77e37d6f9aa4698ca92a0da225058817a 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1377,6 +1377,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
        char buf[9];\r
        char filename[FILE_PATH_SIZE]={0};\r
        int     keycnt = 0;\r
        char buf[9];\r
        char filename[FILE_PATH_SIZE]={0};\r
        int     keycnt = 0;\r

+       int c;\r

        uint8_t stKeyBlock = 20;\r
        uint8_t *keyBlock = NULL, *p = NULL;\r
        keyBlock = calloc(stKeyBlock, 6);\r
        uint8_t stKeyBlock = 20;\r
        uint8_t *keyBlock = NULL, *p = NULL;\r
        keyBlock = calloc(stKeyBlock, 6);\r


@@ -1451,10 +1452,10 @@ int CmdT55xxBruteForce(const char *Cmd) {
                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r
                        if (ukbhit()) {\r
                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r
                        if (ukbhit()) {\r

-                               getchar();\r
+                               c = getchar();\r
+                               (void)c;\r

                                printf("\naborted via keyboard!\n");\r
                                free(keyBlock);\r
                                printf("\naborted via keyboard!\n");\r
                                free(keyBlock);\r

-                               free(p);\r

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


@@ -1466,7 +1467,6 @@ int CmdT55xxBruteForce(const char *Cmd) {
                        if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r
                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r
                        if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r
                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r

-                               free(p);\r

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


@@ -1475,13 +1475,11 @@ int CmdT55xxBruteForce(const char *Cmd) {
                        if ( found ) {\r
                                PrintAndLog("Found valid password: [%08X]", testpwd);\r
                                free(keyBlock);\r
                        if ( found ) {\r
                                PrintAndLog("Found valid password: [%08X]", testpwd);\r
                                free(keyBlock);\r

-                               free(p);\r

                                return 0;\r
                        } \r
                }\r
                PrintAndLog("Password NOT found.");\r
                free(keyBlock);\r
                                return 0;\r
                        } \r
                }\r
                PrintAndLog("Password NOT found.");\r
                free(keyBlock);\r

-               free(p);\r

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


@@ -1505,7 +1503,8 @@ int CmdT55xxBruteForce(const char *Cmd) {
                printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r
                printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r

-                       getchar();\r
+                       c = getchar();\r
+                       (void)c;\r

                        printf("\naborted via keyboard!\n");\r
                        free(keyBlock);\r
                        return 0;\r
                        printf("\naborted via keyboard!\n");\r
                        free(keyBlock);\r
                        return 0;\r


@@ -1551,11 +1550,12 @@ static command_t CommandTable[] = {
 };\r
 \r
 int CmdLFT55XX(const char *Cmd) {\r
 };\r
 \r
 int CmdLFT55XX(const char *Cmd) {\r

-  CmdsParse(CommandTable, Cmd);\r
-  return 0;\r
+       clearCommandBuffer();\r
+       CmdsParse(CommandTable, Cmd);\r
+       return 0;\r

 }\r
 \r
 int CmdHelp(const char *Cmd) {\r
 }\r
 \r
 int CmdHelp(const char *Cmd) {\r

-  CmdsHelp(CommandTable);\r
-  return 0;\r
+       CmdsHelp(CommandTable);\r
+       return 0;\r

 }\r
 }\r