magic Chinese card fully supported. Added commands:csetuid-set card uid and wipe...

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 529c248d9604a9c9d8fcee815aab7e17f476d564..399f494a93ef3e940589279713df7553c6a6fd7e 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -217,22 +217,26 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }\r
 \r
 int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe) {\r
-       uint8_t isOK = 0;\r
        uint8_t block0[16];\r
        memset(block0, 0, 16);\r
        memcpy(block0, uid, 4); \r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
+       \r
+       return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
+}\r
+\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint8_t params) {\r
+       uint8_t isOK = 0;\r
 \r
-  UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, 1, 0}};\r
-       memcpy(c.d.asBytes, block0, 16); \r
+  UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+       memcpy(c.d.asBytes, data, 16); \r
   SendCommand(&c);\r
 \r
        UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
        if (resp != NULL) {\r
                isOK  = resp->arg[0] & 0xff;\r
-               PrintAndLog("isOk:%02x", isOK);\r
-               memcpy(oldUID, resp->d.asBytes, 4); \r
+               if (uid != NULL) memcpy(uid, resp->d.asBytes, 4); \r
                if (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r