MFU dump UL-C with key

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ecd8728db9c4b9dcf3168b3207665cd1bf676597..3a93240925b0407fdeab975e769564323e844cad 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -17,6 +17,15 @@
 #include "apps.h"\r
 #include "util.h"\r
 \r
 #include "apps.h"\r
 #include "util.h"\r
 \r

+#include "des.h"\r
+#include "crc.h"\r
+\r
+// the block number for the ISO14443-4 PCB\r
+uint8_t pcb_blocknum = 0;\r
+// Deselect card by sending a s-block. the crc is precalced for speed\r
+static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
+\r
+\r

 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
 // read block\r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
 // read block\r


@@ -39,7 +48,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        pcs = &mpcs;\r
 \r
        // clear trace\r
        pcs = &mpcs;\r
 \r
        // clear trace\r

-       iso14a_clear_trace();\r
+       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        LED_A_ON();\r


@@ -80,45 +89,185 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r

-       // Thats it...\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r

-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
+\r
+       byte_t dataoutbuf[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0x00;\r
+\r
+       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
+    \r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
+               OnError(0);\r
+               return;\r
+       };\r
+       \r
+       if(mifare_ultra_auth1(dataoutbuf)){\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r
+               OnError(1);\r
+               return;\r
+       }\r
+\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
+    \r
+    cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);\r
+       LEDsoff();\r
+}\r
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
+\r
+       uint8_t key[16] = {0x00};\r
+       byte_t dataoutbuf[16] = {0x00};\r
+    \r
+       memcpy(key, datain, 16);\r
+    \r
+       LED_A_ON();     LED_B_OFF(); LED_C_OFF();\r
+       \r
+       if(mifare_ultra_auth2(key, dataoutbuf)){\r
+           if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");\r
+               OnError(1);\r
+               return;                 \r
+       }\r
+       \r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
+    \r
+       cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r
+\r
+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r

 {\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
 {\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r
        uint8_t uid[10] = {0x00};\r

-       uint32_t cuid;\r
-    \r
-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
-    \r
-       iso14a_clear_trace();\r
+       uint8_t key[16] = {0x00};\r
+       bool usePwd = (arg1 == 1);\r
+\r
+       LED_A_ON();     LED_B_OFF(); LED_C_OFF();\r
+\r
+       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

-    \r
-       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+\r
+       int len = iso14443a_select_card(uid, NULL, NULL);\r

        if(!len) {\r
        if(!len) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
-               //OnError(1);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
+               OnError(1);\r

                return;\r
                return;\r

-               };\r
-        \r
-       len = mifare_ultra_readblock(cuid, blockNo, dataout);\r
-       if(len) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Read block error");\r
-               //OnError(2);\r
+       }\r
+\r
+        // authenticate here.\r
+       if ( usePwd ) {\r
+\r
+               memcpy(key, datain, 16);\r
+\r
+               // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7] );\r
+               // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[8],key[9],key[10],key[11],key[12],key[13],key[14],key[15] );\r
+\r
+               uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };\r
+               uint8_t random_b[8] = {0x00};\r
+               uint8_t enc_random_b[8] = {0x00};\r
+               uint8_t rnd_ab[16] = {0x00};\r
+               uint8_t IV[8] = {0x00};\r
+\r
+               uint16_t len;\r
+               uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
+               uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+\r
+               len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
+               if (len != 11) {\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+                       OnError(1);\r
+                       return;\r
+               }\r
+       \r
+               // tag nonce.\r
+               memcpy(enc_random_b,receivedAnswer+1,8);\r
+\r
+               // decrypt nonce.\r
+               tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
+\r
+       \r
+               rol(random_b,8);\r
+               \r
+               memcpy(rnd_ab  ,random_a,8);\r
+               memcpy(rnd_ab+8,random_b,8);\r
+\r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
+                       Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],\r
+                               enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);\r
+                               \r
+                       Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               random_b[0],random_b[1],random_b[2],random_b[3],\r
+                               random_b[4],random_b[5],random_b[6],random_b[7]);\r
+\r
+                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
+                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
+                                       \r
+                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
+                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );\r
+               }\r
+               \r
+               // encrypt    out, in, length, key, iv\r
+               tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+\r
+               \r
+               len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
+               if (len != 11) {\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+                       OnError(1);\r
+                       return;\r
+               }\r
+\r
+               uint8_t enc_resp[8] = { 0 };\r
+               uint8_t resp_random_a[8] = { 0 };\r
+               memcpy(enc_resp, receivedAnswer+1, 8);\r
+       \r
+               // decrypt    out, in, length, key, iv \r
+               tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
+               if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
+                       Dbprintf("failed authentication");\r
+\r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
+                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", \r
+                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
+                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
+\r
+                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
+                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);\r
+\r
+                       Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                                       random_a[0],random_a[1],random_a[2],random_a[3],\r
+                                       random_a[4],random_a[5],random_a[6],random_a[7]);\r
+                                       \r
+                       Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                                       resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r
+                                       resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r
+               }\r
+       }\r
+               \r
+       if( mifare_ultra_readblock(blockNo, dataout) ) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r
+               OnError(2);\r

                return;\r
                return;\r

