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

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index dc3b988ae8cddc9367fc3b09ace1a0e454bc6cfa..e6ad6016e04cea011ff4879f66974cd46b290a38 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -237,14 +237,16 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
 \r
 // "MAGIC" CARD\r
 \r
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r
-       uint8_t oldblock0[16] = {0x00};\r
-       uint8_t block0[16] = {0x00};\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {\r
 \r
-       int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
+       uint8_t params = MAGIC_SINGLE;\r
+       uint8_t block0[16];\r
+       memset(block0, 0x00, sizeof(block0));\r
+       \r
+\r
+       int old = mfCGetBlock(0, block0, params);\r
        if (old == 0) {\r
-               memcpy(block0, oldblock0, 16);\r
-               PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r
+               PrintAndLog("old block 0:  %s", sprint_hex(block0, sizeof(block0)));\r
        } else {\r
                PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
        }\r
@@ -255,26 +257,30 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
        // Mifare UID BCC\r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3];\r
        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r
-       if (sak!=NULL)\r
+       if ( sak != NULL )\r
                block0[5]=sak[0];\r
-       if (atqa!=NULL) {\r
+       \r
+       if ( atqa != NULL ) {\r
                block0[6]=atqa[1];\r
                block0[7]=atqa[0];\r
        }\r
        PrintAndLog("new block 0:  %s", sprint_hex(block0,16));\r
-       return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
+       \r
+       if ( wipecard )          params |= MAGIC_WIPE;  \r
+       if ( oldUID == NULL) params |= MAGIC_UID;\r
+       \r
+       return mfCSetBlock(0, block0, oldUID, params);\r
 }\r
 \r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {\r
 \r
        uint8_t isOK = 0;\r
-       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};\r
        memcpy(c.d.asBytes, data, 16); \r
-\r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL) \r
                        memcpy(uid, resp.d.asBytes, 4);\r
@@ -289,9 +295,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
 \r
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
        uint8_t isOK = 0;\r
-\r
-       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
-       \r
+       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};    \r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r