]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
Merge pull request #913 from 0x2b3bfa0/patch-1
[proxmark3-svn] / armsrc / mifarecmd.c
index 6f57c11319c87d185f003a96d55a2f606f7e2f3d..27b1cf1923456be7248e1065471bc0fdc5b96ad6 100644 (file)
 \r
 #include "mifarecmd.h"\r
 \r
+#include <stdint.h>\r
+\r
+#include "proxmark3.h"\r
+#include "usb_cdc.h"\r
+#include "crapto1/crapto1.h"\r
+#include "iso14443a.h"\r
+#include "BigBuf.h"\r
+#include "mifareutil.h"\r
 #include "apps.h"\r
+#include "protocols.h"\r
 #include "util.h"\r
 #include "parity.h"\r
 #include "crc.h"\r
+#include "fpgaloader.h"\r
 \r
-#define AUTHENTICATION_TIMEOUT 848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
-#define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication \r
-       \r
+#define HARDNESTED_AUTHENTICATION_TIMEOUT 848           // card times out 1ms after wrong authentication (according to NXP documentation)\r
+#define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400      // some (non standard) cards need a pause after select before they are ready for first authentication\r
 \r
+/*\r
 // the block number for the ISO14443-4 PCB\r
 static 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
+static void OnSuccess(){\r
+       pcb_blocknum = 0;\r
+       ReaderTransmit(deselect_cmd, 3 , NULL);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r
+*/\r
+\r
+static void OnError(uint8_t reason){\r
+       // pcb_blocknum = 0;\r
+       // ReaderTransmit(deselect_cmd, 3 , NULL);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LED_D_OFF();\r
+       cmd_send(CMD_ACK,0,reason,0,0,0);\r
+       LED_A_OFF();\r
+}\r
+\r
 //-----------------------------------------------------------------------------\r
-// Select, Authenticate, Read a MIFARE tag. \r
+// Select, Authenticate, Read a MIFARE tag.\r
 // read block\r
 //-----------------------------------------------------------------------------\r
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r
-  // params\r
+       LED_A_ON();\r
+\r
        uint8_t blockNo = arg0;\r
        uint8_t keyType = arg1;\r
        uint64_t ui64Key = 0;\r
        ui64Key = bytes_to_num(datain, 6);\r
-       \r
-       // variables\r
+\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16];\r
        uint8_t uid[10];\r
@@ -54,65 +81,59 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        clear_trace();\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, true, 0)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
 \r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r
-               \r
+\r
                if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");\r
                        break;\r
                };\r
 \r
                if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r
-               \r
+\r
                isOK = 1;\r
                break;\r
        }\r
-       \r
+\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
+\r
+       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
 void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r
 \r
+       LED_A_ON();\r
        bool turnOffField = (arg0 == 1);\r
 \r
-       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
-\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       clear_trace();\r
-\r
-       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+       if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
        };\r
-       \r
-       if(!mifare_ultra_auth(keybytes)){\r
+\r
+       if (!mifare_ultra_auth(keybytes)){\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
                OnError(1);\r
                return;\r
@@ -120,9 +141,11 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 \r
        if (turnOffField) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
+               LED_D_OFF();\r
        }\r
+\r
        cmd_send(CMD_ACK,1,0,0,0,0);\r
+       LED_A_OFF();\r
 }\r
 \r
 // Arg0 = BlockNo,\r
@@ -130,18 +153,16 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 // datain = PWD bytes,\r
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r
 {\r
+       LED_A_ON();\r
+\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r
        bool useKey = (arg1 == 1); //UL_C\r
        bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
 \r
-       LEDsoff();\r
-       LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       clear_trace();\r
-\r
-       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0);\r
+       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
                OnError(1);\r
@@ -149,7 +170,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        }\r
 \r
        // UL-C authentication\r
-       if ( useKey ) {\r
+       if (useKey) {\r
                uint8_t key[16] = {0x00};\r
                memcpy(key, datain, sizeof(key) );\r
 \r
@@ -160,7 +181,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        }\r
 \r
        // UL-EV1 / NTAG authentication\r
-       if ( usePwd ) {\r
+       if (usePwd) {\r
                uint8_t pwd[4] = {0x00};\r
                memcpy(pwd, datain, 4);\r
                uint8_t pack[4] = {0,0,0,0};\r
@@ -168,27 +189,29 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
                        OnError(1);\r
                        return;\r
                }\r
-       }       \r
+       }\r
 \r
-       if( mifare_ultra_readblock(blockNo, dataout) ) {\r
+       if (mifare_ultra_readblock(blockNo, dataout)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r
                OnError(2);\r
                return;\r
        }\r
 \r
-       if( mifare_ultra_halt() ) {\r
+       if (mifare_ultra_halt()) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
                OnError(3);\r
                return;\r
        }\r
 \r
-       cmd_send(CMD_ACK,1,0,0,dataout,16);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       LED_D_OFF();\r
+\r
+       cmd_send(CMD_ACK,1,0,0,dataout,16);\r
+       LED_A_OFF();\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
-// Select, Authenticate, Read a MIFARE tag. \r
+// Select, Authenticate, Read a MIFARE tag.\r
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)\r
 //-----------------------------------------------------------------------------\r
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
@@ -198,7 +221,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        uint8_t keyType = arg1;\r
        uint64_t ui64Key = 0;\r
        ui64Key = bytes_to_num(datain, 6);\r
