FIX: forgot to add the function in the header file.

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index a52ee4c91cde0b5ae6c3c1c43e1e67bbaeb1056c..2619a9763c1fc8f95dea093580b61716ce5a4f3a 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -15,6 +15,7 @@
 \r
 #include "mifarecmd.h"\r
 #include "apps.h"\r
 \r
 #include "mifarecmd.h"\r
 #include "apps.h"\r

+#include "util.h"\r

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


@@ -86,48 +87,40 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
 void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\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];\r
-       uint8_t uid[10];\r
+       byte_t dataout[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r

        uint32_t cuid;\r
     \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
+       iso14a_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


@@ -200,57 +193,70 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r

-\r
-void MifareUReadCard(uint8_t arg0, uint8_t *datain)\r
+void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r

 {\r
   // params\r
         uint8_t sectorNo = arg0;\r
 {\r
   // params\r
         uint8_t sectorNo = arg0;\r

-        \r
-        // variables\r
-        byte_t isOK = 0;\r
-        byte_t dataoutbuf[16 * 4];\r
-        uint8_t uid[10];\r
+       int Pages = arg1;\r
+       int count_Pages = 0;\r
+       byte_t dataout[176] = {0x00};;\r
+       uint8_t uid[10] = {0x00};\r

         uint32_t cuid;\r
 \r
         uint32_t cuid;\r
 \r

-        // clear trace\r
-        iso14a_clear_trace();\r
-\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
-                };\r
-               for(int sec=0;sec<16;sec++){\r
-                    if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {\r
-                    if (MF_DBGLEVEL >= 1)   Dbprintf("Read block %d error",sec);\r
-                        break;\r
-                    };\r
-                }\r
-                if(mifare_ultra_halt(cuid)) {\r
-                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                        break;\r
-                };\r
+       if (MF_DBGLEVEL >= MF_DBG_ALL) \r
+               Dbprintf("Pages %d",Pages);\r
+       \r
+       iso14a_clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

 \r
 \r

-                isOK = 1;\r
-                break;\r
-        }\r
-        \r
-        if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");\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
+               OnError(1);\r
+               return;\r
+       }\r
+       \r
+       for (int i = 0; i < Pages; 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
+                       OnError(2);\r
+                       return;\r
+               } else {\r
+                       count_Pages++;\r
+               }\r
+       }\r
+               \r
+       len = mifare_ultra_halt(cuid);\r
+       if (len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                       Dbprintf("Halt error");\r
+               OnError(3);\r
+               return;\r
+       }\r
+       \r
+       if (MF_DBGLEVEL >= MF_DBG_ALL) {\r
+               Dbprintf("Pages read %d", count_Pages);\r
+       }\r

 \r
 \r

-        LED_B_ON();\r
-               cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);\r
-        LED_B_OFF();\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

-        // Thats it...\r
+       cmd_send(CMD_ACK, 1, 0, 0, dataout, len);       \r

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

-\r

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


@@ -330,19 +336,16 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
 {\r
         // params\r
         uint8_t blockNo = arg0;\r
 {\r
         // params\r
         uint8_t blockNo = arg0;\r

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

 \r
 \r

-        memset(blockdata,'\0',16);\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];\r
+       uint8_t uid[10] = {0x00};\r

         uint32_t cuid;\r
 \r
         uint32_t cuid;\r
 \r

-        // clear trace\r

         iso14a_clear_trace();\r
         iso14a_clear_trace();\r

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


@@ -371,33 +374,25 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
         \r
         if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \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
-        // Thats it...\r

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

-//  iso14a_set_tracing(TRUE);\r

 }\r
 \r
 void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
 {\r
        // params\r
        uint8_t blockNo = arg0;\r
 }\r
 \r
 void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
 {\r
        // params\r
        uint8_t blockNo = arg0;\r

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

        \r
        memcpy(blockdata, datain,4);\r
 \r
        // variables\r
        byte_t isOK = 0;\r
        \r
        memcpy(blockdata, datain,4);\r
 \r
        // variables\r
        byte_t isOK = 0;\r

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

        uint32_t cuid;\r
 \r
        uint32_t cuid;\r
 \r

-       // clear trace\r

        iso14a_clear_trace();\r
        iso14a_clear_trace();\r

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


@@ -426,11 +421,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \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
-       // Thats it...\r

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