Fix for USB uart slowness since PR #720 (#787)

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 3929561e1f1b09cc713ff2dcfb8353f6c02eb7af..5391e5f9af1c35f0bc2e8b44d600955610fa52c0 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -35,7 +35,7 @@ bool MfSniffInit(void){
        sniffSAK = 0;
        sniffUIDType = SNF_UID_4;
 
        sniffSAK = 0;
        sniffUIDType = SNF_UID_4;
 

-       return FALSE;
+       return false;

 }
 
 bool MfSniffEnd(void){
 }
 
 bool MfSniffEnd(void){


@@ -43,7 +43,7 @@ bool MfSniffEnd(void){
        cmd_send(CMD_ACK,0,0,0,0,0);
        LED_B_OFF();
 
        cmd_send(CMD_ACK,0,0,0,0,0);
        LED_B_OFF();
 

-       return FALSE;
+       return false;

 }
 
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
 }
 
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {


@@ -60,9 +60,16 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                                memset(sniffATQA, 0x00, 2);
                                sniffSAK = 0;
                                sniffState = SNF_ATQA;
                                memset(sniffATQA, 0x00, 2);
                                sniffSAK = 0;
                                sniffState = SNF_ATQA;

+                               if (data[0] == 0x40) 
+                                       sniffState = SNF_MAGIC_WUPC2;

                        }
                        break;
                }
                        }
                        break;
                }

+               case SNF_MAGIC_WUPC2:
+                       if ((len == 1) && (reader) && (data[0] == 0x43) ) {  
+                               sniffState = SNF_CARD_IDLE;
+                       }
+                       break;

                case SNF_ATQA:{
                        if ((!reader) && (len == 2)) {          // ATQA from tag
                                memcpy(sniffATQA, data, 2);
                case SNF_ATQA:{
                        if ((!reader) && (len == 2)) {          // ATQA from tag
                                memcpy(sniffATQA, data, 2);


@@ -71,22 +78,12 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                        break;
                }
                case SNF_UID1:{\r
                        break;
                }
                case SNF_UID1:{\r

-                       if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader
-                               sniffState = SNF_ANTICOL1;
-                       }\r
-                       \r

                        if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {   // Select 4 Byte UID from reader\r
                                memcpy(sniffUID + 3, &data[2], 4);\r
                                sniffState = SNF_SAK;\r
                        }\r
                        break;
                }\r
                        if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {   // Select 4 Byte UID from reader\r
                                memcpy(sniffUID + 3, &data[2], 4);\r
                                sniffState = SNF_SAK;\r
                        }\r
                        break;
                }\r

-               case SNF_ANTICOL1:{
-                       if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {  // UID from tag (CL1) 
-                               sniffState = SNF_UID1;
-                       }
-                       break;
-               }

                case SNF_SAK:{
                        if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { // SAK from card?
                                sniffSAK = data[0];
                case SNF_SAK:{
                        if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { // SAK from card?
                                sniffSAK = data[0];


@@ -100,17 +97,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                        }
                        break;
                }
                        }
                        break;
                }

-               case SNF_ANTICOL2:{
-                       if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID 
-                               sniffState = SNF_UID2;
-                       }
-                       break;
-               }

                case SNF_UID2:{\r
                case SNF_UID2:{\r

-                       if ((reader) && (len == 2) && (data[0] == 0x95) && (data[1] == 0x20)) {\r
-                               sniffState = SNF_ANTICOL2;\r
-                       }\r
-                       \r

                        if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {\r
                                memcpy(sniffUID + 3, &data[2], 4);\r
                                sniffState = SNF_SAK;\r
                        if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {\r
                                memcpy(sniffUID + 3, &data[2], 4);\r
                                sniffState = SNF_SAK;\r


@@ -125,11 +112,11 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                        sniffBuf[11] = sniffSAK;
                        sniffBuf[12] = 0xFF;
                        sniffBuf[13] = 0xFF;
                        sniffBuf[11] = sniffSAK;
                        sniffBuf[12] = 0xFF;
                        sniffBuf[13] = 0xFF;

-                       LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);
+                       LogTrace(sniffBuf, 14, 0, 0, NULL, true);

                        sniffState = SNF_CARD_CMD;
                }       // intentionally no break;
                case SNF_CARD_CMD:{     
                        sniffState = SNF_CARD_CMD;
                }       // intentionally no break;
                case SNF_CARD_CMD:{     

-                       LogTrace(data, len, 0, 0, NULL, reader);
+                       LogTrace(data, len, 0, 0, parity, reader);

                        timerData = GetTickCount();
                        break;
                }
                        timerData = GetTickCount();
                        break;
                }


@@ -140,14 +127,14 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
        }
 
 
        }
 
 

-       return FALSE;
+       return false;

 }
 
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
        if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {
                return intMfSniffSend();
        }
 }
 
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
        if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {
                return intMfSniffSend();
        }

-       return FALSE;
+       return false;

 }
 
 // internal sending function. not a RAMFUNC.
 }
 
 // internal sending function. not a RAMFUNC.


@@ -175,5 +162,5 @@ bool intMfSniffSend() {
 
        clear_trace();
        
 
        clear_trace();
        

-       return TRUE;
+       return true;

 }
 }