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

allow partial writes. tidy up usage.

Browse source
This commit is contained in:
Adam Laurie 2017-03-23 18:19:59 +00:00
parent 963eb074ec
commit a9f3e3a2ac
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
utils/nfc-mfultralight.c
View file

@ -451,15 +451,17 @@ static void
print_usage(const char *argv[]) print_usage(const char *argv[])
{ {
printf("Usage: %s r|w <dump.mfd> [OPTIONS]\n", argv[0]); printf("Usage: %s r|w <dump.mfd> [OPTIONS]\n", argv[0]);
printf("Arguments:\n");
printf("\tr|w - Perform read or write\n");
printf("\t<dump.mfd> - MiFare Dump (MFD) used to write (card to MFD) or (MFD to card)\n");
printf("Options:\n"); printf("Options:\n");
printf("\tr|w\t\t - Perform read or write\n"); printf("\t--otp - Don't prompt for OTP writing (Assume yes)\n");
printf("\t<dump.mfd>\t - MiFare Dump (MFD) used to write (card to MFD) or (MFD to card)\n"); printf("\t--lock - Don't prompt for Lockbit writing (Assume yes)\n");
printf("\t--otp\t\t - Don't prompt for OTP writing (Assume yes)\n"); printf("\t--uid - Don't prompt for UID writing (Assume yes)\n");
printf("\t--lock\t\t - Don't prompt for Lockbit writing (Assume yes)\n"); printf("\t--full - Assume full card write (UID + OTP + Lockbit)\n");
printf("\t--uid\t\t - Don't prompt for UID writing (Assume yes)\n"); printf("\t--with-uid <UID> - Specify UID to read/write from\n");
printf("\t--full\t\t - Assume full card write (UID + OTP + Lockbit)\n"); printf("\t--pw <PWD> - Specify 8 HEX digit PASSWORD for EV1\n");
printf("\t--with-uid <UID>\t\t - Specify UID to read/write from\n"); printf("\t--partial - Allow source data size to be other than tag capacity\n");
printf("\t--pw <PWD>\t\t - Specify 8 HEX digit PASSWORD for EV1\n");
} }
int int
@ -473,6 +475,7 @@ main(int argc, const char *argv[])
bool bLock = false; bool bLock = false;
bool bUID = false; bool bUID = false;
bool bPWD = false; bool bPWD = false;
bool bPart = false;
FILE *pfDump; FILE *pfDump;
if (argc < 2) { if (argc < 2) {
@ -506,6 +509,8 @@ main(int argc, const char *argv[])
bUID = true; bUID = true;
} else if (0 == strcmp(argv[arg], "--check-magic")) { } else if (0 == strcmp(argv[arg], "--check-magic")) {
iAction = 3; iAction = 3;
} else if (0 == strcmp(argv[arg], "--partial")) {
bPart= true;
} else if (0 == strcmp(argv[arg], "--pw")) { } else if (0 == strcmp(argv[arg], "--pw")) {
bPWD= true; bPWD= true;
if(strlen(argv[++arg]) != 8 || ! ev1_load_pwd(iPWD, argv[arg])) { if(strlen(argv[++arg]) != 8 || ! ev1_load_pwd(iPWD, argv[arg])) {
@ -637,11 +642,14 @@ main(int argc, const char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (fread(&mtDump, 1, sizeof(mtDump), pfDump) != iDumpSize) { size_t szDump;
if (((szDump= fread(&mtDump, 1, sizeof(mtDump), pfDump)) != iDumpSize && !bPart) || szDump <= 0) {
ERR("Could not read from dump file or size mismatch: %s\n", argv[2]); ERR("Could not read from dump file or size mismatch: %s\n", argv[2]);
fclose(pfDump); fclose(pfDump);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(szDump != iDumpSize)
printf("Performing partial write\n");
fclose(pfDump); fclose(pfDump);
DBG("Successfully opened the dump file\n"); DBG("Successfully opened the dump file\n");
} else if (iAction == 3) { } else if (iAction == 3) {