mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 21:33:47 -07:00
hf mf restore - when using keyfile as auth, use dump data for sectortrailer
This commit is contained in:
parent
d2421a2dd4
commit
924a8163d0
1 changed files with 15 additions and 13 deletions
|
@ -1230,19 +1230,21 @@ static int CmdHF14AMfRestore(const char *Cmd) {
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer
|
if (use_keyfile_for_auth == false) {
|
||||||
bldata[0] = (keyA[sectorNo][0]);
|
if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer
|
||||||
bldata[1] = (keyA[sectorNo][1]);
|
bldata[0] = (keyA[sectorNo][0]);
|
||||||
bldata[2] = (keyA[sectorNo][2]);
|
bldata[1] = (keyA[sectorNo][1]);
|
||||||
bldata[3] = (keyA[sectorNo][3]);
|
bldata[2] = (keyA[sectorNo][2]);
|
||||||
bldata[4] = (keyA[sectorNo][4]);
|
bldata[3] = (keyA[sectorNo][3]);
|
||||||
bldata[5] = (keyA[sectorNo][5]);
|
bldata[4] = (keyA[sectorNo][4]);
|
||||||
bldata[10] = (keyB[sectorNo][0]);
|
bldata[5] = (keyA[sectorNo][5]);
|
||||||
bldata[11] = (keyB[sectorNo][1]);
|
bldata[10] = (keyB[sectorNo][0]);
|
||||||
bldata[12] = (keyB[sectorNo][2]);
|
bldata[11] = (keyB[sectorNo][1]);
|
||||||
bldata[13] = (keyB[sectorNo][3]);
|
bldata[12] = (keyB[sectorNo][2]);
|
||||||
bldata[14] = (keyB[sectorNo][4]);
|
bldata[13] = (keyB[sectorNo][3]);
|
||||||
bldata[15] = (keyB[sectorNo][5]);
|
bldata[14] = (keyB[sectorNo][4]);
|
||||||
|
bldata[15] = (keyB[sectorNo][5]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(data + 10, bldata, 16);
|
memcpy(data + 10, bldata, 16);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue