X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f5ed4d12de19dcf59a3d5ecdcd9f75f5c747dd3e..d3a22c7dfa87bf5e21d228849a602194be4a0895:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 748e9c45..49928c9a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -124,10 +124,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
 	PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	PrintAndLog("--data: %s", sprint_hex(bldata, 16));
 	
-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	memcpy(c.d.asBytes + 10, bldata, 16);
-  SendCommand(&c);
+	SendCommand(&c);
 
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -168,9 +168,9 @@ int CmdHF14AMfRdBl(const char *Cmd)
 	}
 	PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	
-  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
-  SendCommand(&c);
+	SendCommand(&c);
 
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -1223,9 +1223,6 @@ int CmdHF14AMfELoad(const char *Cmd)
 		return 1;
 	}
 	
-//		for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-//		for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-	
 	blockNum = 0;
 	while(!feof(f)){
 		memset(buf, 0, sizeof(buf));
@@ -1243,6 +1240,7 @@ int CmdHF14AMfELoad(const char *Cmd)
 			if(strlen(buf) && feof(f))
 				break;
 			PrintAndLog("File content error. Block data must include 32 HEX symbols");
+			fclose(f);
 			return 2;
 		}
 		
@@ -1252,6 +1250,7 @@ int CmdHF14AMfELoad(const char *Cmd)
 		
 		if (mfEmlSetMem(buf8, blockNum, 1)) {
 			PrintAndLog("Cant set emul block: %3d", blockNum);
+			fclose(f);
 			return 3;
 		}
 		blockNum++;
@@ -1262,7 +1261,6 @@ int CmdHF14AMfELoad(const char *Cmd)
 	
 	if ((blockNum != numBlocks)) {
 		PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);
-		fclose(f);
 		return 4;
 	}
 	PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
@@ -1460,11 +1458,12 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 
 	res = mfCSetUID(uid, oldUid, wipeCard);
 	if (res) {
-			PrintAndLog("Can't set UID. error=%d", res);
-			return 1;
-		}
+		PrintAndLog("Can't set UID. error=%d", res);
+		return 1;
+	}
 	
 	PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));
+	PrintAndLog("new UID:%s", sprint_hex(uid, 4));
 	return 0;
 }