-               };\r
+       }\r

         \r
         \r

-       len = mifare_ultra_halt(cuid);\r
-       if(len) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Halt error");\r
-               //OnError(3);\r
+       if( mifare_ultra_halt() ) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
+               OnError(3);\r

                return;\r
                return;\r

-               };\r
+       }\r

                \r
     cmd_send(CMD_ACK,1,0,0,dataout,16);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                \r
     cmd_send(CMD_ACK,1,0,0,dataout,16);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r


@@ -147,7 +296,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        pcs = &mpcs;\r
 \r
        // clear trace\r
        pcs = &mpcs;\r
 \r
        // clear trace\r

-       iso14a_clear_trace();\r
+       clear_trace();\r

 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -195,71 +344,53 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r
 {\r
 \r
 void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r
 {\r

-  // params\r
-        uint8_t sectorNo = arg0;\r
+       // params\r
+       uint8_t sectorNo = arg0;\r

        int Pages = arg1;\r
        int Pages = arg1;\r

-       int count_Pages = 0;\r
+       int countpages = 0;\r

        byte_t dataout[176] = {0x00};;\r
        byte_t dataout[176] = {0x00};;\r

-       uint8_t uid[10] = {0x00};\r
-       uint32_t cuid;\r

 \r
 \r

+       LEDsoff();\r

        LED_A_ON();\r
        LED_A_ON();\r

-       LED_B_OFF();\r
-       LED_C_OFF();\r
-\r
-       if (MF_DBGLEVEL >= MF_DBG_ALL) \r
-               Dbprintf("Pages %d",Pages);\r
-       \r
-       iso14a_clear_trace();\r
+       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

-       int len = iso14443a_select_card(uid, NULL, &cuid);\r
-       \r
+       int len = iso14443a_select_card(NULL, NULL, NULL);\r

        if (!len) {\r
        if (!len) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                       Dbprintf("Can't select card");\r
-               //OnError(1);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r
+               OnError(1);\r

                return;\r
        }\r
        \r
        for (int i = 0; i < Pages; i++){\r
        \r
                return;\r
        }\r
        \r
        for (int i = 0; i < Pages; i++){\r
        \r

-               len = mifare_ultra_readblock(cuid, sectorNo * 4 + i, dataout + 4 * i);\r
+               len = mifare_ultra_readblock(sectorNo * 4 + i, dataout + 4 * i);\r

                \r
                if (len) {\r
                \r
                if (len) {\r

-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                               Dbprintf("Read block %d error",i);\r
-                       //OnError(2);\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);\r
+                       OnError(2);\r

                        return;\r
                } else {\r
                        return;\r
                } else {\r

-                       count_Pages++;\r
+                       countpages++;\r

                }\r
        }\r
                \r
                }\r
        }\r
                \r

-       len = mifare_ultra_halt(cuid);\r
+       len = mifare_ultra_halt();\r

        if (len) {\r
        if (len) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                       Dbprintf("Halt error");\r
-               //OnError(3);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
+               OnError(3);\r

                return;\r
        }\r
        \r
                return;\r
        }\r
        \r

-       if (MF_DBGLEVEL >= MF_DBG_ALL) {\r
-               Dbprintf("Pages read %d", count_Pages);\r
-       }\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Pages read %d", countpages);\r

 \r
 \r

-       len = 16*4; //64 bytes\r
-       \r
-       // Read a UL-C\r
-       if (Pages == 44 && count_Pages > 16) \r
-               len = 176;\r
+       len = Pages * 4;\r

 \r
        cmd_send(CMD_ACK, 1, 0, 0, dataout, len);       \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
 \r
        cmd_send(CMD_ACK, 1, 0, 0, dataout, len);       \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r

-\r

 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Write a MIFARE tag. \r
 // read block\r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Write a MIFARE tag. \r
 // read block\r


@@ -284,7 +415,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        pcs = &mpcs;\r
 \r
        // clear trace\r
        pcs = &mpcs;\r
 \r
        // clear trace\r

