added mifare changable UID support

client/cmdhfmf.c

@@ -143,11 +143,12 @@ int CmdHF14AMfWrBl(const char *Cmd)
 int CmdHF14AMfUWrBl(const char *Cmd)
 {
        uint8_t blockNo = 0;
+bool chinese_card=0;
        uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 UsbCommand resp;
        
        if (strlen(Cmd)<3) {
-                PrintAndLog("Usage:  hf mf uwrbl    <block number> <block data (8 hex symbols)>");
+               PrintAndLog("Usage:  hf mf uwrbl    <block number> <block data (8 hex symbols)> <w>");
                PrintAndLog("        sample: hf mf uwrbl 0 01020304");
                return 0;
        }      
@@ -157,16 +158,51 @@ int CmdHF14AMfUWrBl(const char *Cmd)
                PrintAndLog("Block data must include 8 HEX symbols");
                return 1;
        }
-
+if (strchr(Cmd,'w') != 0) {
+chinese_card=1;
+}
 switch(blockNo)
 {
 case 0:
+if (!chinese_card){
 PrintAndLog("Access Denied");
+}else{
+PrintAndLog("--specialblock no:%02x", blockNo);
+                PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+                UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
+                memcpy(d.d.asBytes,bldata, 4);
+                SendCommand(&d);
+
+                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+                        uint8_t isOK  = resp.arg[0] & 0xff;
+                        PrintAndLog("isOk:%02x", isOK);
+                } else {
+                        PrintAndLog("Command execute timeout");
+                }
+}
 break;
 case 1:
+if (!chinese_card){
 PrintAndLog("Access Denied");
+}else{
+PrintAndLog("--specialblock no:%02x", blockNo);
+                PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+                UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
+                memcpy(d.d.asBytes,bldata, 4);
+                SendCommand(&d);
+
+                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+                        uint8_t isOK  = resp.arg[0] & 0xff;
+                        PrintAndLog("isOk:%02x", isOK);
+                } else {
+                        PrintAndLog("Command execute timeout");
+                }
+}
 break;
 case 2:
+   if (!chinese_card){
+PrintAndLog("Access Denied");
+}else{
  PrintAndLog("--specialblock no:%02x", blockNo);
                PrintAndLog("--data: %s", sprint_hex(bldata, 4));
                UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
@@ -179,6 +215,7 @@ int CmdHF14AMfUWrBl(const char *Cmd)
                } else {
                        PrintAndLog("Command execute timeout");
                }
+       }
 break;
 case 3:
        PrintAndLog("--specialblock no:%02x", blockNo);
@@ -947,28 +984,19 @@ int CmdHF14AMfChk(const char *Cmd)
 keyBlock = calloc(stKeyBlock, 6);
 if (keyBlock == NULL) return 1;
 
-	uint64_t defaultKeys[] =
+num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)
-	{
+num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key
-		0xffffffffffff, // Default key (first key used by program if no user defined key)
+num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key
-		0x000000000000, // Blank key
+num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));
-		0xa0a1a2a3a4a5, // NFCForum MAD key
+num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));
-		0xb0b1b2b3b4b5,
+num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));
-		0xaabbccddeeff,
+num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));
-		0x4d3a99c351dd,
+num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));
-		0x1a982c7e459a,
+num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));
-		0xd3f7d3f7d3f7,
+num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));
-		0x714c5c886e97,
+num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));
-		0x587ee5f9350f,
+num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));
-		0xa0478cc39091,
+num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));
-		0x533cb6c723f6,
-		0x8fd0a4f256e9
-	};
-	int defaultKeysSize = (sizeof(defaultKeys) / 7) - 1;
-
-	for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)
-	{
-		num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));
-	}
 
 if (strlen(Cmd)<3) {
 PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");
@@ -1038,7 +1066,13 @@ int CmdHF14AMfChk(const char *Cmd)
 }
 
 if ( (f = fopen( filename , "r")) ) {
-				while( fgets(buf, sizeof(buf), f) ){
+while( !feof(f) ){
+memset(buf, 0, sizeof(buf));
+if (fgets(buf, sizeof(buf), f) == NULL) {
+PrintAndLog("File reading error.");
+return 2;
+}
+         
 if (strlen(buf) < 12 || buf[11] == '\n')
 continue;
 
@@ -1066,7 +1100,6 @@ int CmdHF14AMfChk(const char *Cmd)
 num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
 PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 keycnt++;
-					memset(buf, 0, sizeof(buf));
 }
 } else {
 PrintAndLog("File: %s: not found or locked.", filename);
@@ -1079,7 +1112,7 @@ int CmdHF14AMfChk(const char *Cmd)
 
 if (keycnt == 0) {
 PrintAndLog("No key specified,try default keys");
-		for (;keycnt < defaultKeysSize; keycnt++)
+for (;keycnt <=12; keycnt++)
 PrintAndLog("chk default key[%d] %02x%02x%02x%02x%02x%02x", keycnt,
 (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);