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

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index d2497977df350e48940fb6de07ec1b823cebe19b..a16cbf16612f9130e29f26ecce116c13669aacfa 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,8 +16,8 @@
 #include "mifarecmd.h"\r
 #include "apps.h"\r
 #include "util.h"\r
 #include "mifarecmd.h"\r
 #include "apps.h"\r
 #include "util.h"\r

-#include "desfire.h"\r
-#include "../common/crc.h"\r
+\r
+#include "crc.h"\r

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


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

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

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


@@ -76,7 +76,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r

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

 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r


@@ -88,35 +88,38 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 \r
 void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
 \r
 \r
 void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r

-       // variables\r
+\r

        byte_t isOK = 0;\r
        byte_t dataoutbuf[16] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r

-    \r
-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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

-       \r
+    \r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

 \r
        if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
 \r
        if(!iso14443a_select_card(uid, NULL, &cuid)) {\r

-          if (MF_DBGLEVEL >= 1)        Dbprintf("Can't select card, something went wrong before auth");\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                       Dbprintf("Can't select card");\r
+               //OnError(0);\r
+               return;\r

        };\r
        \r
        if(mifare_ultra_auth1(cuid, dataoutbuf)){\r
        };\r
        \r
        if(mifare_ultra_auth1(cuid, dataoutbuf)){\r

-         if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");    \r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Authentication part1: Fail.");\r
+               //OnError(1);\r
+               return;\r

        }\r
 \r
        }\r
 \r

-       isOK=1;\r
-       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 1 FINISHED");\r
+       isOK = 1;\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
+               DbpString("AUTH 1 FINISHED");\r

     \r
     \r

-       LED_B_ON();\r

     cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r
     cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r

-         \r

        LEDsoff();\r
 }\r
 void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
        LEDsoff();\r
 }\r
 void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r


@@ -133,63 +136,57 @@ void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
        LED_C_OFF();\r
        \r
        if(mifare_ultra_auth2(cuid, key, dataoutbuf)){\r
        LED_C_OFF();\r
        \r
        if(mifare_ultra_auth2(cuid, key, dataoutbuf)){\r

-           if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    \r
+           if (MF_DBGLEVEL >= MF_DBG_ERROR) \r
+                       Dbprintf("Authentication part2: Fail...");\r
+               //OnError(1);\r
+               return;                 \r

        }\r
        }\r

+       \r

        isOK = 1;\r
        isOK = 1;\r

-       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 2 FINISHED");\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
+               DbpString("AUTH 2 FINISHED");\r

     \r
     \r

-       LED_B_ON();\r

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