-       iso14a_clear_trace();\r
+       clear_trace();\r

 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -334,94 +465,144 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
 {\r
 \r
 void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
 {\r

-        // params\r
-        uint8_t blockNo = arg0;\r
+       uint8_t blockNo = arg0;\r

        byte_t blockdata[16] = {0x00};\r
 \r
        byte_t blockdata[16] = {0x00};\r
 \r

-        memcpy(blockdata, datain,16);\r
-        \r
-        // variables\r
-        byte_t isOK = 0;\r
+       memcpy(blockdata, datain, 16);\r
+\r

        uint8_t uid[10] = {0x00};\r
        uint8_t uid[10] = {0x00};\r

-        uint32_t cuid;\r

 \r
 \r

-        iso14a_clear_trace();\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

 \r
 \r

-        LED_A_ON();\r
-        LED_B_OFF();\r
-        LED_C_OFF();\r
-\r
-        while (true) {\r
-                if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_halt(cuid)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                        break;\r
-                };\r
-                \r
-                isOK = 1;\r
-                break;\r
-        }\r
-        \r
-        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       if(!iso14443a_select_card(uid, NULL, NULL)) {\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+               OnError(0);\r
+               return;\r
+       };\r

 \r
 \r

-               cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
+       if(mifare_ultra_writeblock(blockNo, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
+               OnError(0);\r
+               return; };\r
+\r
+       if(mifare_ultra_halt()) {\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+               OnError(0);\r
+               return;\r
+       };\r
+\r
+       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r

 }\r
 \r
 void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
 {\r
 }\r
 \r
 void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
 {\r

-       // params\r

        uint8_t blockNo = arg0;\r
        byte_t blockdata[4] = {0x00};\r
        \r
        memcpy(blockdata, datain,4);\r
 \r
        uint8_t blockNo = arg0;\r
        byte_t blockdata[4] = {0x00};\r
        \r
        memcpy(blockdata, datain,4);\r
 \r

-       // variables\r
-       byte_t isOK = 0;\r

        uint8_t uid[10] = {0x00};\r
        uint8_t uid[10] = {0x00};\r

-       uint32_t cuid;\r
+       \r
+       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       if(!iso14443a_select_card(uid, NULL, NULL)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
+               OnError(0);\r
+               return;\r
+       };\r
+\r
+       if(mifare_ultra_special_writeblock(blockNo, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
+               OnError(0);\r
+               return;\r
+       };\r
+\r
+       if(mifare_ultra_halt()) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
+               OnError(0);\r
+               return;\r
+       };\r
+\r
+       if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r
+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r

 \r
 \r

-       iso14a_clear_trace();\r
+void MifareUSetPwd(uint8_t arg0, uint8_t *datain){\r
+       \r
+       uint8_t pwd[16] = {0x00};\r
+       byte_t blockdata[4] = {0x00};\r
+       \r
+       memcpy(pwd, datain, 16);\r
+       \r
+       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
+       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
+       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
+               OnError(0);\r
+               return;\r
+       };\r

 \r
 \r

-       while (true) {\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
+       blockdata[0] = pwd[7];\r
+       blockdata[1] = pwd[6];\r
+       blockdata[2] = pwd[5];\r
+       blockdata[3] = pwd[4];\r
+       if(mifare_ultra_special_writeblock( 44, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
+               OnError(44);\r
+               return;\r
+       };\r

 \r
 \r

-               if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                       break;\r
-               };\r
+       blockdata[0] = pwd[3];\r
+       blockdata[1] = pwd[2];\r
+       blockdata[2] = pwd[1];\r
+       blockdata[3] = pwd[0];\r
+       if(mifare_ultra_special_writeblock( 45, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
+               OnError(45);\r
+               return;\r
+       };\r

 \r
 \r

-               if(mifare_ultra_halt(cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                       break;\r
-               };\r
+       blockdata[0] = pwd[15];\r
+       blockdata[1] = pwd[14];\r
+       blockdata[2] = pwd[13];\r
+       blockdata[3] = pwd[12];\r
+       if(mifare_ultra_special_writeblock( 46, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
+               OnError(46);\r
+               return;\r
+       };\r

 \r
 \r

-               isOK = 1;\r
-               break;\r
-       }\r
+       blockdata[0] = pwd[11];\r
+       blockdata[1] = pwd[10];\r
+       blockdata[2] = pwd[9];\r
+       blockdata[3] = pwd[8];\r
+       if(mifare_ultra_special_writeblock( 47, blockdata)) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
+               OnError(47);\r
+               return;\r
+       };      \r

 \r
 \r

-       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
+       if(mifare_ultra_halt()) {\r
+               if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
+               OnError(0);\r
+               return;\r
+       };\r

 \r
 \r

-       cmd_send(CMD_ACK,isOK,0,0,0,0);\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r


@@ -463,14 +644,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r

-       uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

 \r
        uint32_t auth1_time, auth2_time;\r
        static uint16_t delta_time;\r
 \r
 \r
        uint32_t auth1_time, auth2_time;\r
        static uint16_t delta_time;\r
 \r

+       // free eventually allocated BigBuf memory\r
+       BigBuf_free();\r

        // clear trace\r
        // clear trace\r

-       iso14a_clear_trace();\r
-       iso14a_set_tracing(false);\r
+       clear_trace();\r
+       set_tracing(false);\r

        \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -641,7 +824,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

-       iso14a_set_tracing(TRUE);\r
+       set_tracing(TRUE);\r

 }\r
 \r
 //-----------------------------------------------------------------------------\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r


@@ -670,8 +853,8 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
        // clear trace\r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
        // clear trace\r

-       iso14a_clear_trace();\r
-       iso14a_set_tracing(TRUE);\r
+       clear_trace();\r
+       set_tracing(TRUE);\r

 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -761,8 +944,8 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        uint8_t uid[10];\r
 \r
        // clear trace\r
        uint8_t uid[10];\r
 \r
        // clear trace\r

-       iso14a_clear_trace();\r
-       iso14a_set_tracing(false);\r
+       clear_trace();\r
+       set_tracing(false);\r

        \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -854,8 +1037,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        uint8_t d_block[18] = {0x00};\r
        uint32_t cuid;\r
        \r
        uint8_t d_block[18] = {0x00};\r
        uint32_t cuid;\r
        \r

-       uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r
-       uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

 \r
        // reset FPGA and LED\r
        if (workFlags & 0x08) {\r
 \r
        // reset FPGA and LED\r
        if (workFlags & 0x08) {\r


@@ -863,8 +1046,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_B_OFF();\r
                LED_C_OFF();\r
        \r
                LED_B_OFF();\r
                LED_C_OFF();\r
        \r

-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
+               clear_trace();\r
+               set_tracing(TRUE);\r

                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r


@@ -973,16 +1156,16 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        uint8_t data[18] = {0x00};\r
        uint32_t cuid = 0;\r
        \r
        uint8_t data[18] = {0x00};\r
        uint32_t cuid = 0;\r
        \r

-       uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r
-       uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

        \r
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
        \r
        \r
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
        \r

-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
+               clear_trace();\r
+               set_tracing(TRUE);\r

                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r


@@ -1038,8 +1221,8 @@ void MifareCIdent(){
        // variables\r
        byte_t isOK = 1;\r
        \r
        // variables\r
        byte_t isOK = 1;\r
        \r

-       uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r
-       uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

 \r
        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
 \r
        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r


@@ -1061,3 +1244,73 @@ void MifareCIdent(){
                        //\r
 // DESFIRE\r
 //\r
                        //\r
 // DESFIRE\r
 //\r

+\r
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
+\r
+       byte_t dataout[11] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid;\r
+    \r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       if(!len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Can't select card");\r
+               //OnError(1);\r
+               return;\r
+       };\r
+\r
+       if(mifare_desfire_des_auth1(cuid, dataout)){\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Authentication part1: Fail.");\r
+               //OnError(4);\r
+               return;\r
+       }\r
+\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
+    \r
+    cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
+}\r
+\r
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r
+\r
+       uint32_t cuid = arg0;\r
+       uint8_t key[16] = {0x00};\r
+       byte_t isOK = 0;\r
+       byte_t dataout[12] = {0x00};\r
+    \r
+       memcpy(key, datain, 16);\r
+       \r
+       isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
+       \r
+       if( isOK) {\r
+           if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r
+                       Dbprintf("Authentication part2: Failed");  \r
+               //OnError(4);\r
+               return;\r
+       }\r
+\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r
+               DbpString("AUTH 2 FINISHED");\r
+\r
+       cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r
+\r
+void OnSuccess(){\r
+       pcb_blocknum = 0;\r
+       ReaderTransmit(deselect_cmd, 3 , NULL);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r
+\r
+void OnError(uint8_t reason){\r
+       pcb_blocknum = 0;\r
+       ReaderTransmit(deselect_cmd, 3 , NULL);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       cmd_send(CMD_ACK,0,reason,0,0,0);\r
+       LEDsoff();\r
+}\r