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

hf 14a raw - fix cli parse args

Browse source
This commit is contained in:
iceman1001 2020-11-14 15:21:41 +01:00
commit 8a11bfee10
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/src/cmdhf14a.c
View file

@ -1240,10 +1240,10 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
uint16_t numbits = (uint16_t)arg_get_int_def(ctx, 2, 0); uint16_t numbits = (uint16_t)arg_get_int_def(ctx, 2, 0);
bool crc = arg_get_lit(ctx, 3); bool crc = arg_get_lit(ctx, 3);
bool keep_field_on = arg_get_lit(ctx, 4); bool keep_field_on = arg_get_lit(ctx, 4);
bool reply = (arg_get_lit(ctx, 5) == false); bool no_rats = arg_get_lit(ctx, 5);
bool active_select = arg_get_lit(ctx, 6); bool reply = (arg_get_lit(ctx, 6) == false);
uint32_t timeout = (uint32_t)arg_get_int_def(ctx, 7, 0); bool active_select = arg_get_lit(ctx, 7);
bool no_rats = arg_get_lit(ctx, 8); uint32_t timeout = (uint32_t)arg_get_int_def(ctx, 8, 0);
bool topazmode = arg_get_lit(ctx, 9); bool topazmode = arg_get_lit(ctx, 9);
int datalen = 0; int datalen = 0;
@ -1345,12 +1345,14 @@ static int waitCmd(uint8_t iSelect, uint32_t timeout) {
if (iSelect == 0 && len >= 3) { if (iSelect == 0 && len >= 3) {
bool crc = check_crc(CRC_14443_A, data, len); bool crc = check_crc(CRC_14443_A, data, len);
PrintAndLogEx(SUCCESS, "%s[%02X %02X] %s", char s[16];
sprint_hex(data, len - 2), sprintf(s,
data[len - 2], (crc) ? _GREEN_("%02X %02X") : _RED_("%02X %02X"),
data[len - 1], data[len - 2],
(crc) ? _GREEN_("ok") : _RED_("fail") data[len - 1]
); );
PrintAndLogEx(SUCCESS, "%s[ %s ]", sprint_hex(data, len - 2), s);
} else { } else {
PrintAndLogEx(SUCCESS, "%s", sprint_hex(data, len)); PrintAndLogEx(SUCCESS, "%s", sprint_hex(data, len));
} }