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

fix wrong sector trailer detection

Browse source
This commit is contained in:
iceman1001 2023-06-23 17:44:15 +02:00
commit d1b62a5fc2
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhfmf.c
View file

@ -280,8 +280,8 @@ static void mf_print_blocks(uint16_t n, uint8_t *d, bool verbose) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
} }
// assumes n is in number of blocks 0..255
static int mf_print_keys(uint16_t n, uint8_t *d) { static int mf_print_keys(uint16_t n, uint8_t *d) {
uint8_t sectors = 0; uint8_t sectors = 0;
switch (n) { switch (n) {
case MIFARE_MINI_MAXBLOCK: case MIFARE_MINI_MAXBLOCK:
@ -321,6 +321,7 @@ static int mf_print_keys(uint16_t n, uint8_t *d) {
} }
// MFC dump , extract and save the keys to key file // MFC dump , extract and save the keys to key file
// assumes n is in number of blocks 0..255
static int mf_save_keys_from_arr(uint16_t n, uint8_t *d) { static int mf_save_keys_from_arr(uint16_t n, uint8_t *d) {
uint8_t sectors = 0; uint8_t sectors = 0;
switch (n) { switch (n) {
@ -412,6 +413,7 @@ static bool mf_write_block(const uint8_t *key, uint8_t keytype, uint8_t blockno,
return (resp.oldarg[0] & 0xff); return (resp.oldarg[0] & 0xff);
} }
// assumes n is in number of blocks 0..255
static void mf_analyse_acl(uint16_t n, uint8_t *d) { static void mf_analyse_acl(uint16_t n, uint8_t *d) {
for (uint16_t b = 3; b < n; b++) { for (uint16_t b = 3; b < n; b++) {
@ -6252,7 +6254,7 @@ skipfile:
memcpy(block, firstblocks[b], MFBLOCK_SIZE); memcpy(block, firstblocks[b], MFBLOCK_SIZE);
break; break;
default: { default: {
if (mfIsSectorTrailer(j)) { if (mfIsSectorTrailerBasedOnBlocks(i,j)) {
// ST NDEF // ST NDEF
memcpy(block, firstblocks[7], MFBLOCK_SIZE); memcpy(block, firstblocks[7], MFBLOCK_SIZE);
} }
@ -7078,7 +7080,7 @@ static int CmdHF14AMfWipe(const char *Cmd) {
uint8_t data[26]; uint8_t data[26];
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
if (mfIsSectorTrailer(b)) { if (mfIsSectorTrailerBasedOnBlocks(s, b)) {
memcpy(data + 10, st, sizeof(st)); memcpy(data + 10, st, sizeof(st));
} else { } else {
memcpy(data + 10, zeros, sizeof(zeros)); memcpy(data + 10, zeros, sizeof(zeros));