-       \r
+\r
        // variables\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16 * 16];\r
@@ -217,40 +240,41 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LED_C_OFF();\r
 \r
        isOK = 1;\r
-       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
                isOK = 0;\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
 \r
-       \r
-       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
+\r
+       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\r
                isOK = 0;\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
        }\r
-       \r
+\r
        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {\r
                        isOK = 0;\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);\r
                        break;\r
                }\r
        }\r
-               \r
+\r
        if(mifare_classic_halt(pcs, cuid)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        }\r
 \r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
-       \r
+\r
        if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
 \r
+       // Thats it...\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));\r
        LED_B_OFF();\r
 \r
-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
@@ -260,13 +284,11 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // datain = KEY bytes\r
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r
-       LEDsoff();\r
        LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
        BigBuf_free();\r
-       clear_trace();\r
 \r
        // params\r
        uint8_t blockNo = arg0;\r
@@ -281,7 +303,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                return;\r
        }\r
 \r
-       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0);\r
+       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r
                OnError(1);\r
@@ -289,7 +311,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        }\r
 \r
        // UL-C authentication\r
-       if ( useKey ) {\r
+       if (useKey) {\r
                uint8_t key[16] = {0x00};\r
                memcpy(key, datain, sizeof(key) );\r
 \r
@@ -307,7 +329,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 \r
                if (!mifare_ul_ev1_auth(pwd, pack)){\r
                        OnError(1);\r
-                       return;                 \r
+                       return;\r
                }\r
        }\r
 \r
@@ -316,7 +338,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                        Dbprintf("Data exceeds buffer!!");\r
                        break;\r
                }\r
-       \r
+\r
                len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
 \r
                if (len) {\r
@@ -341,18 +363,19 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                return;\r
        }\r
 \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
+       if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Blocks read %d", countblocks);\r
 \r
-       countblocks *= 4;\r
-\r
-       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       LED_D_OFF();\r
+\r
+       cmd_send(CMD_ACK, 1, countblocks*4, BigBuf_max_traceLen(), 0, 0);\r
+\r
        BigBuf_free();\r
+       LED_A_OFF();\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
-// Select, Authenticate, Write a MIFARE tag. \r
+// Select, Authenticate, Write a MIFARE tag.\r
 // read block\r
 //-----------------------------------------------------------------------------\r
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
@@ -365,7 +388,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        ui64Key = bytes_to_num(datain, 6);\r
        memcpy(blockdata, datain + 10, 16);\r
-       \r
+\r
        // variables\r
        byte_t isOK = 0;\r
        uint8_t uid[10];\r
@@ -383,46 +406,47 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LED_C_OFF();\r
 \r
        while (true) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
 \r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r
-               \r
+\r
                if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                        break;\r
                };\r
 \r
                if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r
-               \r
+\r
                isOK = 1;\r
                break;\r
        }\r
-       \r
+\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
+\r
+       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
+\r
+       // Thats it...\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        LED_B_OFF();\r
 \r
 \r
-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
-/* // Command not needed but left for future testing \r
+/* // Command not needed but left for future testing\r
 void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)\r
 {\r
        uint8_t blockNo = arg0;\r
@@ -446,7 +470,7 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
        if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                OnError(0);\r
-               return; };\r
+               return; };\r
 \r
        if(mifare_ultra_halt()) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
@@ -456,8 +480,9 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 \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
+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
        LEDsoff();\r
 }\r
 */\r
@@ -476,14 +501,14 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        byte_t blockdata[4] = {0x00};\r
 \r
        memcpy(blockdata, datain,4);\r
-       \r
+\r
        LEDsoff();\r
        LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
 \r
-       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -499,7 +524,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
                        return;\r
                }\r
        }\r
-       \r
+\r
        // UL-EV1 / NTAG authentication\r
        if (usePwd) {\r
                uint8_t pwd[4] = {0x00};\r
@@ -525,24 +550,25 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 \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
+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
        LEDsoff();\r
 }\r
 \r
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain){\r
-       \r
+\r
        uint8_t pwd[16] = {0x00};\r
        byte_t blockdata[4] = {0x00};\r
-       \r
+\r
        memcpy(pwd, datain, 16);\r
-       \r
+\r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
 \r
-       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -586,7 +612,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(47);\r
                return;\r
-       };      \r
+       };\r
 \r
        if(mifare_ultra_halt()) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
@@ -594,8 +620,9 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
                return;\r
        };\r
 \r
-       cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
        LEDsoff();\r
 }\r
 \r
@@ -610,7 +637,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 //-----------------------------------------------------------------------------\r
 // acquire encrypted nonces in order to perform the attack described in\r
 // Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened\r
-// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
+// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
@@ -628,7 +655,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        uint8_t nt_par_enc = 0;\r
        uint8_t buf[USB_CMD_DATA_SIZE];\r
        uint32_t timeout;\r
-       \r
+\r
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        uint8_t targetBlockNo = arg1 & 0xff;\r
@@ -637,7 +664,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        bool initialize = flags & 0x0001;\r
        bool slow = flags & 0x0002;\r
        bool field_off = flags & 0x0004;\r
