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

seems nfc mifare classic dumps used "blocks" instead...

Browse source
This commit is contained in:
iceman1001 2023-11-01 03:17:48 +01:00
commit 98b7bd75d6
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/src/fileutils.c
View file

@ -1050,7 +1050,6 @@ int loadFileNFC_safe(const char *preferredName, void *data, size_t maxdatalen, s
strcleanrn(line, sizeof(line)); strcleanrn(line, sizeof(line));
str_lower(line); str_lower(line);
if (str_startswith(line, "uid:")) { if (str_startswith(line, "uid:")) {
if (ft == NFC_DF_MFC) { if (ft == NFC_DF_MFC) {
param_gethex_to_eol(line + 4, 0, udata.mfc->card_info.uid, sizeof(udata.mfc->card_info.uid), &n); param_gethex_to_eol(line + 4, 0, udata.mfc->card_info.uid, sizeof(udata.mfc->card_info.uid), &n);
@ -1170,15 +1169,27 @@ int loadFileNFC_safe(const char *preferredName, void *data, size_t maxdatalen, s
char *p = line; char *p = line;
while (*p++ != ':') {}; while (*p++ != ':') {};
if (ft == NFC_DF_MFC) { if (ft == NFC_DF_MFU) {
param_gethex_to_eol(p, 0, udata.mfc->dump + (pageno * MFBLOCK_SIZE), MFBLOCK_SIZE, &n);
udata.mfc->dumplen += MFBLOCK_SIZE;
} else if (ft == NFC_DF_MFU) {
param_gethex_to_eol(p, 0, udata.mfu->data + (pageno * MFU_BLOCK_SIZE), MFU_BLOCK_SIZE, &n); param_gethex_to_eol(p, 0, udata.mfu->data + (pageno * MFU_BLOCK_SIZE), MFU_BLOCK_SIZE, &n);
*datalen += MFU_BLOCK_SIZE; *datalen += MFU_BLOCK_SIZE;
} }
continue; continue;
} }
// Block 0: 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF
if (str_startswith(line, "block ")) {
int blockno = 0;
sscanf(line, "block %d:", &blockno);
char *p = line;
while (*p++ != ':') {};
if (ft == NFC_DF_MFC) {
param_gethex_to_eol(p, 0, udata.mfc->dump + (blockno * MFBLOCK_SIZE), MFBLOCK_SIZE, &n);
udata.mfc->dumplen += MFBLOCK_SIZE;
}
continue;
}
} }
// add header length // add header length