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 8541553ba28b0386aa4d22aae49f771301d09813..94bc1c1c545d7a34d1576721427f9f669e282614 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -15,6 +15,9 @@
 \r
 #include "mifarecmd.h"\r
 #include "apps.h"\r
+#include "util.h"\r
+\r
+#include "crc.h"\r
 \r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
@@ -38,7 +41,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        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
@@ -79,55 +82,111 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r
-       // Thats it...\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
-       \r
-       // variables\r
+\r
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
+\r
        byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
-       uint8_t uid[10];\r
+       byte_t dataoutbuf[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
+\r
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
     \r
-       // clear trace\r
-       iso14a_clear_trace();\r
+       clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       if(!iso14443a_select_card(uid, NULL, &cuid)) {\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
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Authentication part1: Fail.");\r
+               //OnError(1);\r
+               return;\r
+       }\r
+\r
+       isOK = 1;\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
+               DbpString("AUTH 1 FINISHED");\r
+    \r
+    cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r
+       LEDsoff();\r
+}\r
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
+\r
+       uint32_t cuid = arg0;\r
+       uint8_t key[16] = {0x00};\r
+       byte_t isOK = 0;\r
+       byte_t dataoutbuf[16] = {0x00};\r
+    \r
+       memcpy(key, datain, 16);\r
     \r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
+       \r
+       if(mifare_ultra_auth2(cuid, key, dataoutbuf)){\r
+           if (MF_DBGLEVEL >= MF_DBG_ERROR) \r
+                       Dbprintf("Authentication part2: Fail...");\r
+               //OnError(1);\r
+               return;                 \r
+       }\r
+       \r
+       isOK = 1;\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
+               DbpString("AUTH 2 FINISHED");\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
+       cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
+}\r
+\r
+void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r
+{\r
+       uint8_t blockNo = arg0;\r
+       byte_t dataout[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid;\r
+    \r
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
+    \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
-               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
-               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
-               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
@@ -154,7 +213,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        pcs = &mpcs;\r
 \r
        // clear trace\r
-       iso14a_clear_trace();\r
+       clear_trace();\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
@@ -200,58 +259,70 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        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
-        // variables\r
-        byte_t isOK = 0;\r
-        byte_t dataoutbuf[16 * 4];\r
-        uint8_t uid[10];\r
-        uint32_t cuid;\r
-\r
-        // clear trace\r
-        iso14a_clear_trace();\r
-//      iso14a_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
+       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
-        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
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
 \r
-                isOK = 1;\r
-                break;\r
-        }\r
-        \r
-        if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");\r
+       if (MF_DBGLEVEL >= MF_DBG_ALL) \r
+               Dbprintf("Pages %d",Pages);\r
+       \r
+       clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-        LED_B_ON();\r
-               cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);\r
-        LED_B_OFF();\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
-        // Thats it...\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
+       len = 16*4; //64 bytes\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, dataout, len);       \r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
 }\r
 \r
 \r
@@ -279,7 +350,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        pcs = &mpcs;\r
 \r
        // clear trace\r
-       iso14a_clear_trace();\r
+       clear_trace();\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
@@ -331,19 +402,16 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
 {\r
         // params\r
         uint8_t blockNo = arg0;\r
-        byte_t blockdata[16];\r
+       byte_t blockdata[16] = {0x00};\r
 \r
-        memset(blockdata,'\0',16);\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
-        // clear trace\r
-        iso14a_clear_trace();\r
-\r
+               clear_trace();\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
         LED_A_ON();\r
@@ -372,33 +440,25 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
         \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
-        LED_B_OFF();\r
-\r
-\r
-        // Thats it...\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
-       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
-       uint8_t uid[10];\r
+       uint8_t uid[10] = {0x00};\r
        uint32_t cuid;\r
 \r
-       // clear trace\r
-       iso14a_clear_trace();\r
-\r
+       clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        LED_A_ON();\r
@@ -427,11 +487,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
 \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
-       LED_B_OFF();\r
-\r
-       // Thats it...\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
@@ -473,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
-       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
+       // free eventually allocated BigBuf memory\r
+       BigBuf_free();\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
@@ -651,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
-       iso14a_set_tracing(TRUE);\r
+       set_tracing(TRUE);\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -680,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
-       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
@@ -771,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
-       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
@@ -864,8 +922,8 @@ 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 *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
        // reset FPGA and LED\r
        if (workFlags & 0x08) {\r
@@ -873,8 +931,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_B_OFF();\r
                LED_C_OFF();\r
        \r
-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
+               clear_trace();\r
+               set_tracing(TRUE);\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r
@@ -884,12 +942,12 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                if (workFlags & 0x01) {\r
                        if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                               break;\r
+                               //break;\r
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
+                               //break;\r
                        };\r
                };\r
        \r
@@ -983,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* 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
-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
+               clear_trace();\r
+               set_tracing(TRUE);\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        }\r
 \r
@@ -1048,8 +1106,8 @@ void MifareCIdent(){
        // 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
@@ -1071,3 +1129,58 @@ void MifareCIdent(){
                        //\r
 // DESFIRE\r
 //\r
+\r
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
+\r
+       byte_t dataout[11] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid;\r
+    \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)        \r
+                       Dbprintf("Can't select card");\r
+               //OnError(1);\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
+               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
+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 isOK = 0;\r
+       byte_t dataout[12] = {0x00};\r
+    \r
+       memcpy(key, datain, 16);\r
+       \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
+               return;\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
+}\r