crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vary expected dump size based on tag type

Browse source
This commit is contained in:
Adam Laurie 2017-03-23 16:42:10 +00:00
parent c04dd91e98
commit 963eb074ec
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
utils/nfc-mfultralight.c
View file

@ -466,6 +466,7 @@ int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
int iAction = 0; int iAction = 0;
uint8_t iDumpSize= sizeof(mifareul_tag);
uint8_t iUID[MAX_UID_LEN] = { 0x0 }; uint8_t iUID[MAX_UID_LEN] = { 0x0 };
size_t szUID = 0; size_t szUID = 0;
bool bOTP = false; bool bOTP = false;
@ -521,30 +522,6 @@ main(int argc, const char *argv[])
} }
} }
if (iAction == 1) {
memset(&mtDump, 0x00, sizeof(mtDump));
} else if (iAction == 2) {
pfDump = fopen(argv[2], "rb");
if (pfDump == NULL) {
ERR("Could not open dump file: %s\n", argv[2]);
exit(EXIT_FAILURE);
}
if (fread(&mtDump, 1, sizeof(mtDump), pfDump) != sizeof(mtDump)) {
ERR("Could not read from dump file: %s\n", argv[2]);
fclose(pfDump);
exit(EXIT_FAILURE);
}
fclose(pfDump);
DBG("Successfully opened the dump file\n");
} else if (iAction == 3) {
DBG("Switching to Check Magic Mode\n");
} else {
ERR("Unable to determine operating mode");
exit(EXIT_FAILURE);
}
nfc_context *context; nfc_context *context;
nfc_init(&context); nfc_init(&context);
if (context == NULL) { if (context == NULL) {
@ -615,11 +592,13 @@ main(int argc, const char *argv[])
printf("48 bytes\n"); printf("48 bytes\n");
uiBlocks= 0x13; uiBlocks= 0x13;
iEV1Type= EV1_UL11; iEV1Type= EV1_UL11;
iDumpSize= sizeof(mifareul_ev1_mf0ul11_tag);
} }
else if(abtRx[6] == 0x0e) { else if(abtRx[6] == 0x0e) {
printf("128 bytes\n"); printf("128 bytes\n");
uiBlocks= 0x28; uiBlocks= 0x28;
iEV1Type= EV1_UL21; iEV1Type= EV1_UL21;
iDumpSize= sizeof(mifareul_ev1_mf0ul21_tag);
} }
else else
printf("unknown!\n"); printf("unknown!\n");
@ -648,6 +627,30 @@ main(int argc, const char *argv[])
} }
} }
if (iAction == 1) {
memset(&mtDump, 0x00, sizeof(mtDump));
} else if (iAction == 2) {
pfDump = fopen(argv[2], "rb");
if (pfDump == NULL) {
ERR("Could not open dump file: %s\n", argv[2]);
exit(EXIT_FAILURE);
}
if (fread(&mtDump, 1, sizeof(mtDump), pfDump) != iDumpSize) {
ERR("Could not read from dump file or size mismatch: %s\n", argv[2]);
fclose(pfDump);
exit(EXIT_FAILURE);
}
fclose(pfDump);
DBG("Successfully opened the dump file\n");
} else if (iAction == 3) {
DBG("Switching to Check Magic Mode\n");
} else {
ERR("Unable to determine operating mode");
exit(EXIT_FAILURE);
}
if (iAction == 1) { if (iAction == 1) {
bool bRF= read_card(); bool bRF= read_card();
printf("Writing data to file: %s ... ", argv[2]); printf("Writing data to file: %s ... ", argv[2]);