Fixed auto nt bug

[proxmark3-svn] / armsrc / iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 7f82ad321431d9c57386ce383519939120be36ac..bae80b8e223c0f34d70ad98576b91fa9c3453e91 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1209,7 +1209,7 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
                        respsize = sizeof(response6);
                } else {
                        // Never seen this command before
-                       Dbprintf("Received unknown command (len=%d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                       Dbprintf("Received (len=%d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                        len,
                        receivedCmd[0], receivedCmd[1], receivedCmd[2],
                        receivedCmd[3], receivedCmd[4], receivedCmd[5],
@@ -1242,16 +1242,6 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
                if(respLen > 0) {
                        EmSendCmd14443aRaw(resp, respLen, receivedCmd[0] == 0x52);
                }
-                       
-               // After sending the response, print out some debug data.
-               if (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61) {
-                       Dbprintf("Authenticate request from reader: %02x %02x",receivedCmd[0],receivedCmd[1]);
-               } else if (receivedCmd[0] == 0xE0) {
-                       Dbprintf("RATS request from reader: %02x %02x",receivedCmd[0],receivedCmd[1]);
-               } else if (receivedCmd[0] == 0x30) {
-                       Dbprintf("READ request from reader: %02x %02x",receivedCmd[0],receivedCmd[1]);
-               }
-
                
                if (tracing) {
                        LogTrace(receivedCmd,len, 0, Uart.parityBits, TRUE);
@@ -1935,7 +1925,7 @@ void ReaderMifare(uint32_t parameter)
                {
                        if ( (parameter != 0) && (memcmp(nt, nt_noattack, 4) == 0) ) continue;
 
-                       isNULL = (nt_attacked[0] == 0) && (nt_attacked[1] == 0) && (nt_attacked[2] == 0) && (nt_attacked[3] == 0);
+                       isNULL = !(nt_attacked[0] == 0) && (nt_attacked[1] == 0) && (nt_attacked[2] == 0) && (nt_attacked[3] == 0);
                        if ( (isNULL != 0 ) && (memcmp(nt, nt_attacked, 4) != 0) ) continue;
 
                        if (nt_diff == 0)