SNF_WUPREQ and SNF_SAK harmonized)

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 08fb9f2302c194fbb059bb6031c519e44995dd12..3929561e1f1b09cc713ff2dcfb8353f6c02eb7af 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -59,25 +59,22 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                                memset(sniffUID, 0x00, 8);
                                memset(sniffATQA, 0x00, 2);
                                sniffSAK = 0;
-                               sniffState = SNF_WUPREQ;
+                               sniffState = SNF_ATQA;
                        }
                        break;
                }
-               case SNF_WUPREQ:{
+               case SNF_ATQA:{
                        if ((!reader) && (len == 2)) {          // ATQA from tag
                                memcpy(sniffATQA, data, 2);
-                               sniffState = SNF_ATQA;
+                               sniffState = SNF_UID1;
                        }
                        break;
                }
-               case SNF_ATQA:
                case SNF_UID1:{\r
-                       // SNF_ATQA\r
                        if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader
                                sniffState = SNF_ANTICOL1;
                        }\r
                        \r
-                       // SNF_UID1
                        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
@@ -86,7 +83,6 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                }\r
                case SNF_ANTICOL1:{
                        if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {  // UID from tag (CL1) 
-                               memcpy(sniffUID + 3, data, 4);
                                sniffState = SNF_UID1;
                        }
                        break;
@@ -106,7 +102,6 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
                }
                case SNF_ANTICOL2:{
                        if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID 
-                               memcpy(sniffUID + 3, data, 4);\r
                                sniffState = SNF_UID2;
                        }
                        break;