]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CHG: Refactored the HF MFU udump/ucdump commands into one method.
[proxmark3-svn] / armsrc / mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index fc480a38dc3289acbd892327d4b73a7405431b1e..d2497977df350e48940fb6de07ec1b823cebe19b 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -90,8 +90,8 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
        // variables\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
        // clear trace\r
@@ -116,18 +116,15 @@ void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
     \r
        LED_B_ON();\r
     cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r
-       LED_B_OFF();\r
          \r
-       // Thats it...\r
        LEDsoff();\r
 }\r
 void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
-       // params\r
+\r
        uint32_t cuid = arg0;\r
-       uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
-       // variables\r
+       uint8_t key[16] = {0x00};\r
        byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
+       byte_t dataoutbuf[16] = {0x00};\r
     \r
        memcpy(key, datain, 16);\r
     \r
@@ -138,11 +135,11 @@ void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
        if(mifare_ultra_auth2(cuid, key, dataoutbuf)){\r
            if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    \r
        }\r
-       isOK=1;\r
+       isOK = 1;\r
        if (MF_DBGLEVEL >= 2)   DbpString("AUTH 2 FINISHED");\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
@@ -156,8 +153,8 @@ void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
        \r
        // variables\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
        // clear trace\r
@@ -269,57 +266,62 @@ void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
 {\r
        // params\r
        uint8_t sectorNo = arg0;\r
-       int Pages=arg1;\r
-       int count_Pages=0;\r
-       // variables\r
-       byte_t isOK = 0;\r
-       byte_t dataoutbuf[176];\r
-       uint8_t uid[10];\r
+       int Pages = arg1;\r
+       int count_Pages = 0;\r
+       byte_t dataoutbuf[176] = {0x00};;\r
+       uint8_t uid[10] = {0x00};\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
-       Dbprintf("Pages %d",Pages);\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<Pages;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
-                    }else{\r
-                     count_Pages++;\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
-       Dbprintf("Pages read %d",count_Pages);\r
-       if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");\r
-\r
-        LED_B_ON();\r
-       if (Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);\r
-       if (Pages==44 && count_Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);\r
-       if (Pages==44 && count_Pages>16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,176);\r
-        LED_B_OFF();\r
+       \r
+       if (MF_DBGLEVEL >= MF_DBG_ALL) \r
+               Dbprintf("Pages %d",Pages);\r
+       \r
+       if (!iso14443a_select_card(uid, NULL, &cuid)) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                       Dbprintf("Can't select card");\r
+               OnError();\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
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                               Dbprintf("Read block %d error",i);\r
+                       OnError();\r
+                       return;\r
+               } else {\r
+                       count_Pages++;\r
+               }\r
+       }\r
+               \r
+       if (mifare_ultra_halt(cuid)) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                       Dbprintf("Halt error");\r
+               OnError();\r
+               return;\r
+       }\r
+       \r
+       if (MF_DBGLEVEL >= MF_DBG_ALL) {\r
+               Dbprintf("Pages read %d",count_Pages);\r
+               DbpString("Read card finished");\r
+       }\r
 \r
-       // Thats it...\r
+       int 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, dataoutbuf, len);\r
+       \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
-\r
 }\r
 \r
 \r
@@ -397,76 +399,65 @@ 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
-        // params\r
-        uint8_t blockNo = arg0;\r
-        byte_t blockdata[16];\r
+       // params\r
+       uint8_t blockNo = arg0;\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
-        uint32_t cuid;\r
+       memcpy(blockdata, datain, 16);\r
+       \r
+       // variables\r
+       byte_t isOK = 0;\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid;\r
 \r
-        // clear trace\r
-        iso14a_clear_trace();\r
+       iso14a_clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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
-\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
-        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\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
-        LED_B_ON();\r
-               cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-        LED_B_OFF();\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
+       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
-        // Thats it...\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\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
        // 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
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        LED_A_ON();\r
@@ -495,11 +486,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
@@ -1152,71 +1139,54 @@ void MifareCIdent(){
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
        // variables\r
        byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
-       uint8_t uid[10];\r
+       byte_t dataout[11] = {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
-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
-       \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
        };\r
 \r
-       if(mifare_desfire_des_auth1(cuid, dataoutbuf)){\r
-         if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");    \r
+       if(mifare_desfire_des_auth1(cuid, dataout)){\r
+         if (MF_DBGLEVEL >= 1) \r
+               Dbprintf("Authentication part1: Fail."); \r
        }\r
 \r
-       isOK=1;\r
-       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 1 FINISHED");\r
+       isOK = 1;\r
+       if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");\r
     \r
-       LED_B_ON();\r
-        cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r
-       LED_B_OFF();\r
-         \r
-       // Thats it...\r
-       //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+    cmd_send(CMD_ACK,isOK,cuid,0,dataout, sizeof(dataout));\r
 }\r
 \r
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r
-       // params\r
+\r
        uint32_t cuid = arg0;\r
-       uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
-       // variables\r
+       uint8_t key[16] = {0x00};\r
        byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
+       byte_t dataout[12] = {0x00};\r
     \r
        memcpy(key, datain, 16);\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
-\r
-//     Dbprintf("Sending %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r
-//              key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7],key[8],\r
-//              key[9],key[10],key[11],key[12],key[13],key[14],key[15]);\r
        \r
-       if(mifare_desfire_des_auth2(cuid, key, dataoutbuf)){\r
-           if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    \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
-       isOK=1;\r
-       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 2 FINISHED");\r
-    \r
-       LED_B_ON();\r
-        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,12);\r
-       LED_B_OFF();\r
-    \r
-    // Thats it...\r
+       else {\r
+           if (MF_DBGLEVEL >= 2) \r
+                       Dbprintf("Authentication part2: Failed");  \r
+               OnError();\r
+       }\r
+\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }
\ No newline at end of file
Proxmark3 GIT tracking
Impressum, Datenschutz