CHG: some magic generation1 tags is not following protocol and answers to the "halt...

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index f63d754d1a46a51e035338aeb2800b45e42a867a..e51ae18b9cc728d318fac9d147195c097930ba05 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -723,7 +723,6 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                dmax = davg + 2;\r
                \r
                LED_B_OFF();\r
-       \r
        }\r
 //  -------------------------------------------------------------------------------------------------  \r
        \r
@@ -815,6 +814,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -879,7 +879,8 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
-\r
+       set_tracing(FALSE);\r
+       \r
        // restore debug level\r
        MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
 }\r
@@ -946,7 +947,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        \r
        clear_trace();\r
-       set_tracing(false);\r
+       set_tracing(TRUE);\r
        \r
        bool isOK = true;\r
 \r
@@ -1002,6 +1003,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        \r
        if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
 \r
+       set_tracing(FALSE);\r
 }\r
 \r
 \r
@@ -1076,7 +1078,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r
                                break;\r
                        };\r
                };      \r
@@ -1112,7 +1114,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r
                                break;\r
                        };\r
                }\r
@@ -1128,6 +1130,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        if ((workFlags & 0x10) || (!isOK)) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LEDsoff();\r
+               set_tracing(FALSE);\r
        }\r
 }\r
 \r
@@ -1189,7 +1192,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r
                                break;\r
                        };\r
                }\r
@@ -1210,6 +1213,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        if ((workFlags & 0x10) || (!isOK)) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LEDsoff();\r
+               set_tracing(FALSE);\r
        }\r
 }\r
 \r
@@ -1235,9 +1239,8 @@ void MifareCIdent(){
                isOK = 0;\r
        };\r
 \r
-       if (mifare_classic_halt(NULL, 0)) {\r
-               isOK = 0;\r
-       };\r
+       // removed the if,  since some magic tags misbehavies and send an answer to it.\r
+       mifare_classic_halt(NULL, 0);\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r
@@ -1261,11 +1264,10 @@ void MifareCollectNonces(uint32_t arg0, uint32_t arg1){
        LED_B_OFF();\r
        LED_C_OFF();\r
        \r
-iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        clear_trace();\r
        set_tracing(TRUE);\r
-       \r
-       \r
+               \r
        for (int i = 0; i < iterations; i++) {\r
                                                \r
                WDT_HIT();\r
@@ -1308,6 +1310,7 @@ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        }\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 //\r