-       LED_B_OFF();\r
-    \r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
 void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r
 {\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
 \r
 void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r
 {\r

-    // params\r

        uint8_t blockNo = arg0;\r
        uint8_t blockNo = arg0;\r

-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       byte_t dataoutbuf[16] = {0x00};\r
+       byte_t dataout[16] = {0x00};\r

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

-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-    \r

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

-       while (true) {\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-            if (MF_DBGLEVEL >= 1)      Dbprintf("Can't select card");\r
-                       break;\r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+    \r
+       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       if(!len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
+               //OnError(1);\r
+               return;\r

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

-               if(mifare_ultra_readblock(cuid, blockNo, dataoutbuf)) {\r
-            if (MF_DBGLEVEL >= 1)      Dbprintf("Read block error");\r
-                       break;\r
+       len = mifare_ultra_readblock(cuid, blockNo, dataout);\r
+       if(len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Read block error");\r
+               //OnError(2);\r
+               return;\r

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

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

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

-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
-    \r
-       LED_B_ON();\r
-    cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
-       LED_B_OFF();\r
+    cmd_send(CMD_ACK,1,0,0,dataout,16);\r

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


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

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

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


@@ -264,62 +261,66 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r
 {\r
 \r
 void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r
 {\r

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

        int Pages = arg1;\r
        int count_Pages = 0;\r
        int Pages = arg1;\r
        int count_Pages = 0;\r

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

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

-       iso14a_clear_trace();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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

-       \r
+\r

        if (MF_DBGLEVEL >= MF_DBG_ALL) \r
                Dbprintf("Pages %d",Pages);\r
        \r
        if (MF_DBGLEVEL >= MF_DBG_ALL) \r
                Dbprintf("Pages %d",Pages);\r
        \r

-       if (!iso14443a_select_card(uid, NULL, &cuid)) {\r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       \r
+       if (!len) {\r

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

-               OnError();\r
+               //OnError(1);\r

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

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

                        if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                                Dbprintf("Read block %d error",i);\r
                        if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                                Dbprintf("Read block %d error",i);\r

-                       OnError();\r
+                       //OnError(2);\r

                        return;\r
                } else {\r
                        count_Pages++;\r
                }\r
        }\r
                \r
                        return;\r
                } else {\r
                        count_Pages++;\r
                }\r
        }\r
                \r

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

                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Halt error");\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Halt error");\r

-               OnError();\r
+               //OnError(3);\r

                return;\r
        }\r
        \r
        if (MF_DBGLEVEL >= MF_DBG_ALL) {\r
                return;\r
        }\r
        \r
        if (MF_DBGLEVEL >= MF_DBG_ALL) {\r

-               Dbprintf("Pages read %d",count_Pages);\r
-               DbpString("Read card finished");\r
+               Dbprintf("Pages read %d", count_Pages);\r

        }\r
 \r
        }\r
 \r

-       int len = 16*4; //64 bytes\r
+       len = 16*4; //64 bytes\r

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

-       cmd_send(CMD_ACK, 1, 0, 0, dataoutbuf, len);\r
-       \r
+       cmd_send(CMD_ACK, 1, 0, 0, dataout, len);       \r

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


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

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

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


@@ -399,49 +400,49 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
 {\r
 \r
 void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
 {\r

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

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

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

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

-       uint32_t cuid;\r
-\r
-       iso14a_clear_trace();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
-\r
-       while (true) {\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                               break;\r
-               };\r
+        uint32_t cuid;\r

 \r
 \r

-               if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                               break;\r
-               };\r
+               clear_trace();\r
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

 \r
 \r

-               if(mifare_ultra_halt(cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-               };\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
+        LED_A_ON();\r
+        LED_B_OFF();\r
+        LED_C_OFF();\r
+\r
+        while (true) {\r
+                if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+                        break;\r
+                };\r
+\r
+                if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {\r
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
+                        break;\r
+                };\r
+\r
+                if(mifare_ultra_halt(cuid)) {\r
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                        break;\r
+                };\r
+                \r
+                isOK = 1;\r
+                break;\r
+        }\r

         \r
         \r

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

 \r
 \r

-       cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+               cmd_send(CMD_ACK,isOK,0,0,0,0);\r
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+        LEDsoff();\r

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


@@ -457,7 +458,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
 \r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
 \r

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

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


@@ -492,7 +493,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
 }\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

-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t * parity) {\r
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {\r

        return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
        (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
        (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
        return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
        (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
        (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r


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

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

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

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

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

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

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


@@ -549,7 +552,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                WDT_HIT();\r
 \r
                davg = dmax = 0;\r
                WDT_HIT();\r
 \r
                davg = dmax = 0;\r

-               dmin = 2000; \r
+               dmin = 2000;\r

                delta_time = 0;\r
                \r
                for (rtr = 0; rtr < 17; rtr++) {\r
                delta_time = 0;\r
                \r
                for (rtr = 0; rtr < 17; rtr++) {\r


@@ -586,7 +589,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        };\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
                        };\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 = 141; i < 1200; i++) {\r
+                       for (i = 101; i < 1200; i++) {\r

                                nttmp = prng_successor(nttmp, 1);\r
                                if (nttmp == nt2) break;\r
                        }\r
                                nttmp = prng_successor(nttmp, 1);\r
                                if (nttmp == nt2) break;\r
                        }\r


@@ -604,7 +607,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        }\r
                }\r
                \r
                        }\r
                }\r
                \r

-               if (rtr <= 1) return;\r
+               if (rtr <= 1)   return;\r

 \r
                davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
                \r
 \r
                davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
                \r


@@ -623,18 +626,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        //  get crypted nonces for target sector\r
        for(i=0; i < 2; i++) { // look for exactly two different nonces\r
 \r
        //  get crypted nonces for target sector\r
        for(i=0; i < 2; i++) { // look for exactly two different nonces\r
 \r

-               WDT_HIT();      \r
-           if(BUTTON_PRESS()) {\r
-                       DbpString("Nested: cancelled");\r
-                       crypto1_destroy(pcs);\r
-                       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-                       LEDsoff();\r
-                       return;\r
-               }\r
-\r

                target_nt[i] = 0;\r
                while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\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


@@ -694,7 +688,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);\r
                }\r
        }\r
                        if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);\r
                }\r
        }\r

-       \r
+\r

        LED_C_OFF();\r
        \r
        //  ----------------------------- crypto1 destroy\r
        LED_C_OFF();\r
        \r
        //  ----------------------------- crypto1 destroy\r


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

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

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


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

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

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


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

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

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


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

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

        // reset FPGA and LED\r
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
        // reset FPGA and LED\r
        if (workFlags & 0x08) {\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r

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

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


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

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

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

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

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


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

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

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


@@ -1137,28 +1131,32 @@ void MifareCIdent(){
 //\r
 \r
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
 //\r
 \r
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r

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

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

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

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

-       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-          if (MF_DBGLEVEL >= 1)        Dbprintf("Can't select card, something went wrong before auth");\r
+       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       if(!len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Can't select card");\r
+               //OnError(1);\r
+               return;\r

        };\r
 \r
        if(mifare_desfire_des_auth1(cuid, dataout)){\r
        };\r
 \r
        if(mifare_desfire_des_auth1(cuid, dataout)){\r

-         if (MF_DBGLEVEL >= 1) \r
-               Dbprintf("Authentication part1: Fail."); \r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Authentication part1: Fail.");\r
+               //OnError(4);\r
+               return;\r

        }\r
 \r
        }\r
 \r

-       isOK = 1;\r
-       if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r

     \r
     \r

-    cmd_send(CMD_ACK,isOK,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


@@ -1169,24 +1167,20 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        byte_t dataout[12] = {0x00};\r
     \r
        memcpy(key, datain, 16);\r
        byte_t dataout[12] = {0x00};\r
     \r
        memcpy(key, datain, 16);\r

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

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

-       if(isOK){\r
-               if (MF_DBGLEVEL >= 2) \r
-                       DbpString("AUTH 2 FINISHED");\r
-               cmd_send(CMD_ACK,isOK,0,0,dataout,sizeof(dataout));\r
-       }\r
-       else {\r
-           if (MF_DBGLEVEL >= 2) \r
+       if( isOK) {\r
+           if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r

                        Dbprintf("Authentication part2: Failed");  \r
                        Dbprintf("Authentication part2: Failed");  \r

-               OnError();\r
+               //OnError(4);\r
+               return;\r

        }\r
 \r
        }\r
 \r

+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r
+               DbpString("AUTH 2 FINISHED");\r
+\r
+       cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r

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

-}
\ No newline at end of file
+}\r