-       \r
+\r
        LED_A_ON();\r
        LED_C_OFF();\r
 \r
@@ -646,9 +673,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                clear_trace();\r
                set_tracing(true);\r
        }\r
-       \r
+\r
        LED_C_ON();\r
-       \r
+\r
        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r
@@ -661,9 +688,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                }\r
 \r
                if (!have_uid) { // need a full select cycle to get the uid first\r
-                       iso14a_card_select_t card_info;         \r
-                       if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (ALL)");\r
+                       iso14a_card_select_t card_info;\r
+                       if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (ALL)");\r
                                continue;\r
                        }\r
                        switch (card_info.uidlen) {\r
@@ -672,37 +699,38 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                                case 10: cascade_levels = 3; break;\r
                                default: break;\r
                        }\r
-                       have_uid = true;        \r
+                       have_uid = true;\r
                } else { // no need for anticollision. We can directly select the card\r
-                       if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (UID)");\r
+                       if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (UID)");\r
                                continue;\r
                        }\r
                }\r
-               \r
+\r
                if (slow) {\r
-                       timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME;\r
+                       timeout = GetCountSspClk() + HARDNESTED_PRE_AUTHENTICATION_LEADTIME;\r
                        while(GetCountSspClk() < timeout);\r
                }\r
 \r
                uint32_t nt1;\r
-               if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth1 error");\r
+               if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL, NULL)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth1 error");\r
                        continue;\r
                }\r
 \r
                // nested authentication\r
                uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);\r
                if (len != 4) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r
                        continue;\r
                }\r
-       \r
-               // send a dummy byte as reader response in order to trigger the cards authentication timeout\r
-               uint8_t dummy_answer = 0;\r
-               ReaderTransmit(&dummy_answer, 1, NULL);\r
-               timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
-               \r
+\r
+               // send an incomplete dummy response in order to trigger the card's authentication failure timeout\r
+               uint8_t dummy_answer[1] = {0};\r
+               ReaderTransmit(dummy_answer, 1, NULL);\r
+\r
+               timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT;\r
+\r
                num_nonces++;\r
                if (num_nonces % 2) {\r
                        memcpy(buf+i, receivedAnswer, 4);\r
@@ -716,33 +744,33 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 \r
                // wait for the card to become ready again\r
                while(GetCountSspClk() < timeout);\r
-       \r
+\r
        }\r
 \r
        LED_C_OFF();\r
-       \r
-       crypto1_destroy(pcs);\r
-       \r
-       LED_B_ON();\r
-       cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
-       LED_B_OFF();\r
 \r
-       if (MF_DBGLEVEL >= 3)   DbpString("AcquireEncryptedNonces finished");\r
+       crypto1_destroy(pcs);\r
 \r
        if (field_off) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LEDsoff();\r
        }\r
+\r
+       LED_B_ON();\r
+       cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
+       LED_B_OFF();\r
+\r
+       if (MF_DBGLEVEL >= 3)   DbpString("AcquireEncryptedNonces finished");\r
+\r
 }\r
 \r
 \r
 //-----------------------------------------------------------------------------\r
-// MIFARE nested authentication. \r
-// \r
+// MIFARE nested authentication.\r
+//\r
 //-----------------------------------------------------------------------------\r
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r
-{\r
-       // params\r
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) {\r
+\r
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        uint8_t targetBlockNo = arg1 & 0xff;\r
@@ -750,8 +778,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        uint64_t ui64Key = 0;\r
 \r
        ui64Key = bytes_to_num(datain, 6);\r
-       \r
-       // variables\r
+\r
        uint16_t rtr, i, j, len;\r
        uint16_t davg;\r
        static uint16_t dmin, dmax;\r
@@ -759,7 +786,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r
        uint8_t par[1];\r
        uint32_t target_nt[2], target_ks[2];\r
-       \r
+       uint8_t target_nt_duplicate_count = 0;\r
+\r
        uint8_t par_array[4];\r
        uint16_t ncount = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
@@ -767,11 +795,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        pcs = &mpcs;\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
 \r
-       uint32_t auth1_time, auth2_time;\r
+       uint32_t auth1_time, auth2_time, authentication_timeout = 0;\r
        static uint16_t delta_time;\r
 \r
        LED_A_ON();\r
-       LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
@@ -779,43 +806,43 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        if (calibrate) clear_trace();\r
        set_tracing(true);\r
-       \r
+\r
        // statistics on nonce distance\r
        int16_t isOK = 0;\r
        #define NESTED_MAX_TRIES 12\r
        uint16_t unsuccessfull_tries = 0;\r
-       if (calibrate) {        // for first call only. Otherwise reuse previous calibration\r
+       if (calibrate) {    // for first call only. Otherwise reuse previous calibration\r
                LED_B_ON();\r
                WDT_HIT();\r
 \r
                davg = dmax = 0;\r
                dmin = 2000;\r
                delta_time = 0;\r
-               \r
-               for (rtr = 0; rtr < 17; rtr++) {\r
 \r
-                       // Test if the action was cancelled\r
-                       if(BUTTON_PRESS()) {\r
-                               isOK = -2;\r
-                               break;\r
-                       }\r
+               for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                        // prepare next select. No need to power down the card.\r
-                       if(mifare_classic_halt(pcs, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
+                       if (mifare_classic_halt(pcs, cuid)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                rtr--;\r
                                continue;\r
                        }\r
 \r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
+                       // Test if the action was cancelled\r
+                       if (BUTTON_PRESS()) {\r
+                               isOK = -2;\r
+                               break;\r
+                       }\r
+\r
+                       if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                rtr--;\r
                                continue;\r
                        };\r
 \r
                        auth1_time = 0;\r
-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time, NULL)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
                                rtr--;\r
                                continue;\r
                        };\r
@@ -825,13 +852,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        } else {\r
                                auth2_time = 0;\r
                        }\r
-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time, NULL)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
                                rtr--;\r
                                continue;\r
                        };\r
 \r
