chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get starti...

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index c68a50e567b2a9e8fd3f44e8dbba2a57a4241dd7..2ab076b626575975a396f905dc2510633124cef1 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -4,7 +4,7 @@
 // Hagen Fritsch - June 2010\r
 // Midnitesnake - Dec 2013\r
 // Andy Davies  - Apr 2014\r
 // Hagen Fritsch - June 2010\r
 // Midnitesnake - Dec 2013\r
 // Andy Davies  - Apr 2014\r

-// Iceman - May 2014\r
+// Iceman - May 2014,2015,2016\r

 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r


@@ -14,11 +14,6 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "mifarecmd.h"\r
 //-----------------------------------------------------------------------------\r
 \r
 #include "mifarecmd.h"\r

-#include "apps.h"\r
-#include "util.h"\r
-#include "crc.h"\r
-#include "protocols.h"\r
-#include "parity.h"\r

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


@@ -75,7 +70,6 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
                break;\r
        }\r
        \r

-       //  ----------------------------- crypto1 destroy\r

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


@@ -235,18 +229,17 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        }\r
 \r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        }\r
 \r

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

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

+       crypto1_destroy(pcs);\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));\r
        LED_B_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
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

+       set_tracing(FALSE);\r

 }\r
 \r
 // arg0 = blockNo (start)\r
 }\r
 \r
 // arg0 = blockNo (start)\r


@@ -260,7 +253,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r

-       BigBuf_free();\r
+       BigBuf_free(); BigBuf_Clear_ext(false);\r

        clear_trace();\r
        set_tracing(true);\r
        \r
        clear_trace();\r
        set_tracing(true);\r
        \r


@@ -345,6 +338,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        BigBuf_free();\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        BigBuf_free();\r

+       set_tracing(FALSE);\r

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


