Merge pull request #361 from marshmellow42/master

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 6f57c11319c87d185f003a96d55a2f606f7e2f3d..0e9c36725ec4ad24d2be46e2e51342c30b6a7534 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -21,8 +21,8 @@
 #include "crc.h"\r
 \r
 #define AUTHENTICATION_TIMEOUT 848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
 #include "crc.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 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
 \r
 // the block number for the ISO14443-4 PCB\r
 static uint8_t pcb_blocknum = 0;\r


@@ -30,7 +30,7 @@ static uint8_t pcb_blocknum = 0;
 static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
 \r
 //-----------------------------------------------------------------------------\r
 static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\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
 // read block\r
 //-----------------------------------------------------------------------------\r
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r


@@ -40,7 +40,7 @@ void MifareReadBlock(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
        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];\r
        // variables\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16];\r


@@ -68,7 +68,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\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
                        break;\r
                if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");\r
                        break;\r


@@ -78,14 +78,14 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r

-               \r
+\r

                isOK = 1;\r
                break;\r
        }\r
                isOK = 1;\r
                break;\r
        }\r

-       \r
+\r

        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r

-       \r
+\r

        if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
 \r
        LED_B_ON();\r
        if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
 \r
        LED_B_ON();\r


@@ -111,7 +111,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
                OnError(0);\r
                return;\r
        };\r
                OnError(0);\r
                return;\r
        };\r

-       \r
+\r

        if(!mifare_ultra_auth(keybytes)){\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
                OnError(1);\r
        if(!mifare_ultra_auth(keybytes)){\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
                OnError(1);\r


@@ -168,7 +168,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
                        OnError(1);\r
                        return;\r
                }\r
                        OnError(1);\r
                        return;\r
                }\r

-       }       \r
+       }\r

 \r
        if( mifare_ultra_readblock(blockNo, dataout) ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r
 \r
        if( mifare_ultra_readblock(blockNo, dataout) ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r


@@ -188,7 +188,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 }\r
 \r
 //-----------------------------------------------------------------------------\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
 // 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 +198,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
        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
        // variables\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16 * 16];\r


@@ -222,12 +222,12 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
 \r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
 \r

-       \r
+\r

        if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
                isOK = 0;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
        }\r
        if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
                isOK = 0;\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
        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


@@ -235,14 +235,14 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        break;\r
                }\r
        }\r
                        break;\r
                }\r
        }\r

-               \r
+\r

        if(mifare_classic_halt(pcs, cuid)) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        }\r
 \r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        if(mifare_classic_halt(pcs, cuid)) {\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
        LED_B_ON();\r
        if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
 \r
        LED_B_ON();\r


@@ -307,7 +307,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
 \r
                if (!mifare_ul_ev1_auth(pwd, pack)){\r
                        OnError(1);\r

-                       return;                 \r
+                       return;\r

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


@@ -316,7 +316,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                        Dbprintf("Data exceeds buffer!!");\r
                        break;\r
                }\r
                        Dbprintf("Data exceeds buffer!!");\r
                        break;\r
                }\r

-       \r
+\r

                len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
 \r
                if (len) {\r
                len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
 \r
                if (len) {\r


@@ -352,7 +352,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 }\r
 \r
 //-----------------------------------------------------------------------------\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
 // read block\r
 //-----------------------------------------------------------------------------\r
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r


@@ -365,7 +365,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
        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
        // variables\r
        byte_t isOK = 0;\r
        uint8_t uid[10];\r


@@ -392,7 +392,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\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
                        break;\r
                if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                        break;\r


@@ -402,14 +402,14 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
                        break;\r
                };\r

-               \r
+\r

                isOK = 1;\r
                break;\r
        }\r
                isOK = 1;\r
                break;\r
        }\r

-       \r
+\r

        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r

-       \r
+\r

        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
        LED_B_ON();\r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
        LED_B_ON();\r


@@ -422,7 +422,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \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
 void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)\r
 {\r
        uint8_t blockNo = arg0;\r


@@ -476,7 +476,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        byte_t blockdata[4] = {0x00};\r
 \r
        memcpy(blockdata, datain,4);\r
        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
        LEDsoff();\r
        LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r


@@ -499,7 +499,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
                        return;\r
                }\r
        }\r
                        return;\r
                }\r
        }\r