-                       nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
+                       nttmp = prng_successor(nt1, 100);               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
                        for (i = 101; i < 1200; i++) {\r
                                nttmp = prng_successor(nttmp, 1);\r
                                if (nttmp == nt2) break;\r
@@ -849,65 +876,72 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r
                        } else {\r
                                unsuccessfull_tries++;\r
-                               if (unsuccessfull_tries > NESTED_MAX_TRIES) {   // card isn't vulnerable to nested attack (random numbers are not predictable)\r
+                               if (unsuccessfull_tries > NESTED_MAX_TRIES) {   // card isn't vulnerable to nested attack (random numbers are not predictable)\r
                                        isOK = -3;\r
                                }\r
                        }\r
                }\r
 \r
                davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
-               \r
+\r
                if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);\r
 \r
                dmin = davg - 2;\r
                dmax = davg + 2;\r
-               \r
+\r
                LED_B_OFF();\r
-       \r
+\r
        }\r
-       //  -------------------------------------------------------------------------------------------------   \r
-       \r
+       //  -------------------------------------------------------------------------------------------------\r
+\r
        LED_C_ON();\r
 \r
        //  get crypted nonces for target sector\r
-       for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r
+       for (i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r
 \r
                target_nt[i] = 0;\r
-               while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
-               \r
+               while (target_nt[i] == 0 && !isOK) { // continue until we have an unambiguous nonce\r
+\r
                        // prepare next select. No need to power down the card.\r
                        if(mifare_classic_halt(pcs, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                continue;\r
                        }\r
 \r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
+                       // break out of the loop on button press\r
+                       if (BUTTON_PRESS()) {\r
+                               isOK = -2;\r
+                               break;\r
+                       }\r
+\r
+                       if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\r
-                       };\r
-               \r
+                       }\r
+\r
                        auth1_time = 0;\r
-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
+                       authentication_timeout = 0;\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time, &authentication_timeout)) {\r
+                               if (MF_DBGLEVEL >= 1)  Dbprintf("Nested: Auth1 error");\r
                                continue;\r
-                       };\r
+                       }\r
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r
                        len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
                        if (len != 4) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
                                continue;\r
-                       };\r
-               \r
-                       nt2 = bytes_to_num(receivedAnswer, 4);          \r
+                       }\r
+\r
+                       nt2 = bytes_to_num(receivedAnswer, 4);\r
                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);\r
-                       \r
+\r
                        // Parity validity check\r
                        for (j = 0; j < 4; j++) {\r
                                par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
                        }\r
