github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

unified text and loading file now follow new pattern

Browse source
This commit is contained in:
iceman1001 2021-04-18 19:57:50 +02:00
commit 6961611474
4 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/cmdlfem4x05.c
View file

@ -557,12 +557,12 @@ int CmdEM4x05Dump(const char *Cmd) {
// Test first if the password is correct // Test first if the password is correct
status = em4x05_login_ext(pwd); status = em4x05_login_ext(pwd);
if (status == PM3_SUCCESS) { if (status == PM3_SUCCESS) {
PrintAndLogEx(INFO, "Password is " _GREEN_("correct")); PrintAndLogEx(INFO, "password is " _GREEN_("correct"));
} else if (status == PM3_EFAILED) { } else if (status == PM3_EFAILED) {
PrintAndLogEx(WARNING, "Password is " _RED_("incorrect") ", will try without password"); PrintAndLogEx(WARNING, "password is " _RED_("incorrect") ", will try without password");
usePwd = false; usePwd = false;
} else if (status != PM3_EFAILED) { } else if (status != PM3_EFAILED) {
PrintAndLogEx(WARNING, "Login attempt: No answer from tag"); PrintAndLogEx(WARNING, "Login attempt: no answer from tag");
return status; return status;
} }
} }
@ -705,7 +705,6 @@ int CmdEM4x05Dump(const char *Cmd) {
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
saveFileJSON(filename, (card_type == EM_4369 || card_type == EM_4469) ? jsfEM4x69 : jsfEM4x05, (uint8_t *)data, 16 * sizeof(uint32_t), NULL); saveFileJSON(filename, (card_type == EM_4369 || card_type == EM_4469) ? jsfEM4x69 : jsfEM4x05, (uint8_t *)data, 16 * sizeof(uint32_t), NULL);
saveFileEML(filename, (uint8_t *)data, 16 * sizeof(uint32_t), sizeof(uint32_t)); saveFileEML(filename, (uint8_t *)data, 16 * sizeof(uint32_t), sizeof(uint32_t));
saveFile(filename, ".bin", data, sizeof(data)); saveFile(filename, ".bin", data, sizeof(data));
} }
@ -1376,7 +1375,7 @@ int CmdEM4x05Chk(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
} }
PrintAndLogEx(INFO, "press " _YELLOW_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>") " to exit");
for (uint32_t c = 0; c < keycount; ++c) { for (uint32_t c = 0; c < keycount; ++c) {
@ -1626,7 +1625,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
PrintAndLogEx(INFO, "----------------------------------------------------------------------------\n"); PrintAndLogEx(INFO, "----------------------------------------------------------------------------\n");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "press " _YELLOW_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>'") " to exit");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--------------- " _CYAN_("start") " -----------------------\n"); PrintAndLogEx(INFO, "--------------- " _CYAN_("start") " -----------------------\n");

82
client/src/cmdlfem4x50.c
View file

@ -130,29 +130,51 @@ static void print_info_result(uint8_t *data, bool verbose) {
static int em4x50_load_file(const char *filename, uint8_t *data, size_t data_len, size_t *bytes_read) { static int em4x50_load_file(const char *filename, uint8_t *data, size_t data_len, size_t *bytes_read) {
// read data from dump file; file type is derived from file name extension uint8_t *dump = calloc(DUMP_FILESIZE, sizeof(uint8_t));
if (dump == NULL) {
PrintAndLogEx(ERR, "error, cannot allocate memory ");
return PM3_EMALLOC;
}
int res = 0; int res = PM3_SUCCESS;
uint32_t serial = 0x0, device_id = 0x0; DumpFileType_t dftype = getfiletype(filename);
switch (dftype) {
case BIN: {
res = loadFile_safe(filename, ".bin", (void **)&dump, bytes_read);
break;
}
case EML: {
res = loadFileEML_safe(filename, (void **)&dump, bytes_read);
break;
}
case JSON: {
res = loadFileJSON(filename, dump, DUMP_FILESIZE, bytes_read, NULL);
break;
}
case DICTIONARY: {
free(dump);
PrintAndLogEx(ERR, "Error: Only BIN/JSON/EML formats allowed");
return PM3_EINVARG;
}
}
if (str_endswith(filename, ".eml")) if ((res != PM3_SUCCESS) && (*bytes_read != DUMP_FILESIZE)) {
res = loadFileEML(filename, data, bytes_read) != PM3_SUCCESS; free(dump);
else if (str_endswith(filename, ".json"))
res = loadFileJSON(filename, data, data_len, bytes_read, NULL);
else
res = loadFile(filename, ".bin", data, data_len, bytes_read);
if ((res != PM3_SUCCESS) && (*bytes_read != DUMP_FILESIZE))
return PM3_EFILE; return PM3_EFILE;
}
uint32_t serial = 0, device_id = 0;
// valid em4x50 data? // valid em4x50 data?
serial = bytes_to_num(data + 4 * EM4X50_DEVICE_SERIAL, 4); serial = bytes_to_num(data + 4 * EM4X50_DEVICE_SERIAL, 4);
device_id = bytes_to_num(data + 4 * EM4X50_DEVICE_ID, 4); device_id = bytes_to_num(data + 4 * EM4X50_DEVICE_ID, 4);
if (serial == device_id) { if (serial == device_id) {
PrintAndLogEx(WARNING, "No valid em4x50 data in file %s.", filename); PrintAndLogEx(WARNING, "No valid EM4x50 data in file %s", filename);
return PM3_ENODATA; return PM3_ENODATA;
} }
memcpy(data, dump, *bytes_read);
free(dump);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -183,7 +205,7 @@ int CmdEM4x50ELoad(const char *Cmd) {
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str1("f", "filename", "<filename>", "dump filename"), arg_str1("f", "filename", "<fn>", "dump filename"),
arg_param_end arg_param_end
}; };
@ -426,7 +448,7 @@ int CmdEM4x50Chk(const char *Cmd) {
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("f", "filename", "<filename>", "dictionary filename"), arg_str0("f", "filename", "<fn>", "dictionary filename"),
arg_param_end arg_param_end
}; };
@ -734,7 +756,7 @@ int CmdEM4x50Dump(const char *Cmd) {
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("f", "filename", "<filename>", "dump filename (bin/eml/json)"), arg_str0("f", "filename", "<fn>", "dump filename (bin/eml/json)"),
arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"), arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"),
arg_param_end arg_param_end
}; };
@ -1034,7 +1056,7 @@ int CmdEM4x50Wipe(const char *Cmd) {
int CmdEM4x50Restore(const char *Cmd) { int CmdEM4x50Restore(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "lf em 4x50 restore", CLIParserInit(&ctx, "lf em 4x50 restore",
"Restores data from dumpfile onto a Em4x50 tag.\n" "Restores data from dumpfile (bin/eml/json) onto a EM4x50 tag.\n"
"if used with -u, the filetemplate `lf-4x50-UID-dump.bin` is used as filename", "if used with -u, the filetemplate `lf-4x50-UID-dump.bin` is used as filename",
"lf em 4x50 restore -u 1b5aff5c -> uses lf-4x50-1B5AFF5C-dump.bin\n" "lf em 4x50 restore -u 1b5aff5c -> uses lf-4x50-1B5AFF5C-dump.bin\n"
"lf em 4x50 restore -f mydump.eml\n" "lf em 4x50 restore -f mydump.eml\n"
@ -1045,7 +1067,7 @@ int CmdEM4x50Restore(const char *Cmd) {
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("u", "uid", "<hex>", "uid, 4 hex bytes, msb"), arg_str0("u", "uid", "<hex>", "uid, 4 hex bytes, msb"),
arg_str0("f", "filename", "<filename>", "dump filename (bin/eml/json)"), arg_str0("f", "filename", "<fn>", "dump filename (bin/eml/json)"),
arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"), arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"),
arg_param_end arg_param_end
}; };
@ -1128,14 +1150,10 @@ int CmdEM4x50Restore(const char *Cmd) {
} }
int CmdEM4x50Sim(const char *Cmd) { int CmdEM4x50Sim(const char *Cmd) {
int status = PM3_EFAILED;
uint32_t password = 0;
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "lf em 4x50 sim", CLIParserInit(&ctx, "lf em 4x50 sim",
"Simulates a EM4x50 tag.\n" "Simulates a EM4x50 tag\n"
"Upload using `lf em 4x50 eload`", "First upload to device using `lf em 4x50 eload`",
"lf em 4x50 sim" "lf em 4x50 sim"
"lf em 4x50 sim -p 27182818 -> uses password for eload data" "lf em 4x50 sim -p 27182818 -> uses password for eload data"
); );
@ -1152,25 +1170,26 @@ int CmdEM4x50Sim(const char *Cmd) {
CLIGetHexWithReturn(ctx, 1, pwd, &pwd_len); CLIGetHexWithReturn(ctx, 1, pwd, &pwd_len);
CLIParserFree(ctx); CLIParserFree(ctx);
uint32_t password = 0;
if (pwd_len) { if (pwd_len) {
if (pwd_len != 4) { if (pwd_len != 4) {
PrintAndLogEx(FAILED, "password length must be 4 bytes instead of %d", pwd_len); PrintAndLogEx(FAILED, "password length must be 4 bytes, got %d", pwd_len);
return PM3_EINVARG; return PM3_EINVARG;
} else { } else {
password = BYTES2UINT32(pwd); password = BYTES2UINT32(pwd);
} }
} }
CLIParserFree(ctx);
int status = PM3_EFAILED;
PrintAndLogEx(INFO, "Simulating data from emulator memory"); PrintAndLogEx(INFO, "Simulating data from emulator memory");
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_EM4X50_SIM, (uint8_t *)&password, sizeof(password)); SendCommandNG(CMD_LF_EM4X50_SIM, (uint8_t *)&password, sizeof(password));
PacketResponseNG resp; PacketResponseNG resp;
PrintAndLogEx(INFO, "Press pm3-button to abort simulation"); PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " or pm3-button to abort simulation");
bool keypress = kbd_enter_pressed(); bool keypress;
while (keypress == false) { do {
keypress = kbd_enter_pressed(); keypress = kbd_enter_pressed();
if (WaitForResponseTimeout(CMD_LF_EM4X50_SIM, &resp, 1500)) { if (WaitForResponseTimeout(CMD_LF_EM4X50_SIM, &resp, 1500)) {
@ -1178,16 +1197,17 @@ int CmdEM4x50Sim(const char *Cmd) {
break; break;
} }
} } while (keypress == false);
if (keypress) { if (keypress) {
SendCommandNG(CMD_BREAK_LOOP, NULL, 0); SendCommandNG(CMD_BREAK_LOOP, NULL, 0);
status = PM3_EOPABORTED; status = PM3_EOPABORTED;
} }
if ((status == PM3_SUCCESS) || (status == PM3_EOPABORTED)) if ((status == PM3_SUCCESS) || (status == PM3_EOPABORTED))
PrintAndLogEx(INFO, "Done"); PrintAndLogEx(INFO, "Done!");
else else
PrintAndLogEx(FAILED, "No valid em4x50 data in memory"); PrintAndLogEx(FAILED, "No valid EM4x50 data in memory");
return resp.status; return resp.status;
} }

3
client/src/cmdlfhid.c
View file

@ -545,8 +545,7 @@ static int CmdHIDBrute(const char *Cmd) {
} }
} }
PrintAndLogEx(INFO, "Started brute-forcing HID Prox reader"); PrintAndLogEx(INFO, "Started brute-forcing HID Prox reader");
PrintAndLogEx(INFO, "Press pm3-button to abort simulation or press " _GREEN_("`<enter>`") " to exit"); PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " or pm3-button to abort simulation");
// copy values to low. // copy values to low.
cn_low = cn_hi; cn_low = cn_hi;

