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

chg: fileutils tries to add pack when converting old -> new dump format

Browse source
This commit is contained in:
iceman1001 2020-06-14 08:17:10 +02:00
commit fef8ef6aa4
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/fileutils.c
View file

@ -1369,6 +1369,17 @@ static int convert_plain_mfu_dump(uint8_t **dump, size_t *dumplen, bool verbose)
} }
static int convert_old_mfu_dump(uint8_t **dump, size_t *dumplen, bool verbose) { static int convert_old_mfu_dump(uint8_t **dump, size_t *dumplen, bool verbose) {
/* For reference
typedef struct {
uint8_t version[8];
uint8_t tbo[2];
uint8_t tearing[3];
uint8_t pack[2];
uint8_t tbo1[1];
uint8_t signature[32];
uint8_t data[1024];
} PACKED old_mfu_dump_t;
*/
// convert old format // convert old format
old_mfu_dump_t *old_mfu_dump = (old_mfu_dump_t *)*dump; old_mfu_dump_t *old_mfu_dump = (old_mfu_dump_t *)*dump;
@ -1392,8 +1403,10 @@ static int convert_old_mfu_dump(uint8_t **dump, size_t *dumplen, bool verbose) {
} }
memcpy(mfu_dump->data, old_mfu_dump->data, sizeof(mfu_dump->data)); memcpy(mfu_dump->data, old_mfu_dump->data, sizeof(mfu_dump->data));
mfu_dump->pages = old_data_len / 4 - 1; mfu_dump->pages = old_data_len / 4 - 1;
// Add PACK to last block of memory.
memcpy(mfu_dump->data + (mfu_dump->pages * 4 + MFU_DUMP_PREFIX_LENGTH), old_mfu_dump->pack, 2);
if (verbose) { if (verbose) {
PrintAndLogEx(SUCCESS, "old mfu dump format was converted to " _GREEN_("%d") " blocks", mfu_dump->pages + 1); PrintAndLogEx(SUCCESS, "old mfu dump format was converted to " _GREEN_("%d") " blocks", mfu_dump->pages + 1);