-                       \r
+\r
                        ncount = 0;\r
                        nttest = prng_successor(nt1, dmin - 1);\r
                        for (j = dmin; j < dmax + 1; j++) {\r
@@ -915,7 +949,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                ks1 = nt2 ^ nttest;\r
 \r
                                if (valid_nonce(nttest, nt2, ks1, par_array)){\r
-                                       if (ncount > 0) {               // we are only interested in disambiguous nonces, try again\r
+                                       if (ncount > 0) {       // we are only interested in disambiguous nonces, try again\r
                                                if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r
                                                target_nt[i] = 0;\r
                                                break;\r
@@ -924,7 +958,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                        target_ks[i] = ks1;\r
                                        ncount++;\r
                                        if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces\r
-                                               target_nt[i] = 0;\r
+                                               if( ++target_nt_duplicate_count >= NESTED_MAX_TRIES ) { // unable to get a 2nd nonce after NESTED_MAX_TRIES tries, probably a fixed nonce\r
+                                                       if (MF_DBGLEVEL >= 2) Dbprintf("Nonce#2: cannot get nonce that != nonce#1, continuing anyway with single nonce! ntdist=%d", j);\r
+                                                       break;\r
+                                               }\r
+\r
+                                               target_nt[1] = 0;\r
                                                if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);\r
                                                break;\r
                                        }\r
@@ -936,119 +975,147 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        }\r
 \r
        LED_C_OFF();\r
-       \r
+\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
-       \r
-       byte_t buf[4 + 4 * 4];\r
+\r
+       uint8_t buf[4 + 4 * 4 + 4];\r
        memcpy(buf, &cuid, 4);\r
        memcpy(buf+4, &target_nt[0], 4);\r
        memcpy(buf+8, &target_ks[0], 4);\r
        memcpy(buf+12, &target_nt[1], 4);\r
        memcpy(buf+16, &target_ks[1], 4);\r
-       \r
+       memcpy(buf+20, &authentication_timeout, 4);\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r
+       if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
+\r
        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
        LED_B_OFF();\r
 \r
-       if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
-\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
+\r
 //-----------------------------------------------------------------------------\r
-// MIFARE check keys. key count up to 85. \r
-// \r
+// MIFARE check keys. key count up to 85.\r
+//\r
 //-----------------------------------------------------------------------------\r
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
+void MifareChkKeys(uint16_t arg0, uint32_t arg1, uint8_t arg2, uint8_t *datain) {\r
+\r
        uint8_t blockNo = arg0 & 0xff;\r
-       uint8_t keyType = (arg0 >> 8) & 0xff;\r
-       bool clearTrace = arg1;\r
+       uint8_t keyType = arg0 >> 8;\r
+       bool clearTrace = arg1 & 0x01;\r
+       bool multisectorCheck = arg1 & 0x02;\r
+       bool init = arg1 & 0x04;\r
+       bool drop_field = arg1 & 0x08;\r
+       uint32_t auth_timeout = arg1 >> 16;\r
        uint8_t keyCount = arg2;\r
-       uint64_t ui64Key = 0;\r
+\r
+       LED_A_ON();\r
+\r
+       if (init) {\r
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       }\r
        \r
-       bool have_uid = false;\r
-       uint8_t cascade_levels = 0;\r
-       uint32_t timeout = 0;\r
-       int i;\r
-       byte_t isOK = 0;\r
+       if (clearTrace) {\r
+               clear_trace();\r
+       }\r
+       set_tracing(true);\r
+\r
+       // clear debug level. We are expecting lots of authentication failures...\r
+       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r
+       MF_DBGLEVEL = MF_DBG_NONE;\r
+\r
+       int res = 0;\r
+       if (multisectorCheck) {\r
+               TKeyIndex keyIndex = {{0}};\r
+               uint8_t sectorCnt = blockNo;\r
+               res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, &auth_timeout, OLD_MF_DBGLEVEL, &keyIndex);\r
+               if (res >= 0) {\r
+                       cmd_send(CMD_ACK, 1, res, 0, keyIndex, 80);\r
+               } else {\r
+                       cmd_send(CMD_ACK, 0, res, 0, NULL, 0);\r
+               }\r
+       } else {        \r
+               res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r
+               if (res > 0) {\r
+                       cmd_send(CMD_ACK, 1, res, 0, datain + (res - 1) * 6, 6);\r
+               } else {\r
+                       cmd_send(CMD_ACK, 0, res, 0, NULL, 0);\r
+               }\r
+       }\r
+\r
+       if (drop_field || res != 0) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+               LED_D_OFF();\r
+       }\r
+\r
+       // restore debug level\r
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r
+\r
+       LED_A_OFF();\r
+}\r
+\r
+\r
+//-----------------------------------------------------------------------------\r
+// MIFARE Personalize UID. Only for Mifare Classic EV1 7Byte UID\r
+//-----------------------------------------------------------------------------\r
+void MifarePersonalizeUID(uint8_t keyType, uint8_t perso_option, uint8_t *data) {\r
+\r
        uint8_t uid[10];\r
        uint32_t cuid;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
-       \r
-       // clear debug level\r
-       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
-       MF_DBGLEVEL = MF_DBG_NONE;\r
-       \r
+\r
        LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       clear_trace();\r
 \r
-       if (clearTrace) clear_trace();\r
-       set_tracing(true);\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       for (i = 0; i < keyCount; i++) {\r
-//             if(mifare_classic_halt(pcs, cuid)) {\r
-//                     if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Halt error");\r
-//             }\r
+       bool isOK = false;\r
+       while (true) {\r
+               if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+                       break;\r
+               }\r
 \r
-               // Iceman: use piwi's faster nonce collecting part in hardnested.\r
-               if (!have_uid) { // need a full select cycle to get the uid first\r
-                       iso14a_card_select_t card_info;         \r
-                       if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) {\r
-                               if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card");\r
-                               --i; // try same key once again\r
-                               continue;\r
-                       }\r
-                       switch (card_info.uidlen) {\r
-                               case 4 : cascade_levels = 1; break;\r
-                               case 7 : cascade_levels = 2; break;\r
-                               case 10: cascade_levels = 3; break;\r
-                               default: break;\r
-                       }\r
-                       have_uid = true;        \r
-               } else { // no need for anticollision. We can directly select the card\r
-                       if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) {\r
-                               if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card (UID)");\r
-                               --i; // try same key once again\r
-                               continue;\r
-                       }\r
+               uint8_t block_number = 0;\r
+               uint64_t key = bytes_to_num(data, 6);\r
+               if (mifare_classic_auth(pcs, cuid, block_number, keyType, key, AUTH_FIRST, NULL)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
+                       break;\r
                }\r
 \r
-               ui64Key = bytes_to_num(datain + i * 6, 6);\r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-                       uint8_t dummy_answer = 0;\r
-                       ReaderTransmit(&dummy_answer, 1, NULL);\r
-                       timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
-                       \r
-                       // wait for the card to become ready again\r
-                       while(GetCountSspClk() < timeout);\r
-                       continue;\r
+               uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+               uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+               int len = mifare_sendcmd_short(pcs, true, MIFARE_EV1_PERSONAL_UID, perso_option, receivedAnswer, receivedAnswerPar, NULL);\r
+               if (len != 1 || receivedAnswer[0] != CARD_ACK) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+                       break;;\r
                }\r
