RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-12 11:08:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

unshadow

Browse source
This commit is contained in:
iceman1001 2019-04-08 09:39:05 +02:00
parent eadc980835
commit 854536b155
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client/cmdhfmfu.c
View file

@ -1413,10 +1413,10 @@ int CmdHF14AMfURdBl(const char *Cmd) {
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
uint8_t isOK = resp.arg[0] & 0xff; uint8_t isOK = resp.arg[0] & 0xff;
if (isOK) { if (isOK) {
uint8_t *data = resp.d.asBytes; uint8_t *d = resp.d.asBytes;
PrintAndLogEx(NORMAL, "\nBlock# | Data | Ascii"); PrintAndLogEx(NORMAL, "\nBlock# | Data | Ascii");
PrintAndLogEx(NORMAL, "-----------------------------"); PrintAndLogEx(NORMAL, "-----------------------------");
PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data, 4)); PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(d, 4), sprint_ascii(d, 4));
} else { } else {
PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK); PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
} }
@ -1769,7 +1769,6 @@ int CmdHF14AMfUDump(const char *Cmd) {
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
bool hasAuthKey = false; bool hasAuthKey = false;
int i = 0;
int pages = 16; int pages = 16;
uint8_t dataLen = 0; uint8_t dataLen = 0;
uint8_t cmdp = 0; uint8_t cmdp = 0;
@ -1864,8 +1863,9 @@ int CmdHF14AMfUDump(const char *Cmd) {
PrintAndLogEx(WARNING, "Command execute time-out"); PrintAndLogEx(WARNING, "Command execute time-out");
return 1; return 1;
} }
if (resp.arg[0] != 1) { if (resp.arg[0] != 1) {
PrintAndLogEx(WARNING, "Failed reading block: (%02x)", i); PrintAndLogEx(WARNING, "Failed dumping card");
return 1; return 1;
} }
@ -1919,9 +1919,9 @@ int CmdHF14AMfUDump(const char *Cmd) {
ul_select(&card); ul_select(&card);
ulev1_getVersion(get_version, sizeof(get_version)); ulev1_getVersion(get_version, sizeof(get_version));
for (uint8_t i = 0; i < 3; ++i) { for (uint8_t n = 0; n < 3; ++n) {
ulev1_readTearing(i, get_tearing + i, 1); ulev1_readTearing(n, get_tearing + n, 1);
ulev1_readCounter(i, get_counter, sizeof(get_counter)); ulev1_readCounter(n, get_counter, sizeof(get_counter));
} }
DropField(); DropField();