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

hf mf restore - now uses the binary key loading fct()

Browse source
This commit is contained in:
iceman1001 2023-05-30 14:14:21 +02:00
commit 2356dfea73
1 changed files with 26 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

73
client/src/cmdhfmf.c
View file

@ -1256,52 +1256,40 @@ static int CmdHF14AMfRestore(const char *Cmd) {
free(fptr); free(fptr);
} }
FILE *f; //
if ((f = fopen(keyfilename, "rb")) == NULL) { size_t alen = 0, blen = 0;
PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), keyfilename); uint8_t *keyA, *keyB;
return PM3_EFILE; if (loadFileBinaryKey(keyfilename, "", (void**)&keyA, (void**)&keyB, &alen, &blen) != PM3_SUCCESS) {
if (keyA) {
free(keyA);
}
return PM3_ESOFT;
} }
// key arrays
uint8_t keyA[40][6];
uint8_t keyB[40][6];
// read key file
size_t bytes_read;
for (uint8_t s = 0; s < sectors; s++) {
bytes_read = fread(keyA[s], 1, 6, f);
if (bytes_read != 6) {
PrintAndLogEx(ERR, "File reading error " _YELLOW_("%s"), keyfilename);
fclose(f);
return PM3_EFILE;
}
}
for (uint8_t s = 0; s < sectors; s++) {
bytes_read = fread(keyB[s], 1, 6, f);
if (bytes_read != 6) {
PrintAndLogEx(ERR, "File reading error " _YELLOW_("%s"), keyfilename);
fclose(f);
return PM3_EFILE;
}
}
fclose(f);
// try reading card uid and create filename // try reading card uid and create filename
if (datafnlen == 0) { if (datafnlen == 0) {
char *fptr = GenerateFilename("hf-mf-", "-dump.bin"); char *fptr = GenerateFilename("hf-mf-", "-dump.bin");
if (fptr == NULL) if (fptr == NULL) {
if (keyA) {
free(keyA);
}
if (keyB) {
free(keyB);
}
return PM3_ESOFT; return PM3_ESOFT;
}
strcpy(datafilename, fptr); strcpy(datafilename, fptr);
free(fptr); free(fptr);
} }
// read dump file // read dump file
uint8_t *dump = NULL; uint8_t *dump = NULL;
bytes_read = 0; size_t bytes_read = 0;
int res = pm3_load_dump(datafilename, (void **)&dump, &bytes_read, (MFBLOCK_SIZE * MIFARE_4K_MAXBLOCK)); int res = pm3_load_dump(datafilename, (void **)&dump, &bytes_read, (MFBLOCK_SIZE * MIFARE_4K_MAXBLOCK));
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
free(keyA);
free(keyB);
return res; return res;
} }
@ -1326,19 +1314,10 @@ static int CmdHF14AMfRestore(const char *Cmd) {
if (mfNumBlocksPerSector(s) - 1 == b) { if (mfNumBlocksPerSector(s) - 1 == b) {
if (use_keyfile_for_auth == false) { if (use_keyfile_for_auth == false) {
// replace KEY A // replace KEY A
bldata[0] = (keyA[s][0]); memcpy(bldata, keyA + (s * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
bldata[1] = (keyA[s][1]);
bldata[2] = (keyA[s][2]);
bldata[3] = (keyA[s][3]);
bldata[4] = (keyA[s][4]);
bldata[5] = (keyA[s][5]);
// replace KEY B // replace KEY B
bldata[10] = (keyB[s][0]); memcpy(bldata + 10, keyB + (s * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
bldata[11] = (keyB[s][1]);
bldata[12] = (keyB[s][2]);
bldata[13] = (keyB[s][3]);
bldata[14] = (keyB[s][4]);
bldata[15] = (keyB[s][5]);
} }
// ensure access right isn't messed up. // ensure access right isn't messed up.
@ -1372,12 +1351,12 @@ static int CmdHF14AMfRestore(const char *Cmd) {
for (int8_t kt = MF_KEY_B; kt > -1; kt--) { for (int8_t kt = MF_KEY_B; kt > -1; kt--) {
if (use_keyfile_for_auth) { if (use_keyfile_for_auth) {
if (kt == MF_KEY_A) if (kt == MF_KEY_A)
memcpy(wdata, keyA[s], 6); memcpy(wdata, keyA + (s * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
else else
memcpy(wdata, keyB[s], 6); memcpy(wdata, keyB+ (s * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
} else { } else {
// use default key to authenticate for the write command // use default key to authenticate for the write command
memcpy(wdata, default_key, 6); memcpy(wdata, default_key, MIFARE_KEY_SIZE);
} }
PrintAndLogEx(INFO, "block %3d: %s", mfFirstBlockOfSector(s) + b, sprint_hex(bldata, sizeof(bldata))); PrintAndLogEx(INFO, "block %3d: %s", mfFirstBlockOfSector(s) + b, sprint_hex(bldata, sizeof(bldata)));
@ -1404,6 +1383,8 @@ static int CmdHF14AMfRestore(const char *Cmd) {
} // end loop S } // end loop S
free(ref_dump); free(ref_dump);
free(keyA);
free(keyB);
PrintAndLogEx(INFO, "Done!"); PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS; return PM3_SUCCESS;
} }