fix: ukbhit() for OS X

[proxmark3-svn] / armsrc / mifarecmd.c

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

-\r
-#include "des.h"\r

 #include "crc.h"\r
 \r
 // the block number for the ISO14443-4 PCB\r
 #include "crc.h"\r
 \r
 // the block number for the ISO14443-4 PCB\r


@@ -25,7 +23,6 @@ uint8_t pcb_blocknum = 0;
 // Deselect card by sending a s-block. the crc is precalced for speed\r
 static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
 \r
 // Deselect card by sending a s-block. the crc is precalced for speed\r
 static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
 \r

-\r

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


@@ -47,10 +44,10 @@ void MifareReadBlock(uint8_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 trace\r
-       clear_trace();\r

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

+       clear_trace();\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


@@ -93,54 +90,33 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r

-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r

 \r
 \r

-       byte_t dataoutbuf[16] = {0x00};\r
-       uint8_t uid[10] = {0x00};\r
-       uint32_t cuid = 0x00;\r
+       bool turnOffField = (arg0 == 1);\r

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

-    \r
-       clear_trace();\r
+\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
+       clear_trace();\r
+\r
+       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r

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

-       if(mifare_ultra_auth1(dataoutbuf)){\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r
+       if(!mifare_ultra_auth(keybytes)){\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r

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

-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
-    \r
-    cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);\r
-       LEDsoff();\r
-}\r
-void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
-\r
-       uint8_t key[16] = {0x00};\r
-       byte_t dataoutbuf[16] = {0x00};\r
-    \r
-       memcpy(key, datain, 16);\r
-    \r
-       LED_A_ON();     LED_B_OFF(); LED_C_OFF();\r
-       \r
-       if(mifare_ultra_auth2(key, dataoutbuf)){\r
-           if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");\r
-               OnError(1);\r
-               return;                 \r
+       if (turnOffField) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+               LEDsoff();\r

        }\r
        }\r

-       \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
-    \r
-       cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r

 }\r
 \r
 // Arg0 = BlockNo,\r
 }\r
 \r
 // Arg0 = BlockNo,\r


@@ -150,125 +126,57 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 {\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r
 {\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r

-       uint8_t uid[10] = {0x00};\r
-       uint8_t key[16] = {0x00};\r
-       bool usePwd = (arg1 == 1);\r
+       bool useKey = (arg1 == 1); //UL_C\r
+       bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r

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

-       clear_trace();\r

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

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

        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
                OnError(1);\r
                return;\r
        }\r
 \r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
                OnError(1);\r
                return;\r
        }\r
 \r

-        // authenticate here.\r
-       if ( usePwd ) {\r
-\r
-               memcpy(key, datain, 16);\r
-\r
-               // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7] );\r
-               // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[8],key[9],key[10],key[11],key[12],key[13],key[14],key[15] );\r
-\r
-               uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };\r
-               uint8_t random_b[8] = {0x00};\r
-               uint8_t enc_random_b[8] = {0x00};\r
-               uint8_t rnd_ab[16] = {0x00};\r
-               uint8_t IV[8] = {0x00};\r
-\r
-               uint16_t len;\r
-               uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-               uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+       // UL-C authentication\r
+       if ( useKey ) {\r
+               uint8_t key[16] = {0x00};\r
+               memcpy(key, datain, sizeof(key) );\r

 \r
 \r

-               len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+               if ( !mifare_ultra_auth(key) ) {\r

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

-       \r
-               // tag nonce.\r
-               memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
-               // decrypt nonce.\r
-               tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
-               rol(random_b,8);\r
-               memcpy(rnd_ab  ,random_a,8);\r
-               memcpy(rnd_ab+8,random_b,8);\r
-\r
-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-                       Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                               enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],\r
-                               enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);\r
-                               \r
-                       Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                               random_b[0],random_b[1],random_b[2],random_b[3],\r
-                               random_b[4],random_b[5],random_b[6],random_b[7]);\r
-\r
-                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
-                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
-                                       \r
-                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
-                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );\r
-               }\r
-               \r
-               // encrypt    out, in, length, key, iv\r
-               tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+       }\r

 \r
 \r

