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

FIX: Stop dumping/restoreing a tag if failed to generate filename using uid

Browse Source
This commit is contained in:
Brian Pow
2018-02-07 22:10:59 +08:00
parent 8e04df77ba
commit 19fc90fa71
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/cmdhfmf.c
View File

@@ -786,8 +786,11 @@ int CmdHF14AMfRestore(const char *Cmd) {
return usage_hf14_restore(); return usage_hf14_restore();
filename=GenerateFilename("hf-mf-","-key.bin"); filename=GenerateFilename("hf-mf-","-key.bin");
if (filename == NULL)
return 1;
if ((fkeys = fopen(filename,"rb")) == NULL) { if ((fkeys = fopen(filename,"rb")) == NULL) {
PrintAndLog("Could not find file %s",fkeys); PrintAndLog("Could not find file %s", filename);
return 1; return 1;
} }
@@ -813,6 +816,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
fclose(fkeys); fclose(fkeys);
filename=GenerateFilename("hf-mf-","-data.bin"); filename=GenerateFilename("hf-mf-","-data.bin");
if (filename == NULL)
return 1;
if ((fdump = fopen(filename,"rb")) == NULL) { if ((fdump = fopen(filename,"rb")) == NULL) {
PrintAndLog("Could not find file %s", filename); PrintAndLog("Could not find file %s", filename);
return 1; return 1;
@@ -1076,6 +1082,9 @@ int CmdHF14AMfNested(const char *Cmd) {
// Create dump file // Create dump file
if (createDumpFile) { if (createDumpFile) {
fptr = GenerateFilename("hf-mf-","-key.bin"); fptr = GenerateFilename("hf-mf-","-key.bin");
if (fptr == NULL)
return 1;
if ((fkeys = fopen(fptr, "wb")) == NULL) { if ((fkeys = fopen(fptr, "wb")) == NULL) {
PrintAndLog("[!] could not create file %s", fptr); PrintAndLog("[!] could not create file %s", fptr);
free(e_sector); free(e_sector);
@@ -1420,6 +1429,9 @@ out:
if (createDumpFile) { if (createDumpFile) {
fptr = GenerateFilename("hf-mf-","-key.bin"); fptr = GenerateFilename("hf-mf-","-key.bin");
if (fptr == NULL)
return 1;
FILE *fkeys = fopen(fptr,"wb"); FILE *fkeys = fopen(fptr,"wb");
if (fkeys == NULL) { if (fkeys == NULL) {
PrintAndLog("Could not create file %s", filename); PrintAndLog("Could not create file %s", filename);
@@ -1702,6 +1714,9 @@ out:
if (createDumpFile) { if (createDumpFile) {
fptr = GenerateFilename("hf-mf-","-key.bin"); fptr = GenerateFilename("hf-mf-","-key.bin");
if (fptr == NULL)
return 1;
FILE *fkeys = fopen(fptr,"wb"); FILE *fkeys = fopen(fptr,"wb");
if (fkeys == NULL) { if (fkeys == NULL) {
PrintAndLog("Could not create file %s", fptr); PrintAndLog("Could not create file %s", fptr);