-               \r
-               isOK = 1;\r
+               isOK = true;\r
                break;\r
        }\r
-       \r
-       LED_B_ON();\r
-    cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
-       LED_B_OFF();\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       LED_D_OFF();\r
 \r
-       // restore debug level\r
-       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
+       crypto1_destroy(pcs);\r
+\r
+       if (MF_DBGLEVEL >= 2)   DbpString("PERSONALIZE UID FINISHED");\r
+\r
+       cmd_send(CMD_ACK, isOK, 0, 0, NULL, 0);\r
+\r
+       LED_A_OFF();\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
 // MIFARE commands set debug level\r
-// \r
+//\r
 //-----------------------------------------------------------------------------\r
 void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        MF_DBGLEVEL = arg0;\r
@@ -1057,7 +1124,7 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\r
-// \r
+//\r
 // Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not\r
 // involved in dealing with emulator memory. But if it is called later, it might\r
 // destroy the Emulator Memory.\r
@@ -1085,7 +1152,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 \r
 //-----------------------------------------------------------------------------\r
 // Load a card into the emulator memory\r
-// \r
+//\r
 //-----------------------------------------------------------------------------\r
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        uint8_t numSectors = arg0;\r
@@ -1105,43 +1172,43 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        LED_B_OFF();\r
        LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-       \r
+\r
        clear_trace();\r
        set_tracing(false);\r
-       \r
+\r
        bool isOK = true;\r
 \r
-       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
                isOK = false;\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
-               \r
+\r
        for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                ui64Key = emlGetKey(sectorNo, keyType);\r
                if (sectorNo == 0){\r
-                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
+                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\r
                                isOK = false;\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth error", sectorNo);\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth error", sectorNo);\r
                                break;\r
                        }\r
                } else {\r
-                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {\r
+                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED, NULL)) {\r
                                isOK = false;\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r
                                break;\r
                        }\r
                }\r
-               \r
+\r
                for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {\r
                                isOK = false;\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);\r
                                break;\r
                        };\r
                        if (isOK) {\r
                                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {\r
                                        emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);\r
-                               } else {        // sector trailer, keep the keys, set only the AC\r
+                               } else {    // sector trailer, keep the keys, set only the AC\r
                                        emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);\r
                                        memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);\r
                                        emlSetMem(dataoutbuf2,  FirstBlockOfSector(sectorNo) + blockNo, 1);\r
@@ -1152,7 +1219,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        }\r
 \r
        if(mifare_classic_halt(pcs, cuid)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        };\r
 \r
        //  ----------------------------- crypto1 destroy\r
@@ -1160,7 +1227,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
-       \r
+\r
        if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
 \r
 }\r
@@ -1168,10 +1235,148 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
 //-----------------------------------------------------------------------------\r
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)\r
-// \r
+//\r
 //-----------------------------------------------------------------------------\r
+\r
+static bool isBlockTrailer(int blockN) {\r
+       if (blockN >= 0 && blockN < 128) {\r
+               return ((blockN & 0x03) == 0x03);\r
+       }\r
+       if (blockN >= 128 && blockN <= 256) {\r
+               return ((blockN & 0x0F) == 0x0F);\r
+       }\r
+       return false;\r
+}\r
+\r
+void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
+       // var\r
+       byte_t isOK = 0;\r
+       uint32_t numBlocks = arg0;\r
+       // cmdParams:\r
+       // bit 0 - wipe gen1a\r
+       // bit 1 - fill card with default data\r
+       // bit 2 - gen1a = 0, gen1b = 1\r
+       uint8_t cmdParams = arg1;\r
+       bool needWipe = cmdParams & 0x01;\r
+       bool needFill = cmdParams & 0x02;\r
+       bool gen1b = cmdParams & 0x04;\r
+\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+\r
+       uint8_t block0[16] = {0x01, 0x02, 0x03, 0x04, 0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0xAF};\r
+       uint8_t block1[16] = {0x00};\r
+       uint8_t blockK[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x77, 0x8F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
+       uint8_t d_block[18] = {0x00};\r
+\r
+       // card commands\r
+       uint8_t wupC1[]       = { 0x40 };\r
+       uint8_t wupC2[]       = { 0x43 };\r
+       uint8_t wipeC[]       = { 0x41 };\r
+\r
+       // iso14443 setup\r
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       // tracing\r
+       clear_trace();\r
+       set_tracing(true);\r
+\r
+       while (true){\r
+               // wipe\r
+               if (needWipe){\r
+                       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
+                               break;\r
+                       };\r
+\r
+                       ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wipeC error");\r
+                               break;\r
+                       };\r
+\r
+                       if(mifare_classic_halt(NULL, 0)) {\r
+                               if (MF_DBGLEVEL > 2)    Dbprintf("Halt error");\r
+                       };\r
+               };\r
+\r
+               // put default data\r
+               if (needFill){\r
+                       // select commands\r
+                       ReaderTransmitBitsPar(wupC1, 7, 0, NULL);\r
+\r
+                       // gen1b magic tag : do no issue wupC2 and don't expect CARD_ACK response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r
+                       if (!gen1b) {\r
+\r
+                               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
+                                       break;\r
+                               };\r
+\r
+                               ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+                               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
+                                       break;\r
+                               };\r
+                       }\r
+\r
+                       // send blocks command\r
+                       for (int blockNo = 0; blockNo < numBlocks; blockNo++) {\r
+                               if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send command error");\r
+                                       break;\r
+                               };\r
+\r
+                               // check type of block and add crc\r
+                               if (!isBlockTrailer(blockNo)){\r
+                                       memcpy(d_block, block1, 16);\r
+                               } else {\r
+                                       memcpy(d_block, blockK, 16);\r
+                               }\r
+                               if (blockNo == 0) {\r
+                                       memcpy(d_block, block0, 16);\r
+                               }\r
+                               AppendCrc14443a(d_block, 16);\r
+\r
+                               // send write command\r
+                               ReaderTransmit(d_block, sizeof(d_block), NULL);\r
+                               if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send data error");\r
+                                       break;\r
+                               };\r
+                       }\r
+\r
+                       // halt\r
+                       // do no issue halt command for gen1b\r
+                       if (!gen1b) {\r
+                               if (mifare_classic_halt(NULL, 0)) {\r
+                                       if (MF_DBGLEVEL > 2)    Dbprintf("Halt error");\r
+                                               break;\r
+                               }\r
+                       }\r
+               }\r
+               break;\r
+       }\r
+\r
+       // reset fpga\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r
+       // send USB response\r
+       LED_B_ON();\r
+       cmd_send(CMD_ACK,isOK,0,0,NULL,0);\r
+       LED_B_OFF();\r
+\r
+       LEDsoff();\r
+\r
+       return;\r
+}\r
+\r
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-  \r
+\r
   // params\r
        uint8_t needWipe = arg0;\r
        // bit 0 - need get UID\r
