dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chg: data ndef - now decodes w and wo NDEF header

Browse Source
This commit is contained in:
iceman1001
2020-06-21 16:34:56 +02:00
parent f69739da79
commit 56e171b9dc
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/cmddata.c
View File

@@ -2316,6 +2316,7 @@ static int CmdDataNDEF(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_strx0("dD", "data", "<hex>", "NDEF data to decode"),
arg_lit0("vV", "verbose", "verbose mode"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, false);
@@ -2323,12 +2324,18 @@ static int CmdDataNDEF(const char *Cmd) {
int datalen = 0;
uint8_t data[MAX_NDEF_LEN] = {0};
CLIGetHexWithReturn(ctx, 1, data, &datalen);
bool verbose = arg_get_lit(ctx, 2);
CLIParserFree(ctx);
if (datalen == 0)
return PM3_EINVARG;
PrintAndLogEx(INFO, "Parsed NDEF Records");
return NDEFRecordsDecodeAndPrint(data, datalen);
int res = NDEFDecodeAndPrint(data, datalen, verbose);
if (res != PM3_SUCCESS) {
PrintAndLogEx(INFO, "Trying to parse NDEF records w/o NDEF header");
res = NDEFRecordsDecodeAndPrint(data, datalen);
}
return res;
}
static command_t CommandTable[] = {