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

text

Browse source
This commit is contained in:
iceman1001 2024-01-15 11:53:35 +01:00
parent 8831c9cfcf
commit 00dfd6e5f1
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
client/src/cmdhf15.c
View file

@ -84,12 +84,13 @@
PrintAndLogEx(FAILED, "crc ( " _RED_("fail") " )"); \ PrintAndLogEx(FAILED, "crc ( " _RED_("fail") " )"); \
return PM3_ECRC; \ return PM3_ECRC; \
} \ } \
\
if (data[1] == 0x0F || data[1] == 0x10) { \
return PM3_EOUTOFBOUND; \
} \
\ \
if ((d[0] & ISO15_RES_ERROR) == ISO15_RES_ERROR) { \ if ((d[0] & ISO15_RES_ERROR) == ISO15_RES_ERROR) { \
\
if (data[1] == 0x0F || data[1] == 0x10) { \
return PM3_EOUTOFBOUND; \
} \
\
PrintAndLogEx(ERR, "iso15693 card returned error %i: %s", d[0], TagErrorStr(d[0])); \ PrintAndLogEx(ERR, "iso15693 card returned error %i: %s", d[0], TagErrorStr(d[0])); \
return PM3_EWRONGANSWER; \ return PM3_EWRONGANSWER; \
} \ } \
@ -492,9 +493,9 @@ static int getUID(bool verbose, bool loop, uint8_t *buf) {
} }
if (verbose) { if (verbose) {
PrintAndLogEx(SUCCESS, "UID.... " _GREEN_("%s"), iso15693_sprintUID(NULL, buf));
PrintAndLogEx(SUCCESS, "TYPE... " _YELLOW_("%s"), getTagInfo_15(buf));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), iso15693_sprintUID(NULL, buf));
PrintAndLogEx(SUCCESS, "TYPE: " _YELLOW_("%s"), getTagInfo_15(buf));
} }
res = PM3_SUCCESS; res = PM3_SUCCESS;
@ -978,8 +979,6 @@ static int CmdHF15Info(const char *Cmd) {
packet->rawlen += uidlen; packet->rawlen += uidlen;
} }
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
AddCrc15(packet->raw, packet->rawlen); AddCrc15(packet->raw, packet->rawlen);
packet->rawlen += 2; packet->rawlen += 2;
@ -1015,9 +1014,9 @@ static int CmdHF15Info(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------"); PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------");
PrintAndLogEx(SUCCESS, " TYPE: " _YELLOW_("%s"), getTagInfo_15(d + 2)); PrintAndLogEx(SUCCESS, " TYPE... " _YELLOW_("%s"), getTagInfo_15(d + 2));
PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), iso15693_sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, " UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
PrintAndLogEx(SUCCESS, " SYSINFO: %s", sprint_hex(d, resp.length - 2)); PrintAndLogEx(SUCCESS, " SYSINFO... %s", sprint_hex(d, resp.length - 2));
// DSFID // DSFID
if (d[1] & 0x01) if (d[1] & 0x01)
@ -1636,7 +1635,6 @@ static int CmdHF15WriteDsfid(const char *Cmd) {
memcpy(packet->raw + packet->rawlen, uid, uidlen); memcpy(packet->raw + packet->rawlen, uid, uidlen);
packet->rawlen += uidlen; packet->rawlen += uidlen;
} }
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -1755,7 +1753,6 @@ static int CmdHF15Dump(const char *Cmd) {
memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH); memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH);
packet->rawlen += HF15_UID_LENGTH; packet->rawlen += HF15_UID_LENGTH;
used_uid = true; used_uid = true;
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -2111,7 +2108,6 @@ static int CmdHF15Readmulti(const char *Cmd) {
memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH); memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH);
packet->rawlen += HF15_UID_LENGTH; packet->rawlen += HF15_UID_LENGTH;
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -2264,7 +2260,6 @@ static int CmdHF15Readblock(const char *Cmd) {
memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH); memcpy(packet->raw + packet->rawlen, uid, HF15_UID_LENGTH);
packet->rawlen += HF15_UID_LENGTH; packet->rawlen += HF15_UID_LENGTH;
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -2456,7 +2451,6 @@ static int CmdHF15Write(const char *Cmd) {
} else { } else {
reverse_array(uid, HF15_UID_LENGTH); reverse_array(uid, HF15_UID_LENGTH);
} }
// PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -2548,7 +2542,6 @@ static int CmdHF15Restore(const char *Cmd) {
} else { } else {
reverse_array(uid, HF15_UID_LENGTH); reverse_array(uid, HF15_UID_LENGTH);
} }
//PrintAndLogEx(SUCCESS, "Using UID... " _GREEN_("%s"), iso15693_sprintUID(NULL, uid));
} else { } else {
PrintAndLogEx(SUCCESS, "Using unaddressed mode"); PrintAndLogEx(SUCCESS, "Using unaddressed mode");
} }
@ -2578,7 +2571,7 @@ static int CmdHF15Restore(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
} }
PrintAndLogEx(INFO, "restoring data blocks"); PrintAndLogEx(INFO, "Restoring data blocks");
uint16_t flags = arg_get_raw_flag(uidlen, unaddressed, scan, add_option); uint16_t flags = arg_get_raw_flag(uidlen, unaddressed, scan, add_option);
@ -2622,7 +2615,7 @@ static int CmdHF15Restore(const char *Cmd) {
if (tried >= retries) { if (tried >= retries) {
free(dump); free(dump);
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(FAILED, "restore failed. Too many retries."); PrintAndLogEx(FAILED, "Too many retries (" _RED_("fail") " )");
DropField(); DropField();
return retval; return retval;
} }
@ -2641,7 +2634,7 @@ static int CmdHF15Restore(const char *Cmd) {
DropField(); DropField();
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(HINT, "try `" _YELLOW_("hf 15 dump") "` to read your card to verify"); PrintAndLogEx(HINT, "try `" _YELLOW_("hf 15 dump --ns") "` to read your card to verify");
PrintAndLogEx(INFO, "Done!"); PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS; return PM3_SUCCESS;
} }