@@ -1179,20 +1384,21 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        // bit 2 - need HALT after sequence\r
        // bit 3 - need init FPGA and field before sequence\r
        // bit 4 - need reset FPGA and LED\r
+       // bit 6 - gen1b backdoor type\r
        uint8_t workFlags = arg1;\r
        uint8_t blockNo = arg2;\r
-       \r
+\r
        // card commands\r
-       uint8_t wupC1[]       = { 0x40 }; \r
-       uint8_t wupC2[]       = { 0x43 }; \r
-       uint8_t wipeC[]       = { 0x41 }; \r
-       \r
+       uint8_t wupC1[]       = { 0x40 };\r
+       uint8_t wupC2[]       = { 0x43 };\r
+       uint8_t wipeC[]       = { 0x41 };\r
+\r
        // variables\r
        byte_t isOK = 0;\r
        uint8_t uid[10] = {0x00};\r
        uint8_t d_block[18] = {0x00};\r
        uint32_t cuid;\r
-       \r
+\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
@@ -1202,7 +1408,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_B_OFF();\r
                LED_C_OFF();\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-       \r
+\r
                clear_trace();\r
                set_tracing(true);\r
        }\r
@@ -1211,111 +1417,126 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
                // get UID from chip\r
                if (workFlags & 0x01) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                               break;\r
-                       };\r
-\r
-                       if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
+                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+                               // Continue, if we set wrong UID or wrong UID checksum or some ATQA or SAK we will can't select card. But we need to write block 0 to make card work.\r
+                               //break;\r
+                               };\r
+\r
+                               if(mifare_classic_halt(NULL, cuid)) {\r
+                                       if (MF_DBGLEVEL > 2)    Dbprintf("Halt error");\r
+                                       // Continue, some magic tags misbehavies and send an answer to it.\r
+                                       // break;\r
+                               };\r
                };\r
-       \r
+\r
                // reset chip\r
-               if (needWipe){\r
+               // Wipe command don't work with gen1b\r
+               if (needWipe && !(workFlags & 0x40)){\r
                        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
                                break;\r
                        };\r
 \r
                        ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wipeC error");\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wipeC error");\r
                                break;\r
                        };\r
 \r
-                       if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
+                       if(mifare_classic_halt(NULL, 0)) {\r
+                               if (MF_DBGLEVEL > 2)    Dbprintf("Halt error");\r
+                               // Continue, some magic tags misbehavies and send an answer to it.\r
+                                                       // break;\r
                        };\r
-               };      \r
+               };\r
 \r
                // write block\r
                if (workFlags & 0x02) {\r
                        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
-                               break;\r
-                       };\r
 \r
-                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
-                               break;\r
-                       };\r
+                       // gen1b magic tag : do no issue wupC2 and don't expect CARD_ACK response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r
+                       if (!(workFlags & 0x40)) {\r
+\r
+                               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
+                                       break;\r
+                               };\r
+\r
+                               ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+                               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
+                                       break;\r
+                               };\r
+                       }\r
                }\r
 \r
-               if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send command error");\r
+               if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send command error");\r
                        break;\r
                };\r
-       \r
+\r
                memcpy(d_block, datain, 16);\r
                AppendCrc14443a(d_block, 16);\r
-       \r
+\r
                ReaderTransmit(d_block, sizeof(d_block), NULL);\r
-               if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send data error");\r
+               if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send data error");\r
                        break;\r
