X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/760157f50bbb2c9b4f2ab01a74d76d062fc418ba..53f7c75a38a18e79313e7bd5f664a11a73db5307:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c25ba32b..dc8f7898 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -246,8 +246,7 @@ start:
 		uint64_t key64 = 0;
 		int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);
 		if ( res > 0 ) {
-			PrintAndLog("Candidate Key found (%012"llx")", r_key);	
-			PrintAndLog("Failing is expected to happen. Trying again ...");
+			PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. Starting over darkside attack", r_key);	
 			goto start;
 		}
 		PrintAndLog("Found valid key: %012"llx" \n", r_key);
@@ -476,6 +475,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
+			fin = NULL;
 			return 2;
 		}
 	}
@@ -486,12 +486,14 @@ int CmdHF14AMfDump(const char *Cmd) {
 		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
+			fin = NULL;
 			return 2;
 		}
 	}
 	
 	fclose(fin);
-
+	fin = NULL;
+			
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|------ Reading sector access bits...-----|");
 	PrintAndLog("|-----------------------------------------|");
@@ -597,6 +599,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
 		fwrite(carddata, 1, 16*numblocks, fout);
 		fclose(fout);
+		fout = NULL;		
 		PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);
 	}
 		
@@ -645,6 +648,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
 			fclose(fkeys);
+			fkeys = NULL;
 			return 2;
 		}
 	}
@@ -654,6 +658,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
 			fclose(fkeys);
+			fkeys = NULL;
 			return 2;
 		}
 	}
@@ -674,6 +679,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			if ( bytes_read == 0) {
 				PrintAndLog("File reading error (dumpdata.bin).");
 				fclose(fdump);
+				fdump = NULL;				
 				return 2;
 			}
 					
@@ -709,6 +715,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	}
 	
 	fclose(fdump);
+	fdump = NULL;	
 	return 0;
 }
 
@@ -1051,7 +1058,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			slow ? "Yes" : "No",
 			tests);
 
-	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);
+	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests);
 
 	if (isOK) {
 		switch (isOK) {
@@ -2449,9 +2456,9 @@ static command_t CommandTable[] = {
 	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
 	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
 	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
-	{"chk",			CmdHF14AMfChk,			0, "Test block keys"},
-	{"mifare",		CmdHF14AMifare,			0, "Read parity error messages."},
-	{"nested",		CmdHF14AMfNested,		0, "Test nested authentication"},
+	{"chk",			CmdHF14AMfChk,			0, "Check keys"},
+	{"mifare",		CmdHF14AMifare,			0, "Darkside attack. read parity error messages."},
+	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
 	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
 	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
 	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},