-       \r
+\r

        // UL-EV1 / NTAG authentication\r
        if (usePwd) {\r
                uint8_t pwd[4] = {0x00};\r
        // UL-EV1 / NTAG authentication\r
        if (usePwd) {\r
                uint8_t pwd[4] = {0x00};\r


@@ -531,12 +531,12 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 }\r
 \r
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain){\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
        uint8_t pwd[16] = {0x00};\r
        byte_t blockdata[4] = {0x00};\r

-       \r
+\r

        memcpy(pwd, datain, 16);\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
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r


@@ -586,7 +586,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(47);\r
                return;\r
                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
 \r
        if(mifare_ultra_halt()) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r


@@ -610,7 +610,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
 //-----------------------------------------------------------------------------\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
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r


@@ -628,7 +628,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
        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
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        uint8_t targetBlockNo = arg1 & 0xff;\r


@@ -637,7 +637,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
        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
        LED_A_ON();\r
        LED_C_OFF();\r
 \r


@@ -646,9 +646,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                clear_trace();\r
                set_tracing(true);\r
        }\r
                clear_trace();\r
                set_tracing(true);\r
        }\r

-       \r
+\r

        LED_C_ON();\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
        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r


@@ -661,7 +661,7 @@ 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
                }\r
 \r
                if (!have_uid) { // need a full select cycle to get the uid first\r

-                       iso14a_card_select_t card_info;         \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
                                continue;\r
                        if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (ALL)");\r
                                continue;\r


@@ -672,14 +672,14 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                                case 10: cascade_levels = 3; break;\r
                                default: break;\r
                        }\r
                                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
                                continue;\r
                        }\r
                }\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
                                continue;\r
                        }\r
                }\r

-               \r
+\r

                if (slow) {\r
                        timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME;\r
                        while(GetCountSspClk() < timeout);\r
                if (slow) {\r
                        timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME;\r
                        while(GetCountSspClk() < timeout);\r


@@ -697,12 +697,12 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r
                        continue;\r
                }\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r
                        continue;\r
                }\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
                // 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

                num_nonces++;\r
                if (num_nonces % 2) {\r
                        memcpy(buf+i, receivedAnswer, 4);\r
                num_nonces++;\r
                if (num_nonces % 2) {\r
                        memcpy(buf+i, receivedAnswer, 4);\r


@@ -716,13 +716,13 @@ 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
                // wait for the card to become ready again\r
                while(GetCountSspClk() < timeout);\r

-       \r
+\r

        }\r
 \r
        LED_C_OFF();\r
        }\r
 \r
        LED_C_OFF();\r

-       \r
+\r

        crypto1_destroy(pcs);\r
        crypto1_destroy(pcs);\r

-       \r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
        LED_B_OFF();\r
        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
        LED_B_OFF();\r


@@ -737,8 +737,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 \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
 //-----------------------------------------------------------------------------\r
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r
 {\r


@@ -750,7 +750,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
        uint64_t ui64Key = 0;\r
 \r
        ui64Key = bytes_to_num(datain, 6);\r

-       \r
+\r

        // variables\r
        uint16_t rtr, i, j, len;\r
        uint16_t davg;\r
        // variables\r
        uint16_t rtr, i, j, len;\r
        uint16_t davg;\r


@@ -759,7 +759,7 @@ 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
        uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r
        uint8_t par[1];\r
        uint32_t target_nt[2], target_ks[2];\r

-       \r
+\r

        uint8_t par_array[4];\r
        uint16_t ncount = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        uint8_t par_array[4];\r
        uint16_t ncount = 0;\r
        struct Crypto1State mpcs = {0, 0};\r


@@ -779,7 +779,7 @@ 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
        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
        // statistics on nonce distance\r
        int16_t isOK = 0;\r
        #define NESTED_MAX_TRIES 12\r


@@ -791,7 +791,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                davg = dmax = 0;\r
                dmin = 2000;\r
                delta_time = 0;\r
                davg = dmax = 0;\r
                dmin = 2000;\r
                delta_time = 0;\r

-               \r
+\r

                for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                        // Test if the action was cancelled\r
                for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                        // Test if the action was cancelled\r


@@ -856,17 +856,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                }\r
 \r
                davg = (davg + (rtr - 1)/2) / (rtr - 1);\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
                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
                LED_B_OFF();\r