@@ -380,7 +374,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LED_C_OFF();\r
 \r
        while (true) {\r
        LED_C_OFF();\r
 \r
        while (true) {\r

-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r

                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r


@@ -404,19 +398,15 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
                break;\r
        }\r
        \r

-       //  ----------------------------- crypto1 destroy\r

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

-       LED_B_ON();\r

        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r

-       LED_B_OFF();\r
-\r

 \r
 \r

-       // Thats it...\r

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

+       set_tracing(FALSE);\r

 }\r
 \r
 /* // Command not needed but left for future testing \r
 }\r
 \r
 /* // Command not needed but left for future testing \r


@@ -527,6 +517,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

+       set_tracing(FALSE);\r

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


@@ -597,6 +588,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

+       set_tracing(FALSE);\r

 }\r
 \r
 // Return 1 if the nonce is invalid else return 0\r
 }\r
 \r
 // Return 1 if the nonce is invalid else return 0\r


@@ -613,6 +605,9 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r

+#define AUTHENTICATION_TIMEOUT  848 //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

 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
 {\r
        uint64_t ui64Key = 0;\r
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
 {\r
        uint64_t ui64Key = 0;\r


@@ -638,20 +633,20 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        bool slow = flags & 0x0002;\r
        bool field_off = flags & 0x0004;\r
        \r
        bool slow = flags & 0x0002;\r
        bool field_off = flags & 0x0004;\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

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

+       BigBuf_free(); BigBuf_Clear_ext(false); \r
+       clear_trace();\r
+       set_tracing(FALSE);\r
+       \r

        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

-               clear_trace();\r
-               set_tracing(true);\r

        }\r
        \r
        LED_C_ON();\r
        \r
        }\r
        \r
        LED_C_ON();\r
        \r

+       uint8_t dummy_answer = 0;       \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


@@ -702,7 +697,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                }\r
        \r
                // send a dummy byte as reader response in order to trigger the cards authentication timeout\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
                ReaderTransmit(&dummy_answer, 1, NULL);\r
                timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
                \r


@@ -711,21 +705,17 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        memcpy(buf+i, receivedAnswer, 4);\r
                        nt_par_enc = par_enc[0] & 0xf0;\r
                } else {\r
                        memcpy(buf+i, receivedAnswer, 4);\r
                        nt_par_enc = par_enc[0] & 0xf0;\r
                } else {\r

-                       nt_par_enc |= par_enc[0] >> 4;\r
+                       nt_par_enc |= par_enc[0]  >> 4;\r

                        memcpy(buf+i+4, receivedAnswer, 4);\r
                        memcpy(buf+i+8, &nt_par_enc, 1);\r
                        i += 9;\r
                }\r
                        memcpy(buf+i+4, receivedAnswer, 4);\r
                        memcpy(buf+i+8, &nt_par_enc, 1);\r
                        i += 9;\r
                }\r

-\r

                // wait for the card to become ready again\r
                // wait for the card to become ready again\r

-               while(GetCountSspClk() < timeout);\r
-       \r
+               while(GetCountSspClk() < timeout);      \r

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

-       \r
-       crypto1_destroy(pcs);\r
-       \r
+       crypto1_destroy(pcs);   \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


@@ -735,6 +725,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        if (field_off) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LEDsoff();\r
        if (field_off) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LEDsoff();\r

+               set_tracing(FALSE);\r

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


@@ -778,8 +769,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r

-       BigBuf_free();\r
-\r
+       BigBuf_free(); BigBuf_Clear_ext(false);\r
+       \r

        if (calibrate) clear_trace();\r
        set_tracing(true);\r
 \r
        if (calibrate) clear_trace();\r
        set_tracing(true);\r
 \r


@@ -832,7 +823,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \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
 \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_one(nttmp);\r
+                               nttmp = prng_successor(nttmp, 1);\r

                                if (nttmp == nt2) break;\r
                        }\r
 \r
                                if (nttmp == nt2) break;\r
                        }\r
 \r


@@ -914,7 +905,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        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

-                               nttest = prng_successor_one(nttest);\r
+                               nttest = prng_successor(nttest, 1);\r

                                ks1 = nt2 ^ nttest;\r
 \r
                                if (valid_nonce(nttest, nt2, ks1, par_array)){\r
                                ks1 = nt2 ^ nttest;\r
 \r
                                if (valid_nonce(nttest, nt2, ks1, par_array)){\r


@@ -940,7 +931,6 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        LED_C_OFF();\r
        \r
 \r
        LED_C_OFF();\r
        \r

-       //  ----------------------------- crypto1 destroy\r

        crypto1_destroy(pcs);\r
        \r
        byte_t buf[4 + 4 * 4] = {0};\r
        crypto1_destroy(pcs);\r
        \r
        byte_t buf[4 + 4 * 4] = {0};\r


@@ -965,16 +955,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 // MIFARE check keys. key count up to 85. \r
 // \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
-  // params\r
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {\r

        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        bool clearTrace = arg1;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        \r
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        bool clearTrace = arg1;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        \r

-       // variables\r
+       bool have_uid = FALSE;\r
+       uint8_t cascade_levels = 0;\r
+       uint32_t timeout = 0;\r
+       \r

        int i;\r
        byte_t isOK = 0;\r
        uint8_t uid[10] = {0x00};\r
        int i;\r
        byte_t isOK = 0;\r
        uint8_t uid[10] = {0x00};\r


@@ -983,7 +974,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
        \r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
        \r

-       // clear debug level\r
+       // save old debuglevel, and tempory turn off dbg printing. speedissues.\r

        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r


@@ -996,35 +987,59 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                clear_trace();\r
        \r
        set_tracing(TRUE);\r
                clear_trace();\r
        \r
        set_tracing(TRUE);\r

-\r
+       \r

        for (i = 0; i < keyCount; ++i) {\r
 \r
        for (i = 0; i < keyCount; ++i) {\r
 \r

-               if (!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
-                       if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card");\r
-                       break;\r
-               }\r
+               //mifare_classic_halt(pcs, cuid);\r

 \r
 \r

+               // this part is from 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 (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Can't select card (ALL)");\r
+                               break;\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 (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Can't select card (UID)");\r
+                               continue;\r
+                       }\r
+               }\r
+       \r

                ui64Key = bytes_to_num(datain + i * 6, 6);\r
                ui64Key = bytes_to_num(datain + i * 6, 6);\r

+               \r

                if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
                if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

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

                        continue;\r
                }\r
                        continue;\r
                }\r

-               \r

                isOK = 1;\r
                break;\r
        }\r
        \r
        LED_B_ON();\r
                isOK = 1;\r
                break;\r
        }\r
        \r
        LED_B_ON();\r

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

 \r
 \r

+       // restore debug level\r
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
+       \r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        set_tracing(FALSE);\r
        crypto1_destroy(pcs);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        set_tracing(FALSE);\r
        crypto1_destroy(pcs);\r

-       \r
-       // restore debug level\r
-       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r

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


@@ -1197,15 +1212,14 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
                                errormsg = MAGIC_UID;\r
                        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
                                errormsg = MAGIC_UID;\r

-                               // break;\r

                        }\r
                        }\r

-                       \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
+                       break;\r

                }\r
        \r
                // wipe tag, fill it with zeros\r
                if (workFlags & MAGIC_WIPE){\r
                }\r
        \r
                // wipe tag, fill it with zeros\r
                if (workFlags & MAGIC_WIPE){\r

-                       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r

                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WIPE;\r
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WIPE;\r


@@ -1219,12 +1233,12 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r

-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r

                }       \r
 \r
                // write block\r
                if (workFlags & MAGIC_WUPC) {\r
                }       \r
 \r
                // write block\r
                if (workFlags & MAGIC_WUPC) {\r

-                       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r

                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WUPC;\r
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WUPC;\r


@@ -1256,7 +1270,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                }       \r
        \r
                if (workFlags & MAGIC_OFF) \r
                }       \r
        \r
                if (workFlags & MAGIC_OFF) \r

-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r

                \r
                isOK = true;\r
                break;\r
                \r
                isOK = true;\r
                break;\r


@@ -1297,7 +1311,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
        //loop doesn't loop just breaks out if error or done\r
        while (true) {\r
                if (workFlags & MAGIC_WUPC) {\r
        //loop doesn't loop just breaks out if error or done\r
        while (true) {\r
                if (workFlags & MAGIC_WUPC) {\r

-                       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r

                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WUPC;\r
                        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
                                errormsg = MAGIC_WUPC;\r


@@ -1344,25 +1358,53 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 }\r
 \r
 void MifareCIdent(){\r
 }\r
 \r
 void MifareCIdent(){\r

-       \r
+       #define GEN_1A 1\r
+       #define GEN_1B 2\r
+       #define GEN_2  4\r

        // variables\r
        // variables\r

-       bool isOK = true;       \r
-       uint8_t receivedAnswer[1] = {0x00};\r
-       uint8_t receivedAnswerPar[1] = {0x00};\r
-\r
-       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = false;\r
-       }\r
-\r
+       uint8_t isGen = 0;\r
+       uint8_t rec[1] = {0x00};\r
+       uint8_t recpar[1] = {0x00};\r
+       \r
+       // Generation 1 test\r
+       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r
+               goto TEST2;\r
+       };\r
+       isGen = GEN_1B;\r
+       \r

        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = false;\r
-       }\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r
+               goto OUT;\r
+       };      \r
+       isGen = GEN_1A;\r
+       goto OUT;\r

 \r
 \r

+TEST2:;\r
+/*\r
+       // Generation 2 test\r
+       struct Crypto1State mpcs = {0, 0};\r
+       struct Crypto1State *pcs = &mpcs;\r
+\r
+       // halt previous.\r
+       mifare_classic_halt(NULL, 0);\r
+       \r
+       //select\r
+       if (!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+               goto OUT;\r
+       };\r
+       \r
+       // MIFARE_CLASSIC_WRITEBLOCK 0xA0\r
+       // ACK 0x0a\r
+       uint16_t len = mifare_sendcmd_short(pcs, 1, 0xA0, 0, rec, recpar, NULL);\r
+       if ((len != 1) || (rec[0] != 0x0A)) {   \r
+               isGen = GEN_2;  \r
+       };\r
+       */\r
+OUT:;\r

        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r

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

 }\r
 \r
 void OnSuccessMagic(){\r
 }\r
 \r
 void OnSuccessMagic(){\r


@@ -1375,16 +1417,10 @@ void OnErrorMagic(uint8_t reason){
        cmd_send(CMD_ACK,0,reason,0,0,0);\r
        OnSuccessMagic();\r
 }\r
        cmd_send(CMD_ACK,0,reason,0,0,0);\r
        OnSuccessMagic();\r
 }\r

-\r
-void MifareCollectNonces(uint32_t arg0, uint32_t arg1){\r
-}\r
-\r

 //\r
 // DESFIRE\r
 //\r
 //\r
 // DESFIRE\r
 //\r

-\r

 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r

-\r

        byte_t dataout[12] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid = 0;\r
        byte_t dataout[12] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid = 0;\r


@@ -1407,11 +1443,10 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r

-    cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
+    cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));\r

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

-\r

        uint32_t cuid = arg0;\r
        uint8_t key[16] = {0x00};\r
        byte_t dataout[12] = {0x00};\r
        uint32_t cuid = arg0;\r
        uint8_t key[16] = {0x00};\r
        byte_t dataout[12] = {0x00};\r


@@ -1432,4 +1467,5 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

+       set_tracing(FALSE);\r

 }
\ No newline at end of file
 }
\ No newline at end of file