add: missing two hard_nested files..

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 91168a025ff721029c0bc897ffb5a420f45cb666..92e6f745a213a085a71d3f5a726310d9f7d3ac42 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1394,16 +1394,26 @@ int CmdT55xxBruteForce(const char *Cmd) {
                uint64_t testpwd = 0x00;\r
                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r
                uint64_t testpwd = 0x00;\r
                for (uint16_t c = 0; c < keycnt; ++c ) {\r
        \r

+                       if (ukbhit()) {\r
+                               getchar();\r
+                               printf("\naborted via keyboard!\n");\r
+                               return 0;\r
+                       }\r
+               \r

                        testpwd = bytes_to_num(keyBlock + 4*c, 4);\r
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
                        \r
                        \r
                        testpwd = bytes_to_num(keyBlock + 4*c, 4);\r
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
                        \r
                        \r

-                       AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);\r
+                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r
+                               PrintAndLog("Aquireing data from device failed. Quitting");\r
+                               return 0;\r
+                       }\r
+                       \r

                        found = tryDetectModulation();\r
 \r
                        if ( found ) {\r
                        found = tryDetectModulation();\r
 \r
                        if ( found ) {\r

-                               PrintAndLog("Found valid password:[%08X]", testpwd);\r
+                               PrintAndLog("Found valid password: [%08X]", testpwd);\r

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


@@ -1419,20 +1429,27 @@ int CmdT55xxBruteForce(const char *Cmd) {
        \r
        if ( start_password >= end_password ) return usage_t55xx_bruteforce();\r
        \r
        \r
        if ( start_password >= end_password ) return usage_t55xx_bruteforce();\r
        \r

-    PrintAndLog("Search password  range [%08X -> %08X]", start_password, end_password);\r
+    PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);\r

        \r
     uint32_t i = start_password;\r
 \r
     while ((!found) && (i <= end_password)){\r
 \r
        \r
     uint32_t i = start_password;\r
 \r
     while ((!found) && (i <= end_password)){\r
 \r

-               AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i);\r
+               printf(".");\r
+               fflush(stdout);\r
+               if (ukbhit()) {\r
+                       getchar();\r
+                       printf("\naborted via keyboard!\n");\r
+                       return 0;\r
+               }\r
+                       \r
+               if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {\r
+                       PrintAndLog("Aquireing data from device failed. Quitting");\r
+                       return 0;\r
+               }\r

                found = tryDetectModulation();\r
         \r
                found = tryDetectModulation();\r
         \r

-               if (found)\r
-                       break;\r
-        \r
-        if ((i % 0x100) == 0) printf("[%08x], ",i);\r
-\r
+               if (found) break;\r

                i++;\r
     }\r
     \r
                i++;\r
     }\r
     \r


@@ -1441,7 +1458,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
     if (found)\r
                PrintAndLog("Found valid password: [%08x]", i);\r
     else\r
     if (found)\r
                PrintAndLog("Found valid password: [%08x]", i);\r
     else\r

-               PrintAndLog("Password NOT found. Last tried: [%08x]", i);\r
+               PrintAndLog("Password NOT found. Last tried: [%08x]", --i);\r

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