-       \r
+\r

        }\r
        }\r

-       //  -------------------------------------------------------------------------------------------------   \r
-       \r
+       //  -------------------------------------------------------------------------------------------------\r
+\r

        LED_C_ON();\r
 \r
        //  get crypted nonces for target sector\r
        LED_C_ON();\r
 \r
        //  get crypted nonces for target sector\r


@@ -874,7 +874,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                target_nt[i] = 0;\r
                while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
 \r
                target_nt[i] = 0;\r
                while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r

-               \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
                        // 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


@@ -885,7 +885,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\r
                        };\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\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
                        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


@@ -899,15 +899,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
                                continue;\r
                        };\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
+                       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
                        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
                        // 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
                        ncount = 0;\r
                        nttest = prng_successor(nt1, dmin - 1);\r
                        for (j = dmin; j < dmax + 1; j++) {\r


@@ -936,17 +936,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        }\r
 \r
        LED_C_OFF();\r
        }\r
 \r
        LED_C_OFF();\r

-       \r
+\r

        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r

-       \r
+\r

        byte_t buf[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
        byte_t buf[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
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
        LED_B_OFF();\r
        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
        LED_B_OFF();\r


@@ -958,8 +958,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 }\r
 \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
 //-----------------------------------------------------------------------------\r
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r


@@ -968,7 +968,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        bool clearTrace = arg1;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        bool clearTrace = arg1;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r

-       \r
+\r

        bool have_uid = false;\r
        uint8_t cascade_levels = 0;\r
        uint32_t timeout = 0;\r
        bool have_uid = false;\r
        uint8_t cascade_levels = 0;\r
        uint32_t timeout = 0;\r


@@ -979,11 +979,11 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        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

-       \r
+\r

        // clear debug level\r
        // clear debug level\r

-       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
+       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r

        MF_DBGLEVEL = MF_DBG_NONE;\r
        MF_DBGLEVEL = MF_DBG_NONE;\r

-       \r
+\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r


@@ -999,7 +999,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \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
 \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
+                       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
                        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


@@ -1011,7 +1011,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                                case 10: cascade_levels = 3; break;\r
                                default: break;\r
                        }\r
                                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 (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card (UID)");\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


@@ -1025,16 +1025,16 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        uint8_t dummy_answer = 0;\r
                        ReaderTransmit(&dummy_answer, 1, NULL);\r
                        timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
                        uint8_t dummy_answer = 0;\r
                        ReaderTransmit(&dummy_answer, 1, NULL);\r
                        timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r

-                       \r
+\r

                        // wait for the card to become ready again\r
                        while(GetCountSspClk() < timeout);\r
                        continue;\r
                }\r
                        // wait for the card to become ready again\r
                        while(GetCountSspClk() < timeout);\r
                        continue;\r
                }\r

-               \r
+\r

                isOK = 1;\r
                break;\r
        }\r
                isOK = 1;\r
                break;\r
        }\r

-       \r
+\r

        LED_B_ON();\r
     cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
        LED_B_OFF();\r
        LED_B_ON();\r
     cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
        LED_B_OFF();\r


@@ -1043,12 +1043,12 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 \r
        // restore debug level\r
        LEDsoff();\r
 \r
        // restore debug level\r

-       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r

 }\r
 \r
 //-----------------------------------------------------------------------------\r
 // MIFARE commands set debug level\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
 //-----------------------------------------------------------------------------\r
 void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        MF_DBGLEVEL = arg0;\r


@@ -1057,7 +1057,7 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\r
 \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
 // 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 +1085,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
 // 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
 //-----------------------------------------------------------------------------\r
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        uint8_t numSectors = arg0;\r


@@ -1105,17 +1105,17 @@ 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
        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
        clear_trace();\r
        set_tracing(false);\r