-               };      \r
-       \r
+               };\r
+\r
                if (workFlags & 0x04) {\r
-                       if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
+                       // do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r
+                       if (!(workFlags & 0x40)) {\r
+                               if (mifare_classic_halt(NULL, 0)) {\r
+                                       if (MF_DBGLEVEL > 2)    Dbprintf("Halt error");\r
+                                       // Continue, some magic tags misbehavies and send an answer to it.\r
+                                       // break;\r
+                               }\r
+                       }\r
                }\r
-               \r
+\r
                isOK = 1;\r
                break;\r
        }\r
-       \r
-       LED_B_ON();\r
-       cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
-       LED_B_OFF();\r
 \r
        if ((workFlags & 0x10) || (!isOK)) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
        }\r
+\r
+       LED_B_ON();\r
+       cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
+       LED_B_OFF();\r
+\r
+       LEDsoff();\r
 }\r
 \r
 \r
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-  \r
-  // params\r
+\r
+       // params\r
        // bit 1 - need wupC\r
        // bit 2 - need HALT after sequence\r
        // bit 3 - need init FPGA and field before sequence\r
        // bit 4 - need reset FPGA and LED\r
        // bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)\r
+       // bit 6 - gen1b backdoor type\r
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r
-       \r
+\r
        // card commands\r
-       uint8_t wupC1[]       = { 0x40 }; \r
-       uint8_t wupC2[]       = { 0x43 }; \r
-       \r
+       uint8_t wupC1[]       = { 0x40 };\r
+       uint8_t wupC2[]       = { 0x43 };\r
+\r
        // variables\r
        byte_t isOK = 0;\r
        uint8_t data[18] = {0x00};\r
        uint32_t cuid = 0;\r
-       \r
+\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
-       \r
+\r
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r
@@ -1329,36 +1550,46 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        while (true) {\r
                if (workFlags & 0x02) {\r
                        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
                                break;\r
-                       };\r
-\r
+               };\r
+               // do no issue for gen1b magic tag\r
+               if (!(workFlags & 0x40)) {\r
                        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != CARD_ACK)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
                                break;\r
                        };\r
                }\r
+       }\r
 \r
                // read block\r
                if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("read block send command error");\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("read block send command error");\r
                        break;\r
                };\r
                memcpy(data, receivedAnswer, 18);\r
-               \r
+\r
                if (workFlags & 0x04) {\r
-                       if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
+                       // do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r
+                       if (!(workFlags & 0x40)) {\r
+                               if (mifare_classic_halt(NULL, cuid)) {\r
+                                       if (MF_DBGLEVEL > 1)    Dbprintf("Halt error");\r
+                                       // Continue, some magic tags misbehavies and send an answer to it.\r
+                                       //      break;\r
+                               }\r
+                       }\r
                }\r
-               \r
+\r
                isOK = 1;\r
                break;\r
        }\r
-       \r
+\r
+       if ((workFlags & 0x10) || (!isOK)) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       }\r
+\r
        LED_B_ON();\r
        if (workFlags & 0x20) {\r
                if (isOK)\r
@@ -1368,39 +1599,49 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                cmd_send(CMD_ACK,isOK,0,0,data,18);\r
        LED_B_OFF();\r
 \r
-       if ((workFlags & 0x10) || (!isOK)) {\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
-       }\r
+       LEDsoff();\r
 }\r
 \r
 void MifareCIdent(){\r
-  \r
+\r
        // card commands\r
-       uint8_t wupC1[]       = { 0x40 }; \r
-       uint8_t wupC2[]       = { 0x43 }; \r
-       \r
+       uint8_t wupC1[]       = { 0x40 };\r
+       uint8_t wupC2[]       = { 0x43 };\r
+\r
        // variables\r
-       byte_t isOK = 1;\r
-       \r
+       byte_t isOK = 0;\r
+\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       clear_trace();\r
+       set_tracing(true);\r
+\r
        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = 0;\r
-       };\r
+       if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == CARD_ACK)) {\r
+               isOK = 2;\r
 \r
-       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = 0;\r
+               ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+               if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == CARD_ACK)) {\r
+                       isOK = 1;\r
+               };\r
        };\r
 \r
-       if (mifare_classic_halt(NULL, 0)) {\r
-               isOK = 0;\r
-       };\r
+       // From iceman1001: removed the if,  since some magic tags misbehavies and send an answer to it.\r
+       mifare_classic_halt(NULL, 0);\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 \r
+       LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
+       LED_B_OFF();\r
+\r
+       LEDsoff();\r
 }\r
 \r
 //\r
@@ -1412,11 +1653,11 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        byte_t dataout[11] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
-    \r
+\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        clear_trace();\r
 \r
-       int len = iso14443a_select_card(uid, NULL, &cuid, true, 0);\r
+       int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, true);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(1);\r
@@ -1430,7 +1671,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
-    cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\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
@@ -1439,35 +1681,22 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        uint8_t key[16] = {0x00};\r
        byte_t isOK = 0;\r
        byte_t dataout[12] = {0x00};\r
-    \r
+\r
        memcpy(key, datain, 16);\r
-       \r
+\r
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
-       \r
-       ifisOK) {\r
-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");  \r
+\r
+       if (isOK) {\r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r
                OnError(4);\r
                return;\r
        }\r
 \r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) 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
Impressum, Datenschutz