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

textual

Browse source
This commit is contained in:
iceman1001 2019-11-30 19:57:29 +01:00
commit 3ad7c0d319
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
client/cmdhf15.c
View file

@ -517,7 +517,7 @@ static bool prepareHF15Cmd(char **cmd, uint16_t *reqlen, uint8_t *arg1, uint8_t
return false; return false;
} }
memcpy(&req[tmpreqlen], uid, sizeof(uid)); memcpy(&req[tmpreqlen], uid, sizeof(uid));
PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, "Detected UID %s", sprintUID(NULL, uid));
tmpreqlen += sizeof(uid); tmpreqlen += sizeof(uid);
break; break;
default: default:
@ -530,7 +530,7 @@ static bool prepareHF15Cmd(char **cmd, uint16_t *reqlen, uint8_t *arg1, uint8_t
uid[7 - i] = temp & 0xff; uid[7 - i] = temp & 0xff;
} }
PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, "Using UID %s", sprintUID(NULL, uid));
memcpy(&req[tmpreqlen], uid, sizeof(uid)); memcpy(&req[tmpreqlen], uid, sizeof(uid));
tmpreqlen += sizeof(uid); tmpreqlen += sizeof(uid);
break; break;
@ -569,7 +569,7 @@ static int CmdHF15Demod(const char *Cmd) {
} }
} }
PrintAndLogEx(NORMAL, "SOF at %d, correlation %zu", maxPos, max / (ARRAYLEN(FrameSOF) / skip)); PrintAndLogEx(INFO, "SOF at %d, correlation %zu", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
i = maxPos + ARRAYLEN(FrameSOF) / skip; i = maxPos + ARRAYLEN(FrameSOF) / skip;
int k = 0; int k = 0;
@ -592,7 +592,7 @@ static int CmdHF15Demod(const char *Cmd) {
corr1 *= 4; corr1 *= 4;
if (corrEOF > corr1 && corrEOF > corr0) { if (corrEOF > corr1 && corrEOF > corr0) {
PrintAndLogEx(NORMAL, "EOF at %d", i); PrintAndLogEx(INFO, "EOF at %d", i);
break; break;
} else if (corr1 > corr0) { } else if (corr1 > corr0) {
i += ARRAYLEN(Logic1) / skip; i += ARRAYLEN(Logic1) / skip;
@ -606,21 +606,21 @@ static int CmdHF15Demod(const char *Cmd) {
mask = 0x01; mask = 0x01;
} }
if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) { if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
PrintAndLogEx(NORMAL, "ran off end!"); PrintAndLogEx(INFO, "ran off end!");
break; break;
} }
} }
if (mask != 0x01) { if (mask != 0x01) {
PrintAndLogEx(WARNING, "Warning, uneven octet! (discard extra bits!)"); PrintAndLogEx(WARNING, "Warning, uneven octet! (discard extra bits!)");
PrintAndLogEx(NORMAL, " mask = %02x", mask); PrintAndLogEx(INFO, " mask = %02x", mask);
} }
PrintAndLogEx(NORMAL, "%d octets", k); PrintAndLogEx(INFO, "%d octets", k);
for (i = 0; i < k; i++) for (i = 0; i < k; i++)
PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]); PrintAndLogEx(SUCCESS, "# %2d: %02x ", i, outBuf[i]);
PrintAndLogEx(NORMAL, "CRC %04x", Crc15(outBuf, k - 2)); PrintAndLogEx(SUCCESS, "CRC %04x", Crc15(outBuf, k - 2));
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -741,13 +741,13 @@ static int NxpSysInfo(uint8_t *uid) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
if (status < 2) { if (status < 2) {
PrintAndLogEx(NORMAL, " EAS (Electronic Article Surveillance) is not active"); PrintAndLogEx(INFO, " EAS (Electronic Article Surveillance) is not active");
} else { } else {
recv = resp.data.asBytes; recv = resp.data.asBytes;
if (!(recv[0] & ISO15_RES_ERROR)) { if (!(recv[0] & ISO15_RES_ERROR)) {
PrintAndLogEx(NORMAL, " EAS (Electronic Article Surveillance) is active."); PrintAndLogEx(INFO, " EAS (Electronic Article Surveillance) is active.");
PrintAndLogEx(NORMAL, " EAS sequence: %s", sprint_hex(recv + 1, 32)); PrintAndLogEx(INFO, " EAS sequence: %s", sprint_hex(recv + 1, 32));
} }
} }
} }
@ -866,36 +866,36 @@ static int CmdHF15Info(const char *Cmd) {
memcpy(uid, recv + 2, sizeof(uid)); memcpy(uid, recv + 2, sizeof(uid));
PrintAndLogEx(NORMAL, " UID : %s", sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, " UID : %s", sprintUID(NULL, uid));
PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(recv + 2)); PrintAndLogEx(SUCCESS, " TYPE : %s", getTagInfo_15(recv + 2));
PrintAndLogEx(NORMAL, " SYSINFO : %s", sprint_hex(recv, status - 2)); PrintAndLogEx(SUCCESS, " SYSINFO : %s", sprint_hex(recv, status - 2));
// DSFID // DSFID
if (recv[1] & 0x01) if (recv[1] & 0x01)
PrintAndLogEx(NORMAL, " - DSFID supported [0x%02X]", recv[10]); PrintAndLogEx(SUCCESS, " - DSFID supported [0x%02X]", recv[10]);
else else
PrintAndLogEx(NORMAL, " - DSFID not supported"); PrintAndLogEx(SUCCESS, " - DSFID not supported");
// AFI // AFI
if (recv[1] & 0x02) if (recv[1] & 0x02)
PrintAndLogEx(NORMAL, " - AFI supported [0x%02X]", recv[11]); PrintAndLogEx(SUCCESS, " - AFI supported [0x%02X]", recv[11]);
else else
PrintAndLogEx(NORMAL, " - AFI not supported"); PrintAndLogEx(SUCCESS, " - AFI not supported");
// IC reference // IC reference
if (recv[1] & 0x08) if (recv[1] & 0x08)
PrintAndLogEx(NORMAL, " - IC reference supported [0x%02X]", recv[14]); PrintAndLogEx(SUCCESS, " - IC reference supported [0x%02X]", recv[14]);
else else
PrintAndLogEx(NORMAL, " - IC reference not supported"); PrintAndLogEx(SUCCESS, " - IC reference not supported");
// memory // memory
if (recv[1] & 0x04) { if (recv[1] & 0x04) {
PrintAndLogEx(NORMAL, " - Tag provides info on memory layout (vendor dependent)"); PrintAndLogEx(SUCCESS, " - Tag provides info on memory layout (vendor dependent)");
uint8_t blocks = recv[12] + 1; uint8_t blocks = recv[12] + 1;
uint8_t size = (recv[13] & 0x1F); uint8_t size = (recv[13] & 0x1F);
PrintAndLogEx(NORMAL, " %u (or %u) bytes/blocks x %u blocks", size + 1, size, blocks); PrintAndLogEx(SUCCESS, " %u (or %u) bytes/blocks x %u blocks", size + 1, size, blocks);
} else { } else {
PrintAndLogEx(NORMAL, " - Tag does not provide information on memory layout"); PrintAndLogEx(SUCCESS, " - Tag does not provide information on memory layout");
} }
// Check if SLIX2 and attempt to get NXP System Information // Check if SLIX2 and attempt to get NXP System Information
@ -1015,7 +1015,7 @@ static int CmdHF15WriteAfi(const char *Cmd) {
SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen); SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
PrintAndLogEx(NORMAL, "iso15693 card select failed"); PrintAndLogEx(ERR, "iso15693 card select failed");
DropField(); DropField();
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
@ -1074,7 +1074,7 @@ static int CmdHF15WriteDsfid(const char *Cmd) {
SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen); SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
PrintAndLogEx(NORMAL, "iso15693 card select failed"); PrintAndLogEx(ERR, "iso15693 card select failed");
DropField(); DropField();
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
@ -1142,7 +1142,7 @@ static int CmdHF15Dump(const char *Cmd) {
} }
// detect blocksize from card :) // detect blocksize from card :)
PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_("%s"), sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, "Reading memory from tag UID " _YELLOW_("%s"), sprintUID(NULL, uid));
int blocknum = 0; int blocknum = 0;
uint8_t *recv = NULL; uint8_t *recv = NULL;
@ -1523,7 +1523,7 @@ static int CmdHF15Write(const char *Cmd) {
AddCrc15(req, reqlen); AddCrc15(req, reqlen);
reqlen += 2; reqlen += 2;
PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum); PrintAndLogEx(INFO, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen); SendCommandOLD(CMD_HF_ISO15693_COMMAND, reqlen, arg1, 1, req, reqlen);
@ -1550,7 +1550,7 @@ static int CmdHF15Write(const char *Cmd) {
} }
if (recv[0] & ISO15_RES_ERROR) { if (recv[0] & ISO15_RES_ERROR) {
PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); PrintAndLogEx(ERR, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
return PM3_EWRONGANSVER; return PM3_EWRONGANSVER;
} }
@ -1703,7 +1703,7 @@ static int CmdHF15CSetUID(const char *Cmd) {
} }
PrintAndLogEx(SUCCESS, "new UID | %s", sprint_hex(uid, sizeof(uid))); PrintAndLogEx(SUCCESS, "new UID | %s", sprint_hex(uid, sizeof(uid)));
PrintAndLogEx(NORMAL, "Using backdoor Magic tag function"); PrintAndLogEx(INFO, "Using backdoor Magic tag function");
if (!getUID(oldUid)) { if (!getUID(oldUid)) {
PrintAndLogEx(FAILED, "Can't get old UID."); PrintAndLogEx(FAILED, "Can't get old UID.");
@ -1755,8 +1755,8 @@ static int CmdHF15CSetUID(const char *Cmd) {
if (reply) { if (reply) {
if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
uint8_t len = resp.oldarg[0]; uint8_t len = resp.oldarg[0];
PrintAndLogEx(NORMAL, "received %i octets", len); PrintAndLogEx(INFO, "received %i octets", len);
PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.data.asBytes, len)); PrintAndLogEx(INFO, "%s", sprint_hex(resp.data.asBytes, len));
} else { } else {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
} }