-               len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+       // UL-EV1 / NTAG authentication\r
+       if ( usePwd ) {\r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain, 4);\r
+               uint8_t pack[4] = {0,0,0,0};\r
+               if (!mifare_ul_ev1_auth(pwd, pack)) {\r

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

+       }       \r

 \r
 \r

-               uint8_t enc_resp[8] = { 0 };\r
-               uint8_t resp_random_a[8] = { 0 };\r
-               memcpy(enc_resp, receivedAnswer+1, 8);\r
-       \r
-               // decrypt    out, in, length, key, iv \r
-               tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
-               if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
-                       Dbprintf("failed authentication");\r
-\r
-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", \r
-                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
-                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
-\r
-                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
-                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);\r
-\r
-                       Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       random_a[0],random_a[1],random_a[2],random_a[3],\r
-                                       random_a[4],random_a[5],random_a[6],random_a[7]);\r
-                                       \r
-                       Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r
-                                       resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r
-               }\r
-       }\r
-               \r

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

-        \r
+\r

        if( mifare_ultra_halt() ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
                OnError(3);\r
                return;\r
        }\r
        if( mifare_ultra_halt() ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
                OnError(3);\r
                return;\r
        }\r

-               \r
-    cmd_send(CMD_ACK,1,0,0,dataout,16);\r
+\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


@@ -294,11 +202,10 @@ void MifareReadSector(uint8_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 trace\r
-       clear_trace();\r
-\r

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

+       clear_trace();\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


@@ -341,20 +248,33 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r

+// arg0 = blockNo (start)\r
+// arg1 = Pages (number of blocks)\r
+// arg2 = useKey\r
+// datain = KEY bytes\r

 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r

-       // params\r
-       uint8_t blockNo = arg0;\r
-       uint16_t blocks = arg1;\r
-       bool useKey = (arg2 == 1);\r
-       int countblocks = 0;\r
-       uint8_t dataout[176] = {0x00};\r
-\r

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

-       clear_trace();\r

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

+       // free eventually allocated BigBuf memory\r
+       BigBuf_free();\r
+       clear_trace();\r
+\r
+       // params\r
+       uint8_t blockNo = arg0;\r
+       uint16_t blocks = arg1;\r
+       bool useKey = (arg2 == 1); //UL_C\r
+       bool usePwd = (arg2 == 2); //UL_EV1/NTAG\r
+       uint32_t countblocks = 0;\r
+       uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);\r
+       if (dataout == NULL){\r
+               Dbprintf("out of memory");\r
+               OnError(1);\r
+               return;\r
+       }\r
+\r

        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r
        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r


@@ -362,63 +282,47 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                return;\r
        }\r
 \r
                return;\r
        }\r
 \r

-       // authenticate\r
+       // UL-C authentication\r

        if ( useKey ) {\r
                uint8_t key[16] = {0x00};\r
        if ( useKey ) {\r
                uint8_t key[16] = {0x00};\r

-               memcpy(key, datain, 16);\r
+               memcpy(key, datain, sizeof(key) );\r

 \r
 \r

-               uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };\r
-               uint8_t random_b[8] = {0x00};\r
-               uint8_t enc_random_b[8] = {0x00};\r
-               uint8_t rnd_ab[16] = {0x00};\r
-               uint8_t IV[8] = {0x00};\r
-\r
-               uint16_t len;\r
-               uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-               uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-\r
-               len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+               if ( !mifare_ultra_auth(key) ) {\r

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

+       }\r

 \r
 \r

-               // tag nonce.\r
-               memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
-               // decrypt nonce.\r
-               tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
-               rol(random_b,8);\r
-               memcpy(rnd_ab  ,random_a,8);\r
-               memcpy(rnd_ab+8,random_b,8);\r
-\r
-               // encrypt    out, in, length, key, iv\r
-               tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+       // UL-EV1 / NTAG authentication\r
+       if (usePwd) {\r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain, sizeof(pwd));\r
+               uint8_t pack[4] = {0,0,0,0};\r

 \r
 \r

-               len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
-               if (len != 11) {\r
+               if (!mifare_ul_ev1_auth(pwd, pack)){\r

                        OnError(1);\r
                        OnError(1);\r

-                       return;\r
+                       return;                 \r

                }\r
                }\r

-\r
-               uint8_t enc_resp[8] = { 0 };\r
-               uint8_t resp_random_a[8] = { 0 };\r
-               memcpy(enc_resp, receivedAnswer+1, 8);\r
-\r
-               // decrypt    out, in, length, key, iv \r
-               tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
-               if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
-                       Dbprintf("failed authentication");      \r

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

-               len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);\r
+               if ((i*4) + 4 >= CARD_MEMORY_SIZE) {\r
+                       Dbprintf("Data exceeds buffer!!");\r
+                       break;\r
+               }\r
+       \r
+               len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r

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

