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

chg: 'hf thinfilm info' - versbose mode and sanity checks

Browse source
This commit is contained in:
iceman1001 2019-08-01 11:33:00 -04:00
parent 2400418067
commit 10c949a47e
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhf.c
View file

@ -54,7 +54,7 @@ int CmdHFSearch(const char *Cmd) {
PrintAndLogEx(INFO, "Checking for known tags...\n");
if (infoThinFilm() == PM3_SUCCESS) {
if (infoThinFilm(false) == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Thinfilm tag") " found\n");
return 1;
}

30
client/cmdhfthinfilm.c
View file

@ -25,20 +25,19 @@ static int usage_thinfilm_info(void) {
// Printing function based upon the code in libnfc
// ref
// https://github.com/nfc-tools/libnfc/blob/master/utils/nfc-barcode.c
static int print_barcode(uint8_t *barcode, const size_t barcode_len) {
static int print_barcode(uint8_t *barcode, const size_t barcode_len, bool verbose) {
PrintAndLogEx(SUCCESS, " Manufacturer : "_YELLOW_("%s") "[0x%02X]", (barcode[0] == 0xB7) ? "Thinfilm" : "unknown", barcode[0]);
PrintAndLogEx(SUCCESS, " Data format : "_YELLOW_("%02X"), barcode[1]);
uint8_t b1, b2;
compute_crc(CRC_14443_A, barcode, barcode_len - 2, &b1, &b2);
bool isok = (barcode[barcode_len - 1] == b1 && barcode[barcode_len - 2] == b2);
PrintAndLogEx(SUCCESS, " checksum : "_YELLOW_("%02X %02X")"- %s", b2, b1, (isok) ? _GREEN_("OK") : _RED_("fail"));
PrintAndLogEx(SUCCESS, " Raw data : "_YELLOW_("%s"),
sprint_hex(barcode, barcode_len)
);
if (verbose) {
uint8_t b1, b2;
compute_crc(CRC_14443_A, barcode, barcode_len - 2, &b1, &b2);
bool isok = (barcode[barcode_len - 1] == b1 && barcode[barcode_len - 2] == b2);
PrintAndLogEx(SUCCESS, " Data format : "_YELLOW_("%02X"), barcode[1]);
PrintAndLogEx(SUCCESS, " checksum : "_YELLOW_("%02X %02X")"- %s", b2, b1, (isok) ? _GREEN_("OK") : _RED_("fail"));
PrintAndLogEx(SUCCESS, " Raw data : "_YELLOW_("%s"), sprint_hex(barcode, barcode_len));
}
char s[45];
memset(s, 0x00, sizeof(s));
@ -104,10 +103,10 @@ static int CmdHfThinFilmInfo(const char *Cmd) {
return PM3_EINVARG;
}
return infoThinFilm();
return infoThinFilm(true);
}
int infoThinFilm(void) {
int infoThinFilm(bool verbose) {
clearCommandBuffer();
SendCommandNG(CMD_THINFILM_READ, NULL, 0);
@ -119,7 +118,12 @@ int infoThinFilm(void) {
}
if (resp.status == PM3_SUCCESS) {
print_barcode(resp.data.asBytes, resp.length);
if (resp.length == 16 || resp.length == 32) {
print_barcode(resp.data.asBytes, resp.length, verbose);
} else {
PrintAndLogEx(WARNING, "Response is wrong length. (%d)", resp.length);
return PM3_ESOFT;
}
}
return resp.status;

2
client/cmdhfthinfilm.h
View file

@ -21,7 +21,7 @@
#include "util.h"
#include "cmdhf.h" // list cmd
int infoThinFilm(void);
int infoThinFilm(bool verbose);
int CmdHFThinfilm(const char *Cmd);