8
client/src/cmdlft55xx.c
View file

@ -3086,7 +3086,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
snprintf(filename, sizeof(filename), "t55xx_default_pwds"); snprintf(filename, sizeof(filename), "t55xx_default_pwds");
} }
PrintAndLogEx(INFO, "press " _GREEN_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>") " to exit");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
/* /*
// block 7, page1 = false, usepwd = false, override = false, pwd = 00000000 // block 7, page1 = false, usepwd = false, override = false, pwd = 00000000
@ -3182,7 +3182,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
} }
PrintAndLogEx(INFO, "press " _GREEN_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>") " to exit");
for (uint32_t c = 0; c < keycount && found == false; ++c) { for (uint32_t c = 0; c < keycount && found == false; ++c) {
@ -3296,7 +3296,7 @@ static int CmdT55xxBruteForce(const char *Cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
PrintAndLogEx(INFO, "press " _GREEN_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>") " to exit");
PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password); PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
uint64_t t1 = msclock(); uint64_t t1 = msclock();
@ -3404,7 +3404,7 @@ static int CmdT55xxRecoverPW(const char *Cmd) {
else if (r3) else if (r3)
downlink_mode = ref1of4; downlink_mode = ref1of4;
PrintAndLogEx(NORMAL, "press " _GREEN_("'enter'") " to cancel the command"); PrintAndLogEx(INFO, "press " _GREEN_("<Enter>") " to exit");
int bit = 0; int bit = 0;
uint32_t curr_password = 0x0; uint32_t curr_password = 0x0;