RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

textual

Browse source
This commit is contained in:
iceman1001 2019-01-12 18:33:40 +01:00
parent a5833fe390
commit fcfbeb6ac3
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
client/cmdlft55xx.c
View file

@ -1553,18 +1553,18 @@ int CmdT55xxChkPwds(const char *Cmd) {
PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]); PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) { if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting"); PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
return 2; return 2;
} }
found = tryDetectModulation(); found = tryDetectModulation();
if (found) { if (found) {
PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", resp.arg[1]); PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
} else { } else {
PrintAndLogEx(NORMAL, "Password NOT found."); PrintAndLogEx(WARNING, "Password NOT found.");
} }
} else { } else {
PrintAndLogEx(NORMAL, "Password NOT found."); PrintAndLogEx(WARNING, "Password NOT found.");
} }
goto out; goto out;
@ -1581,7 +1581,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
FILE * f = fopen( filename , "r"); FILE * f = fopen( filename , "r");
if ( !f ) { if ( !f ) {
PrintAndLogEx(NORMAL, "File: %s: not found or locked.", filename); PrintAndLogEx(WARNING, "File: %s: not found or locked.", filename);
free(keyBlock); free(keyBlock);
return 1; return 1;
} }
@ -1596,7 +1596,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
if( line[0]=='#' ) continue; if( line[0]=='#' ) continue;
if (!isxdigit(line[0])) { if (!isxdigit(line[0])) {
PrintAndLogEx(NORMAL, "File content error. '%s' must include 8 HEX symbols", line); PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
continue; continue;
} }
@ -1627,11 +1627,11 @@ int CmdT55xxChkPwds(const char *Cmd) {
fclose(f); fclose(f);
if (keycnt == 0) { if (keycnt == 0) {
PrintAndLogEx(NORMAL, "No keys found in file"); PrintAndLogEx(WARNING, "No keys found in file");
free(keyBlock); free(keyBlock);
return 1; return 1;
} }
PrintAndLogEx(NORMAL, "Loaded %d keys", keycnt); PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
// loop // loop
uint64_t testpwd = 0x00; uint64_t testpwd = 0x00;
@ -1650,10 +1650,10 @@ int CmdT55xxChkPwds(const char *Cmd) {
testpwd = bytes_to_num(keyBlock + 4*c, 4); testpwd = bytes_to_num(keyBlock + 4*c, 4);
PrintAndLogEx(NORMAL, "Testing %08X", testpwd); PrintAndLogEx(INFO, "Testing %08X", testpwd);
if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) { if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting"); PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
free(keyBlock); free(keyBlock);
return 0; return 0;
} }
@ -1664,9 +1664,9 @@ int CmdT55xxChkPwds(const char *Cmd) {
} }
if ( found ) if ( found )
PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", testpwd); PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
else else
PrintAndLogEx(NORMAL, "Password NOT found."); PrintAndLogEx(WARNING, "Password NOT found.");
} }
free(keyBlock); free(keyBlock);
@ -1702,7 +1702,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
return usage_t55xx_bruteforce(); return usage_t55xx_bruteforce();
} }
PrintAndLogEx(NORMAL, "Search password range [%08X -> %08X]", start_password, end_password); PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
while ((!found) || (curr <= end_password)){ while ((!found) || (curr <= end_password)){
@ -1713,7 +1713,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
} }
if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) { if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting"); PrintAndLogEx(WARNING, "Aquireing data from device failed. Quitting");
return 0; return 0;
} }
found = tryDetectModulation(); found = tryDetectModulation();
@ -1725,9 +1725,9 @@ int CmdT55xxBruteForce(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
if (found) if (found)
PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", curr); PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
else else
PrintAndLogEx(NORMAL, "Password NOT found. Last tried: [ %08X ]", --curr); PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
t1 = msclock() - t1; t1 = msclock() - t1;
PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0); PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);