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

Merge pull request #1126 from tharexde/4x50_serial

Browse source 
4x50 serial
This commit is contained in:
Iceman 2020-12-20 13:39:23 +01:00 • committed by GitHub
commit e85edbcef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/cmdlfem4x50.c
View file

@ -81,7 +81,7 @@ static void print_result(const em4x50_word_t *words, int fwr, int lwr) {
PrintAndLogEx(INFO, "----+-------------+-------------+--------------------"); PrintAndLogEx(INFO, "----+-------------+-------------+--------------------");
} }
static void print_info_result(uint8_t *data) { static void print_info_result(uint8_t *data, bool verbose) {
// display all information of info result in structured format // display all information of info result in structured format
em4x50_word_t words[EM4X50_NO_WORDS]; em4x50_word_t words[EM4X50_NO_WORDS];
@ -104,7 +104,11 @@ static void print_info_result(uint8_t *data) {
// data section // data section
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, _YELLOW_("EM4x50 data:")); PrintAndLogEx(INFO, _YELLOW_("EM4x50 data:"));
print_result(words, 0, EM4X50_NO_WORDS - 1); if (verbose) {
print_result(words, 0, EM4X50_NO_WORDS - 1);
} else {
print_result(words, EM4X50_DEVICE_SERIAL, EM4X50_DEVICE_ID);
}
// configuration section // configuration section
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
@ -508,7 +512,7 @@ bool detect_4x50_block(void) {
em4x50_data_t etd = { em4x50_data_t etd = {
.pwd_given = false, .pwd_given = false,
.addr_given = true, .addr_given = true,
.addresses = (EM4X50_DEVICE_ID << 8) | EM4X50_DEVICE_ID, .addresses = (EM4X50_DEVICE_SERIAL << 8) | EM4X50_DEVICE_SERIAL,
}; };
em4x50_word_t words[EM4X50_NO_WORDS]; em4x50_word_t words[EM4X50_NO_WORDS];
return (em4x50_read(&etd, words) == PM3_SUCCESS); return (em4x50_read(&etd, words) == PM3_SUCCESS);
@ -618,12 +622,14 @@ int CmdEM4x50Info(const char *Cmd) {
CLIParserInit(&ctx, "lf em 4x50 info", CLIParserInit(&ctx, "lf em 4x50 info",
"Tag information EM4x50.", "Tag information EM4x50.",
"lf em 4x50 info\n" "lf em 4x50 info\n"
"lf em 4x50 info -v -> show data section\n"
"lf em 4x50 info -p 12345678 -> uses pwd 0x12345678\n" "lf em 4x50 info -p 12345678 -> uses pwd 0x12345678\n"
); );
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"), arg_str0("p", "pwd", "<hex>", "password, 4 hex bytes, lsb"),
arg_lit0("v", "verbose", "additional output of data section"),
arg_param_end arg_param_end
}; };
@ -631,6 +637,7 @@ int CmdEM4x50Info(const char *Cmd) {
int pwd_len = 0; int pwd_len = 0;
uint8_t pwd[4] = {0x0}; uint8_t pwd[4] = {0x0};
CLIGetHexWithReturn(ctx, 1, pwd, &pwd_len); CLIGetHexWithReturn(ctx, 1, pwd, &pwd_len);
bool verb = arg_get_lit(ctx, 2);
CLIParserFree(ctx); CLIParserFree(ctx);
em4x50_data_t etd = {.pwd_given = false}; em4x50_data_t etd = {.pwd_given = false};
@ -653,7 +660,7 @@ int CmdEM4x50Info(const char *Cmd) {
} }
if (resp.status == PM3_SUCCESS) if (resp.status == PM3_SUCCESS)
print_info_result(resp.data.asBytes); print_info_result(resp.data.asBytes, verb);
else else
PrintAndLogEx(FAILED, "Reading tag " _RED_("failed")); PrintAndLogEx(FAILED, "Reading tag " _RED_("failed"));