From: iceman1001 <iceman@iuse.se>
Date: Mon, 9 Mar 2015 21:03:24 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/652c39c63bce093cec80b174dfb0d8154e7c6827?ds=inline;hp=-c

Merge branch 'master' of https://github.com/Proxmark/proxmark3
---

652c39c63bce093cec80b174dfb0d8154e7c6827
diff --combined client/cmdhfmf.c
index 3c9f2543,c16b9674..53e71743
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -1023,7 -1023,6 +1023,7 @@@ int CmdHF14AMf1kSim(const char *Cmd
  		PrintAndLog("           x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
  		PrintAndLog("");
  		PrintAndLog("           sample: hf mf sim u 0a0a0a0a ");
 +		PrintAndLog("                 : hf mf sim u 0a0a0a0a i x");
  		return 0;
  	}
  	uint8_t pnr = 0;
@@@ -1500,7 -1499,7 +1500,7 @@@ int CmdHF14AMfCSetUID(const char *Cmd
  
  int CmdHF14AMfCSetBlk(const char *Cmd)
  {
 -	uint8_t uid[8] = {0x00};
 +	//uint8_t uid[8] = {0x00};
  	uint8_t memBlock[16] = {0x00};
  	uint8_t blockNo = 0;
  	int res;
@@@ -1522,8 -1521,7 +1522,8 @@@
  
  	PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
  
 -	res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
 +	//res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
 +	res = mfCSetBlock(blockNo, memBlock, NULL, 0, CSETBLOCK_SINGLE_OPER);
  	if (res) {
  			PrintAndLog("Can't write block. error=%d", res);
  			return 1;
@@@ -1556,15 -1554,14 +1556,14 @@@ int CmdHF14AMfCLoad(const char *Cmd
  	if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;
  	
  	if (fillFromEmulator) {
- 		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
  		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
  			if (mfEmlGetMem(buf8, blockNum, 1)) {
  				PrintAndLog("Cant get block: %d", blockNum);
  				return 2;
  			}
- 			
- 			if (blockNum == 2) flags = 0;
- 			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+ 			if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;				// switch on field and send magic sequence
+ 			if (blockNum == 1) flags = 0;													// just write
+ 			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;		// Done. Magic Halt and switch off field.
  
  			if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
  				PrintAndLog("Cant set magic card block: %d", blockNum);
@@@ -1589,7 -1586,6 +1588,6 @@@
  		}
  	
  		blockNum = 0;
- 		flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
  		while(!feof(f)){
  		
  			memset(buf, 0, sizeof(buf));
@@@ -1599,7 -1595,7 +1597,7 @@@
  				return 2;
  			}
  
- 			if (strlen(buf) < 32){
+ 			if (strlen(buf) < 32) {
  				if(strlen(buf) && feof(f))
  					break;
  				PrintAndLog("File content error. Block data must include 32 HEX symbols");
@@@ -1608,8 -1604,9 +1606,9 @@@
  			for (i = 0; i < 32; i += 2)
  				sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
  
- 			if (blockNum == 2) flags = 0;
- 			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+ 			if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;				// switch on field and send magic sequence
+ 			if (blockNum == 1) flags = 0;													// just write
+ 			if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;		// Done. Switch off field.
  
  			if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
  				PrintAndLog("Can't set magic card block: %d", blockNum);