Fixed writing em410x 40bits UID on T5555/T55x7 tags on 32bits systems

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 2ce0b5e2c02188e501752b42b49f8679adbdbd9a..fb6a4bdbed7172ee4959c801c57427bb3f9ba18c 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -1,4 +1,4 @@
-// Merlok, 2011\r
+// Merlok, 2011, 2012\r
 // people from mifare@nethemba.com, 2010\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
@@ -198,9 +198,9 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * key
 }\r
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
-  UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
  \r
-  SendCommand(&c);\r
+       SendCommand(&c);\r
 \r
        UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
@@ -210,9 +210,9 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
 }\r
 \r
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
-  UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
        memcpy(c.d.asBytes, data, blocksCount * 16); \r
-  SendCommand(&c);\r
+       SendCommand(&c);\r
        return 0;\r
 }\r
 \r
@@ -221,23 +221,45 @@ int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe) {
        memset(block0, 0, 16);\r
        memcpy(block0, uid, 4); \r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
+       // mifare classic SAK(byte 5) and ATQA(byte 6 and 7)\r
+       block0[5] = 0x88;\r
+       block0[6] = 0x04;\r
+       block0[7] = 0x00;\r
        \r
-       return mfCSetBlock(0, block0, oldUID, wantWipe);\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) {\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, blockNo}};\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
+       SendCommand(&c);\r
+\r
+       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+\r
+       if (resp != NULL) {\r
+               isOK  = resp->arg[0] & 0xff;\r
+               if (uid != NULL) memcpy(uid, resp->d.asBytes, 4); \r
+               if (!isOK) return 2;\r
+       } else {\r
+               PrintAndLog("Command execute timeout");\r
+               return 1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
+       uint8_t isOK = 0;\r
+\r
+       UsbCommand c = {CMD_MIFARE_EML_CGETBLOCK, {params, 0, blockNo}};\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(uid, resp->d.asBytes, 4); \r
+               memcpy(data, resp->d.asBytes, 16); \r
                if (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r