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

used predefined constants, common types moved to common header files

Browse Source
This commit is contained in:
Eloff
2019-04-23 21:14:20 +03:00
parent a8c1fa7a3b
commit 66ee8dc09e
5 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/cmdhfmfu.h
View File

@@ -13,20 +13,6 @@
#include "loclass/fileutils.h"
// New Ultralight/NTAG dump file format
// Length must be aligned to 4 bytes (UL/NTAG page)
#define MFU_DUMP_PREFIX_LENGTH 56
typedef struct {
uint8_t version[8];
uint8_t tbo[2];
uint8_t tbo1[1];
uint8_t pages; // max page number in dump
uint8_t signature[32];
uint8_t counter_tearing[3][4]; // 3 bytes counter, 1 byte tearing flag
uint8_t data[1024];
} mfu_dump_t;
// Old Ultralight/NTAG dump file format
// It is used only for converting
#define OLD_MFU_DUMP_PREFIX_LENGTH 48

8
client/loclass/fileutils.c
View File

@@ -584,13 +584,11 @@ int convertOldMfuDump(uint8_t **dump, size_t *dumplen) {
mfu_dump = (mfu_dump_t *) calloc(new_dump_len, sizeof(uint8_t));
memcpy(mfu_dump->version, old_mfu_dump->version, 8);
mfu_dump->tbo[0] = old_mfu_dump->tbo[0];
mfu_dump->tbo[1] = old_mfu_dump->tbo[1];
memcpy(mfu_dump->tbo, old_mfu_dump->tbo, 2);
mfu_dump->tbo1[0] = old_mfu_dump->tbo1[0];
memcpy(mfu_dump->signature, old_mfu_dump->signature, 32);
mfu_dump->counter_tearing[0][3] = old_mfu_dump->tearing[0];
mfu_dump->counter_tearing[1][3] = old_mfu_dump->tearing[1];
mfu_dump->counter_tearing[2][3] = old_mfu_dump->tearing[2];
for (int i = 0; i < 3; i++)
mfu_dump->counter_tearing[i][3] = old_mfu_dump->tearing[i];
memcpy(mfu_dump->data, old_mfu_dump->data, old_data_len);
mfu_dump->pages = old_data_len / 4 - 1;