-                       OnError(2);\r
-                       return;\r
+                       // if no blocks read - error out\r
+                       if (i==0){\r
+                               OnError(2);\r
+                               return;\r
+                       } else {\r
+                               //stop at last successful read block and return what we got\r
+                               break;\r
+                       }\r

                } else {\r
                        countblocks++;\r
                }\r
                } else {\r
                        countblocks++;\r
                }\r


@@ -433,11 +337,12 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
 \r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
 \r

-       len = blocks * 4;\r
+       countblocks *= 4;\r

 \r
 \r

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

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

+       BigBuf_free();\r

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


@@ -463,11 +368,10 @@ void MifareWriteBlock(uint8_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 trace\r
-       clear_trace();\r
-\r

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

+       clear_trace();\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


@@ -512,7 +416,8 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r

-void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\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
        byte_t blockdata[16] = {0x00};\r
 {\r
        uint8_t blockNo = arg0;\r
        byte_t blockdata[16] = {0x00};\r


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

-       if(mifare_ultra_writeblock(blockNo, blockdata)) {\r
+       if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {\r

                if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                OnError(0);\r
                return; };\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                OnError(0);\r
                return; };\r


@@ -549,27 +454,58 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r

-\r
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
+*/\r
+\r
+// Arg0   : Block to write to.\r
+// Arg1   : 0 = use no authentication.\r
+//          1 = use 0x1A authentication.\r
+//          2 = use 0x1B authentication.\r
+// datain : 4 first bytes is data to be written.\r
+//        : 4/16 next bytes is authentication key.\r
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r

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

+       bool useKey = (arg1 == 1); //UL_C\r
+       bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r

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

-       \r
-       memcpy(blockdata, datain,4);\r

 \r
 \r

-       uint8_t uid[10] = {0x00};\r
+       memcpy(blockdata, datain,4);\r

        \r
        \r

-       LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
-       clear_trace();\r
+       LEDsoff();\r
+       LED_A_ON();\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, NULL)) {\r
+       clear_trace();\r
+\r
+       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r

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

-       if(mifare_ultra_special_writeblock(blockNo, blockdata)) {\r
+       // UL-C authentication\r
+       if ( useKey ) {\r
+               uint8_t key[16] = {0x00};\r
+               memcpy(key, datain+4, sizeof(key) );\r
+\r
+               if ( !mifare_ultra_auth(key) ) {\r
+                       OnError(1);\r
+                       return;\r
+               }\r
+       }\r
+       \r
+       // UL-EV1 / NTAG authentication\r
+       if (usePwd) {\r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain+4, 4);\r
+               uint8_t pack[4] = {0,0,0,0};\r
+               if (!mifare_ul_ev1_auth(pwd, pack)) {\r
+                       OnError(1);\r
+                       return;\r
+               }\r
+       }\r
+\r
+       if(mifare_ultra_writeblock(blockNo, blockdata)) {\r

                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(0);\r
                return;\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(0);\r
                return;\r


@@ -596,9 +532,10 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        memcpy(pwd, datain, 16);\r
        \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
        memcpy(pwd, datain, 16);\r
        \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

-       clear_trace();\r

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

+       clear_trace();\r
+\r

        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r


@@ -609,7 +546,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[6];\r
        blockdata[2] = pwd[5];\r
        blockdata[3] = pwd[4];\r
        blockdata[1] = pwd[6];\r
        blockdata[2] = pwd[5];\r
        blockdata[3] = pwd[4];\r

-       if(mifare_ultra_special_writeblock( 44, blockdata)) {\r
+       if(mifare_ultra_writeblock( 44, blockdata)) {\r

                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(44);\r
                return;\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(44);\r
                return;\r


@@ -619,7 +556,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[2];\r
        blockdata[2] = pwd[1];\r
        blockdata[3] = pwd[0];\r
        blockdata[1] = pwd[2];\r
        blockdata[2] = pwd[1];\r
        blockdata[3] = pwd[0];\r

-       if(mifare_ultra_special_writeblock( 45, blockdata)) {\r
+       if(mifare_ultra_writeblock( 45, blockdata)) {\r

                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(45);\r
                return;\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(45);\r
                return;\r


@@ -629,7 +566,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[14];\r
        blockdata[2] = pwd[13];\r
        blockdata[3] = pwd[12];\r
        blockdata[1] = pwd[14];\r
        blockdata[2] = pwd[13];\r
        blockdata[3] = pwd[12];\r

-       if(mifare_ultra_special_writeblock( 46, blockdata)) {\r
+       if(mifare_ultra_writeblock( 46, blockdata)) {\r

                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(46);\r
                return;\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(46);\r
                return;\r


@@ -639,7 +576,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[10];\r
        blockdata[2] = pwd[9];\r
        blockdata[3] = pwd[8];\r
        blockdata[1] = pwd[10];\r
        blockdata[2] = pwd[9];\r
        blockdata[3] = pwd[8];\r

-       if(mifare_ultra_special_writeblock( 47, blockdata)) {\r
+       if(mifare_ultra_writeblock( 47, blockdata)) {\r

                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


@@ -698,19 +635,20 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        uint32_t auth1_time, auth2_time;\r
        static uint16_t delta_time;\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
-       set_tracing(false);\r
-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r

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

+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

 \r
 \r

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

 \r
 \r

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

        // statistics on nonce distance\r
        // statistics on nonce distance\r

+       int16_t isOK = 0;\r
+       #define NESTED_MAX_TRIES 12\r
+       uint16_t unsuccessfull_tries = 0;\r

        if (calibrate) {        // for first call only. Otherwise reuse previous calibration\r
                LED_B_ON();\r
                WDT_HIT();\r
        if (calibrate) {        // for first call only. Otherwise reuse previous calibration\r
                LED_B_ON();\r
                WDT_HIT();\r


@@ -721,6 +659,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                \r
                for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                \r
                for (rtr = 0; rtr < 17; rtr++) {\r
 \r

+                       // Test if the action was cancelled\r
+                       if(BUTTON_PRESS()) {\r
+                               isOK = -2;\r
+                               break;\r
+                       }\r
+\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


@@ -768,14 +712,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                        delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing\r
                                }\r
                                if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r
                                        delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing\r
                                }\r
                                if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r

+                       } else {\r
+                               unsuccessfull_tries++;\r
+                               if (unsuccessfull_tries > NESTED_MAX_TRIES) {   // card isn't vulnerable to nested attack (random numbers are not predictable)\r
+                                       isOK = -3;\r
+                               }\r

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

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

-               if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);\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
                dmin = davg - 2;\r
                dmax = davg + 2;\r


@@ -783,12 +730,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                LED_B_OFF();\r
        \r
        }\r
                LED_B_OFF();\r
        \r
        }\r

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

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

-       for(i=0; i < 2; i++) { // look for exactly two different nonces\r
+       for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

 \r
                target_nt[i] = 0;\r
                while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
 \r
                target_nt[i] = 0;\r
                while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r


@@ -812,7 +759,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r

-                       len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
+                       len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r

                        if (len != 4) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
                                continue;\r
                        if (len != 4) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
                                continue;\r


@@ -866,25 +813,25 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        memcpy(buf+16, &target_ks[1], 4);\r
        \r
        LED_B_ON();\r
        memcpy(buf+16, &target_ks[1], 4);\r
        \r
        LED_B_ON();\r

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

        LED_B_OFF();\r
 \r
        if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        LED_B_OFF();\r
 \r
        if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r

-       set_tracing(TRUE);\r

 }\r
 \r
 //-----------------------------------------------------------------------------\r
 // MIFARE check keys. key count up to 85. \r
 // \r
 //-----------------------------------------------------------------------------\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
 // MIFARE check keys. key count up to 85. \r
 // \r
 //-----------------------------------------------------------------------------\r

-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r

 {\r
   // params\r
 {\r
   // params\r

-       uint8_t blockNo = arg0;\r
-       uint8_t keyType = arg1;\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 keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        \r


@@ -901,15 +848,13 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        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

-       // clear trace\r
-       clear_trace();\r
-       set_tracing(TRUE);\r
-\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

+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       if (clearTrace) clear_trace();\r
+       set_tracing(TRUE);\r

 \r
        for (i = 0; i < keyCount; i++) {\r
                if(mifare_classic_halt(pcs, cuid)) {\r
 \r
        for (i = 0; i < keyCount; i++) {\r
                if(mifare_classic_halt(pcs, cuid)) {\r


@@ -956,16 +901,23 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\r
 // \r
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\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

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

+\r

 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        emlClearMem();\r
 }\r
 \r
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        emlClearMem();\r
 }\r
 \r
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
 }\r
 \r
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
 }\r
 \r
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        byte_t buf[USB_CMD_DATA_SIZE];\r
        emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
 \r
        byte_t buf[USB_CMD_DATA_SIZE];\r
        emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
 \r


@@ -992,15 +944,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        byte_t dataoutbuf2[16];\r
        uint8_t uid[10];\r
 \r
        byte_t dataoutbuf2[16];\r
        uint8_t uid[10];\r
 \r

-       // clear trace\r
-       clear_trace();\r
-       set_tracing(false);\r
-       \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

+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       \r
+       clear_trace();\r
+       set_tracing(false);\r

        \r
        bool isOK = true;\r
 \r
        \r
        bool isOK = true;\r
 \r


@@ -1094,10 +1044,10 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r

+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        \r
                clear_trace();\r
                set_tracing(TRUE);\r
        \r
                clear_trace();\r
                set_tracing(TRUE);\r

-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        }\r
 \r
        while (true) {\r
        }\r
 \r
        while (true) {\r


@@ -1193,6 +1143,7 @@ void MifareCGetBlock(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 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)\r

        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r
        \r
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r
        \r


@@ -1212,10 +1163,10 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                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
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r

                clear_trace();\r
                set_tracing(TRUE);\r
                clear_trace();\r
                set_tracing(TRUE);\r

-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        }\r
 \r
        while (true) {\r
        }\r
 \r
        while (true) {\r


@@ -1252,7 +1203,12 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        }\r
        \r
        LED_B_ON();\r
        }\r
        \r
        LED_B_ON();\r

-       cmd_send(CMD_ACK,isOK,0,0,data,18);\r
+       if (workFlags & 0x20) {\r
+               if (isOK)\r
+                       memcpy(datain, data, 18);\r
+       }\r
+       else\r
+               cmd_send(CMD_ACK,isOK,0,0,data,18);\r

        LED_B_OFF();\r
 \r
        if ((workFlags & 0x10) || (!isOK)) {\r
        LED_B_OFF();\r
 \r
        if ((workFlags & 0x10) || (!isOK)) {\r


@@ -1290,7 +1246,7 @@ void MifareCIdent(){
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r
 \r

-                       //\r
+//\r

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


@@ -1300,26 +1256,23 @@ void Mifare_DES_Auth1(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

-       clear_trace();\r

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

+       clear_trace();\r

 \r
        int len = iso14443a_select_card(uid, NULL, &cuid);\r
        if(!len) {\r
 \r
        int len = iso14443a_select_card(uid, NULL, &cuid);\r
        if(!len) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
-                       Dbprintf("Can't select card");\r
-               //OnError(1);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
+               OnError(1);\r

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

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

                return;\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
                return;\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r

-    \r

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


@@ -1335,14 +1288,12 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
        \r
        if( isOK) {\r
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
        \r
        if( isOK) {\r

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

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

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

 \r
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 \r
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r