dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gcc11.1 warnings, it was a bug. Where the special block was added to 0xFF instead of direct after reserved blocks.

Browse Source
This commit is contained in:
iceman1001
2021-05-13 21:14:56 +02:00
parent 62c310f750
commit ed87304ca6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/cmdhf14b.c
View File

@@ -1376,12 +1376,15 @@ static int CmdHF14BDump(const char *Cmd) {
continue; continue;
} }
memcpy(data + (blocknum * 4), recv, 4);
// last read // last read
if (blocknum == 0xFF) { if (blocknum == 0xFF) {
// we reserved space for this block after 0x0F and 0x7F, ie 0x10, 0x80
memcpy(data + (blocks * 4), recv, 4);
break; break;
} }
memcpy(data + (blocknum * 4), recv, 4);
retry = 0; retry = 0;
blocknum++; blocknum++;
@@ -1403,8 +1406,8 @@ static int CmdHF14BDump(const char *Cmd) {
return switch_off_field_14b(); return switch_off_field_14b();
} }
PrintAndLogEx(DEBUG, "systemblock : %s", sprint_hex(data + (blocknum * 4), 4)); PrintAndLogEx(DEBUG, "systemblock : %s", sprint_hex(data + (blocks * 4), 4));
PrintAndLogEx(DEBUG, " otp lock : %02x %02x", data[(blocknum * 4)], data[(blocknum * 4) + 1]); PrintAndLogEx(DEBUG, " otp lock : %02x %02x", data[(blocks * 4)], data[(blocks * 4) + 1]);
PrintAndLogEx(INFO, " block# | data |lck| ascii"); PrintAndLogEx(INFO, " block# | data |lck| ascii");
@@ -1416,7 +1419,7 @@ static int CmdHF14BDump(const char *Cmd) {
i, i,
i, i,
sprint_hex(data + (i * 4), 4), sprint_hex(data + (i * 4), 4),
get_st_lock_info(chipid, data + (blocknum * 4), i), get_st_lock_info(chipid, data + (blocks * 4), i),
sprint_ascii(data + (i * 4), 4) sprint_ascii(data + (i * 4), 4)
); );
} }
@@ -1426,7 +1429,7 @@ static int CmdHF14BDump(const char *Cmd) {
0xFF, 0xFF,
0xFF, 0xFF,
sprint_hex(data + (0xFF * 4), 4), sprint_hex(data + (0xFF * 4), 4),
get_st_lock_info(chipid, data + (blocknum * 4), 0xFF), get_st_lock_info(chipid, data + (blocks * 4), 0xFF),
sprint_ascii(data + (0xFF * 4), 4) sprint_ascii(data + (0xFF * 4), 4)
); );
PrintAndLogEx(INFO, "---------+--------------+---+----------"); PrintAndLogEx(INFO, "---------+--------------+---+----------");