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

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 7f784850841095713a0a54284259bf9e1b552d05..6716f7eb6077f0488a5a4274fed4954c52e804b6 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -72,7 +72,6 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        uint16_t i, len;\r
        uint32_t uid;\r
        UsbCommand resp;\r
        uint16_t i, len;\r
        uint32_t uid;\r
        UsbCommand resp;\r

-\r

        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r
        \r
        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r
        \r


@@ -216,7 +215,7 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
        SendCommand(&c);\r
 \r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
        SendCommand(&c);\r
 \r

-  UsbCommand resp;\r
+       UsbCommand resp;\r

        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
        memcpy(data, resp.d.asBytes, blocksCount * 16);\r
        return 0;\r
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
        memcpy(data, resp.d.asBytes, blocksCount * 16);\r
        return 0;\r


@@ -231,28 +230,31 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 \r
 // "MAGIC" CARD\r
 \r
 \r
 // "MAGIC" CARD\r
 \r

-int mfCSetUID(uint8_t *uid, uint8_t *oldUID, bool wantWipe) {\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
        uint8_t oldblock0[16] = {0x00};\r
        uint8_t block0[16] = {0x00};\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] = 0x08;\r
-       //block0[6] = 0x04;\r
-       //block0[7] = 0x00;\r
-       \r
-       block0[5] = 0x01;  //sak\r
-       block0[6] = 0x01;\r
-       block0[7] = 0x0f;\r
-       \r
+\r

        int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
        int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r

-       if ( old == 0) {\r
-               memcpy(block0+8, oldblock0+8, 8);\r
-               PrintAndLog("block 0:  %s", sprint_hex(block0,16));\r
+       if (old == 0) {\r
+               memcpy(block0, oldblock0, 16);\r
+               PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r

        } else {\r
        } else {\r

-               PrintAndLog("Couldn't get olddata. Will write over the last bytes of Block 0.");\r
+               PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
+       }\r
+\r
+       // fill in the new values\r
+       // UID\r
+       memcpy(block0, uid, 4); \r
+       // 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
+               block0[5]=sak[0];\r
+       if (atqa!=NULL) {\r
+               block0[6]=atqa[1];\r
+               block0[7]=atqa[0];\r

        }\r
        }\r

+       PrintAndLog("new block 0:  %s", sprint_hex(block0,16));\r

        return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
 }\r
 \r
        return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
 }\r
 \r


@@ -263,7 +265,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r
        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r

-  UsbCommand resp;\r
+       UsbCommand resp;\r

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL) \r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL) \r


@@ -362,10 +364,10 @@ int loadTraceCard(uint8_t *tuid) {
        \r
                memset(buf, 0, sizeof(buf));\r
                if (fgets(buf, sizeof(buf), f) == NULL) {\r
        \r
                memset(buf, 0, sizeof(buf));\r
                if (fgets(buf, sizeof(buf), f) == NULL) {\r

-                       PrintAndLog("File reading error.");\r
+      PrintAndLog("File reading error.");\r

                        fclose(f);\r
                        return 2;\r
                        fclose(f);\r
                        return 2;\r

-       }\r
+    }\r

 \r
                if (strlen(buf) < 32){\r
                        if (feof(f)) break;\r
 \r
                if (strlen(buf) < 32){\r
                        if (feof(f)) break;\r


@@ -471,7 +473,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
                \r
                // AUTHENTICATION\r
                }\r
                \r
                // AUTHENTICATION\r

-               if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r
+               if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r

                        traceState = TRACE_AUTH1;\r
                        traceCurBlock = data[1];\r
                        traceCurKey = data[0] == 60 ? 1:0;\r
                        traceState = TRACE_AUTH1;\r
                        traceCurBlock = data[1];\r
                        traceCurKey = data[0] == 60 ? 1:0;\r