RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-15 08:50:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

hf 14a raw - now has a verbose parameter and less output normally

Browse source
This commit is contained in:
iceman1001 2021-05-19 12:18:04 +02:00
parent 03a7109efd
commit 27dcbb49ec
1 changed files with 19 additions and 11 deletions

26
client/src/cmdhf14a.c
View file

@ -33,7 +33,7 @@
bool APDUInFramingEnable = true; bool APDUInFramingEnable = true;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int waitCmd(bool i_select, uint32_t timeout); static int waitCmd(bool i_select, uint32_t timeout, bool verbose);
static const manufactureName manufactureMapping[] = { static const manufactureName manufactureMapping[] = {
// ID, "Vendor Country" // ID, "Vendor Country"
@ -1187,7 +1187,6 @@ static int CmdHF14AAPDU(const char *Cmd) {
} }
static int CmdHF14ACmdRaw(const char *Cmd) { static int CmdHF14ACmdRaw(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "hf 14a raw", CLIParserInit(&ctx, "hf 14a raw",
"Sends raw bytes over ISO14443a. With option to use TOPAZ 14a mode.", "Sends raw bytes over ISO14443a. With option to use TOPAZ 14a mode.",
@ -1205,13 +1204,13 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
arg_lit0("r", NULL, "do not read response"), arg_lit0("r", NULL, "do not read response"),
arg_lit0("s", NULL, "active signal field ON with select"), arg_lit0("s", NULL, "active signal field ON with select"),
arg_int0("t", "timeout", "<ms>", "timeout in milliseconds"), arg_int0("t", "timeout", "<ms>", "timeout in milliseconds"),
arg_lit0("v", "verbose", "Verbose output"),
arg_lit0(NULL, "topaz", "use Topaz protocol to send command"), arg_lit0(NULL, "topaz", "use Topaz protocol to send command"),
arg_strx1(NULL, NULL, "<hex>", "raw bytes to send"), arg_strx1(NULL, NULL, "<hex>", "raw bytes to send"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
bool active = arg_get_lit(ctx, 1); bool active = arg_get_lit(ctx, 1);
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);
@ -1220,11 +1219,12 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
bool reply = (arg_get_lit(ctx, 6) == false); bool reply = (arg_get_lit(ctx, 6) == false);
bool active_select = arg_get_lit(ctx, 7); bool active_select = arg_get_lit(ctx, 7);
uint32_t timeout = (uint32_t)arg_get_int_def(ctx, 8, 0); uint32_t timeout = (uint32_t)arg_get_int_def(ctx, 8, 0);
bool topazmode = arg_get_lit(ctx, 9); bool verbose = arg_get_lit(ctx, 9);
bool topazmode = arg_get_lit(ctx, 10);
int datalen = 0; int datalen = 0;
uint8_t data[PM3_CMD_DATA_SIZE]; uint8_t data[PM3_CMD_DATA_SIZE];
CLIGetHexWithReturn(ctx, 10, data, &datalen); CLIGetHexWithReturn(ctx, 11, data, &datalen);
CLIParserFree(ctx); CLIParserFree(ctx);
bool bTimeout = (timeout) ? true : false; bool bTimeout = (timeout) ? true : false;
@ -1290,14 +1290,14 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
if (reply) { if (reply) {
int res = 0; int res = 0;
if (active_select) if (active_select)
res = waitCmd(true, timeout); res = waitCmd(true, timeout, verbose);
if (res == PM3_SUCCESS && datalen > 0) if (res == PM3_SUCCESS && datalen > 0)
waitCmd(false, timeout); waitCmd(false, timeout, verbose);
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int waitCmd(bool i_select, uint32_t timeout) { static int waitCmd(bool i_select, uint32_t timeout, bool verbose) {
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, timeout + 1500)) { if (WaitForResponseTimeout(CMD_ACK, &resp, timeout + 1500)) {
@ -1305,16 +1305,24 @@ static int waitCmd(bool i_select, uint32_t timeout) {
if (i_select) { if (i_select) {
len = (resp.oldarg[1] & 0xFFFF); len = (resp.oldarg[1] & 0xFFFF);
if (len) { if (len) {
if (verbose) {
PrintAndLogEx(SUCCESS, "Card selected. UID[%u]:", len); PrintAndLogEx(SUCCESS, "Card selected. UID[%u]:", len);
} else {
return PM3_SUCCESS;
}
} else { } else {
PrintAndLogEx(WARNING, "Can't select card."); PrintAndLogEx(WARNING, "Can't select card.");
} }
} else { } else {
if (verbose) {
PrintAndLogEx(SUCCESS, "received " _YELLOW_("%u") " bytes", len); PrintAndLogEx(SUCCESS, "received " _YELLOW_("%u") " bytes", len);
} }
}
if (!len) if (len == 0) {
return PM3_ESOFT; return PM3_ESOFT;
}
uint8_t *data = resp.data.asBytes; uint8_t *data = resp.data.asBytes;