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

textual

Browse source
This commit is contained in:
iceman1001 2024-01-14 20:30:50 +01:00
commit a88eae9f4e
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/cmdhfxerox.c
View file

@ -627,7 +627,7 @@ static int CmdHFXeroxInfo(const char *Cmd) {
packet->rawlen++; packet->rawlen++;
for (int retry = 0; (retry < 3 && blockno < sizeof(info_blocks)); retry++) { for (int retry = 0; (retry < 2 && blockno < sizeof(info_blocks)); retry++) {
// block to read // block to read
packet->raw[10] = info_blocks[blockno]; packet->raw[10] = info_blocks[blockno];
@ -705,7 +705,8 @@ static int CmdHFXeroxDump(const char *Cmd) {
arg_param_begin, arg_param_begin,
arg_str0("f", "file", "<fn>", "filename to save dump to"), arg_str0("f", "file", "<fn>", "filename to save dump to"),
arg_lit0("d", "decrypt", "decrypt secret blocks"), arg_lit0("d", "decrypt", "decrypt secret blocks"),
arg_lit0(NULL, "ns", "no save to file"), arg_lit0(NULL, "ns", "no save to file"),
arg_lit0("v", "verbose", "verbose output"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, true); CLIExecWithReturn(ctx, Cmd, argtable, true);
@ -714,13 +715,17 @@ static int CmdHFXeroxDump(const char *Cmd) {
char filename[FILE_PATH_SIZE] = {0}; char filename[FILE_PATH_SIZE] = {0};
CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen); CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
bool decrypt = arg_get_lit(ctx, 2); bool decrypt = arg_get_lit(ctx, 2);
bool nosave = arg_get_lit(ctx, 3); bool nosave = arg_get_lit(ctx, 3);
bool verbose = arg_get_lit(ctx, 4);
CLIParserFree(ctx); CLIParserFree(ctx);
iso14b_card_select_t card; iso14b_card_select_t card;
int status = xerox_select_card(&card); int status = xerox_select_card(&card);
if (status != PM3_SUCCESS) { if (status != PM3_SUCCESS) {
return PM3_ERFTRANS; if (verbose) {
PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed");
}
return status;
} }
PrintAndLogEx(INFO, "Reading memory from tag UID " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen)); PrintAndLogEx(INFO, "Reading memory from tag UID " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen));
@ -771,7 +776,7 @@ static int CmdHFXeroxDump(const char *Cmd) {
uint8_t *d = resp.data.asBytes; uint8_t *d = resp.data.asBytes;
if (check_crc(CRC_14443_B, d, 7) == false) { if (check_crc(CRC_14443_B, d, 7) == false) {
PrintAndLogEx(FAILED, "crc fail, retrying one more time"); PrintAndLogEx(FAILED, "retrying one more time, CRC ( " _RED_("fail") " )");
continue; continue;
} }