-       \r
+\r

        bool isOK = true;\r
 \r
        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                isOK = false;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
        bool isOK = true;\r
 \r
        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                isOK = false;\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
        for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                ui64Key = emlGetKey(sectorNo, keyType);\r
                if (sectorNo == 0){\r


@@ -1131,7 +1131,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                                break;\r
                        }\r
                }\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
                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


@@ -1160,7 +1160,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
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

-       \r
+\r

        if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
 \r
 }\r
        if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
 \r
 }\r


@@ -1168,10 +1168,10 @@ 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
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)\r

-// \r
+//\r

 //-----------------------------------------------------------------------------\r
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\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
   // params\r
        uint8_t needWipe = arg0;\r
        // bit 0 - need get UID\r


@@ -1179,20 +1179,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 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
        uint8_t workFlags = arg1;\r
        uint8_t blockNo = arg2;\r

-       \r
+\r

        // card commands\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
        // 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
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r


@@ -1202,7 +1203,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
                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
                clear_trace();\r
                set_tracing(true);\r
        }\r


@@ -1214,16 +1215,18 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                                break;\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

 \r
 \r

-                       if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\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
+\r

                // reset chip\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
                        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r


@@ -1237,51 +1240,61 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r

-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\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
                // write block\r
                if (workFlags & 0x02) {\r
                        ReaderTransmitBitsPar(wupC1,7,0, NULL);\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
 \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 0x0a 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] != 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
+                       }\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
                        break;\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
                        break;\r
                };\r

-       \r
+\r

                memcpy(d_block, datain, 16);\r
                AppendCrc14443a(d_block, 16);\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
                        break;\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
                        break;\r

-               };      \r
-       \r
+               };\r
+\r

                if (workFlags & 0x04) {\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 > 2)    Dbprintf("Halt error");\r
+                                       // Continue, some magic tags misbehavies and send an answer to it.\r
+                                       // break;\r
+                               }\r
+                       }\r

                }\r
                }\r

-               \r
+\r

                isOK = 1;\r
                break;\r
        }\r
                isOK = 1;\r
                break;\r
        }\r

-       \r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
        LED_B_OFF();\r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
        LED_B_OFF();\r


@@ -1294,28 +1307,29 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
 \r
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\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 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
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r

-       \r
+\r

        // card commands\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
        // 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
        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
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r


@@ -1332,14 +1346,16 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
                                break;\r
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\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
                                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
                }\r

+       }\r

 \r
                // read block\r
                if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
 \r
                // read block\r
                if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r


@@ -1347,18 +1363,22 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        break;\r
                };\r
                memcpy(data, receivedAnswer, 18);\r
                        break;\r
                };\r
                memcpy(data, receivedAnswer, 18);\r

-               \r
+\r

                if (workFlags & 0x04) {\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
+\r

                isOK = 1;\r
                break;\r
        }\r
                isOK = 1;\r
                break;\r
        }\r

-       \r
+\r

        LED_B_ON();\r
        if (workFlags & 0x20) {\r
                if (isOK)\r
        LED_B_ON();\r
        if (workFlags & 0x20) {\r
                if (isOK)\r


@@ -1375,30 +1395,29 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 }\r
 \r
 void MifareCIdent(){\r
 }\r
 \r
 void MifareCIdent(){\r

-  \r
+\r

        // card commands\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
        // 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
        ReaderTransmitBitsPar(wupC1,7,0, NULL);\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
-               isOK = 0;\r
-       };\r
+       if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) {\r
+               isOK = 2;\r

 \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] == 0x0a)) {\r
+                       isOK = 1;\r
+               };\r

        };\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
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r


@@ -1412,7 +1431,7 @@ 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
        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
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        clear_trace();\r
 \r


@@ -1439,13 +1458,13 @@ 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
        uint8_t key[16] = {0x00};\r
        byte_t isOK = 0;\r
        byte_t dataout[12] = {0x00};\r

-    \r
+\r

        memcpy(key, datain, 16);\r
        memcpy(key, datain, 16);\r

-       \r
+\r

        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r

-       \r
+\r

        if( isOK) {\r
        if( isOK) {\r

-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");  \r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r

                OnError(4);\r
                return;\r
        }\r
                OnError(4);\r
                return;\r
        }\r