]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
CHG: moved some from THUMB to ARM.. Looks like usb communication became bad.
[proxmark3-svn] / armsrc / mifarecmd.c
index 93eea2122708a9666306191426486e4ec50b7cf0..c05ba6fd363b802c611f5be0fec4f819f7388a5f 100644 (file)
 //-----------------------------------------------------------------------------\r
 \r
 #include "mifarecmd.h"\r
-#include "apps.h"\r
-#include "util.h"\r
-#include "crc.h"\r
-#include "protocols.h"\r
-#include "parity.h"\r
 \r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
@@ -379,7 +374,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LED_C_OFF();\r
 \r
        while (true) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
@@ -403,14 +398,11 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
-       //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\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
-       LED_B_OFF();\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
@@ -613,7 +605,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
-#define AUTHENTICATION_TIMEOUT 848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
+#define AUTHENTICATION_TIMEOUT  848 //848                      // card times out 1ms after wrong authentication (according to NXP documentation)\r
 #define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication \r
 \r
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
@@ -644,14 +636,17 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        LED_A_ON();\r
        LED_C_OFF();\r
 \r
+       BigBuf_free(); BigBuf_Clear_ext(false); \r
+       clear_trace();\r
+       set_tracing(FALSE);\r
+       \r
        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-               clear_trace();\r
-               set_tracing(true);\r
        }\r
        \r
        LED_C_ON();\r
        \r
+       uint8_t dummy_answer = 0;       \r
        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r
@@ -702,7 +697,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                }\r
        \r
                // send a dummy byte as reader response in order to trigger the cards authentication timeout\r
-               uint8_t dummy_answer = 0;\r
                ReaderTransmit(&dummy_answer, 1, NULL);\r
                timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
                \r
@@ -711,7 +705,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        memcpy(buf+i, receivedAnswer, 4);\r
                        nt_par_enc = par_enc[0] & 0xf0;\r
                } else {\r
-                       nt_par_enc |= par_enc[0] >> 4;\r
+                       nt_par_enc |= par_enc[0]  >> 4;\r
                        memcpy(buf+i+4, receivedAnswer, 4);\r
                        memcpy(buf+i+8, &nt_par_enc, 1);\r
                        i += 9;\r
@@ -721,9 +715,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        }\r
 \r
        LED_C_OFF();\r
-       \r
-       crypto1_destroy(pcs);\r
-       \r
+       crypto1_destroy(pcs);   \r
        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
        LED_B_OFF();\r
@@ -1220,10 +1212,9 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
                                errormsg = MAGIC_UID;\r
-                               // break;\r
                        }\r
-                       \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
+                       break;\r
                }\r
        \r
                // wipe tag, fill it with zeros\r
@@ -1242,7 +1233,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                                break;\r
                        }\r
 \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
                }       \r
 \r
                // write block\r
@@ -1279,7 +1270,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                }       \r
        \r
                if (workFlags & MAGIC_OFF) \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
                \r
                isOK = true;\r
                break;\r
@@ -1428,7 +1419,6 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
 }\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 dataout[12] = {0x00};\r
Impressum, Datenschutz