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

textual

Browse source
This commit is contained in:
iceman1001 2019-11-30 20:02:02 +01:00
commit bd80fa254e
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/cmdhf15.c
View file

@ -1203,8 +1203,7 @@ static int CmdHF15Dump(const char *Cmd) {
DropField(); DropField();
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "block# | data |lck| ascii"); PrintAndLogEx(NORMAL, "block# | data |lck| ascii");
PrintAndLogEx(NORMAL, "---------+--------------+---+----------"); PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
for (int i = 0; i < blocknum; i++) { for (int i = 0; i < blocknum; i++) {
@ -1305,8 +1304,8 @@ static int CmdHF15Raw(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(SUCCESS, "%s", sprint_hex(resp.data.asBytes, len));
} else { } else {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
} }
@ -1443,7 +1442,7 @@ static int CmdHF15Read(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;
} }
@ -1452,14 +1451,14 @@ static int CmdHF15Read(const char *Cmd) {
uint32_t status = resp.oldarg[0]; uint32_t status = resp.oldarg[0];
if (status < 2) { if (status < 2) {
PrintAndLogEx(NORMAL, "iso15693 card select failed"); PrintAndLogEx(ERR, "iso15693 card select failed");
return PM3_EWRONGANSVER; return PM3_EWRONGANSVER;
} }
recv = resp.data.asBytes; recv = resp.data.asBytes;
if (!CheckCrc15(recv, status)) { if (!CheckCrc15(recv, status)) {
PrintAndLogEx(NORMAL, "CRC failed"); PrintAndLogEx(ERR, "CRC failed");
return PM3_ESOFT; return PM3_ESOFT;
} }
@ -1817,7 +1816,7 @@ bool readHF15Uid(bool verbose) {
return false; return false;
} }
PrintAndLogEx(NORMAL, " UID : %s", sprintUID(NULL, uid)); PrintAndLogEx(SUCCESS, " UID : %s", sprintUID(NULL, uid));
PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(uid)); PrintAndLogEx(SUCCESS, " TYPE : %s", getTagInfo_15(uid));
return true; return true;
} }