-//-----------------------------------------------------------------------------\r
-// Merlok - 2012\r
-//\r
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
-// at your option, any later version. See the LICENSE.txt file for the text of\r
-// the license.\r
-//-----------------------------------------------------------------------------\r
-// Routines to support mifare classic sniffer.\r
-//-----------------------------------------------------------------------------\r
-\r
-#include "mifaresniff.h"\r
-#include "apps.h"\r
-\r
-static int sniffState = SNF_INIT;\r
-static uint8_t sniffUIDType;\r
-static uint8_t sniffUID[8];\r
-static uint8_t sniffATQA[2];\r
-static uint8_t sniffSAK;\r
-static uint8_t sniffBuf[16];\r
-static int timerData = 0;\r
-\r
-\r
-int MfSniffInit(void){\r
- rsamples = 0;\r
- memset(sniffUID, 0x00, 8);\r
- memset(sniffATQA, 0x00, 2);\r
- sniffSAK = 0;\r
- sniffUIDType = SNF_UID_4;\r
-\r
- return 0;\r
-}\r
-\r
-int MfSniffEnd(void){\r
-// UsbCommand ack = {CMD_ACK, {0, 0, 0}};\r
-\r
- LED_B_ON();\r
- cmd_send(CMD_ACK,0,0,0,0,0);\r
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
- LED_B_OFF();\r
-\r
- return 0;\r
-}\r
-\r
-int RAMFUNC MfSniffLogic(const uint8_t * data, int len, uint32_t parity, int bitCnt, int reader) {\r
-\r
- if ((len == 1) && (bitCnt = 9) && (data[0] > 0x0F)) { \r
- sniffState = SNF_INIT;\r
- }\r
-\r
- switch (sniffState) {\r
- case SNF_INIT:{\r
- if ((reader) && (len == 1) && (bitCnt == 9) && ((data[0] == 0x26) || (data[0] == 0x52))) { \r
- sniffUIDType = SNF_UID_4;\r
- memset(sniffUID, 0x00, 8);\r
- memset(sniffATQA, 0x00, 2);\r
- sniffSAK = 0;\r
-\r
- sniffState = SNF_WUPREQ;\r
- }\r
- break;\r
- }\r
- case SNF_WUPREQ:{\r
- if ((!reader) && (len == 2)) { \r
- memcpy(sniffATQA, data, 2);\r
-\r
- sniffState = SNF_ATQA;\r
- }\r
- break;\r
- }\r
- case SNF_ATQA:{\r
- if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { \r
- sniffState = SNF_ANTICOL1;\r
- }\r
- break;\r
- }\r
- case SNF_ANTICOL1:{\r
- if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { \r
- memcpy(sniffUID + 3, data, 4);\r
- \r
- sniffState = SNF_UID1;\r
- }\r
- break;\r
- }\r
+//-----------------------------------------------------------------------------
+// Merlok - 2012
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support mifare classic sniffer.
+//-----------------------------------------------------------------------------
+
+#include "mifaresniff.h"
+#include "apps.h"
+#include "proxmark3.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1/crapto1.h"
+#include "mifareutil.h"
+#include "common.h"
+
+
+static int sniffState = SNF_INIT;
+static uint8_t sniffUIDType;
+static uint8_t sniffUID[8] = {0x00};
+static uint8_t sniffATQA[2] = {0x00};
+static uint8_t sniffSAK;
+static uint8_t sniffBuf[16] = {0x00};
+static uint32_t timerData = 0;
+
+
+bool MfSniffInit(void){
+ memset(sniffUID, 0x00, 8);
+ memset(sniffATQA, 0x00, 2);
+ sniffSAK = 0;
+ sniffUIDType = SNF_UID_4;
+
+ return false;
+}
+
+bool MfSniffEnd(void){
+ LED_B_ON();
+ cmd_send(CMD_ACK,0,0,0,0,0);
+ LED_B_OFF();
+
+ return false;
+}
+
+bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
+
+ if (reader && (len == 1) && (bitCnt == 7)) { // reset on 7-Bit commands from reader
+ sniffState = SNF_INIT;
+ }
+
+ switch (sniffState) {
+ case SNF_INIT:{
+ if ((len == 1) && (reader) && (bitCnt == 7) ) { // REQA or WUPA from reader
+ sniffUIDType = SNF_UID_4;
+ memset(sniffUID, 0x00, 8);
+ memset(sniffATQA, 0x00, 2);
+ sniffSAK = 0;
+ sniffState = SNF_ATQA;
+ if (data[0] == 0x40)
+ sniffState = SNF_MAGIC_WUPC2;
+ }
+ 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);
+ sniffState = SNF_UID1;
+ }
+ break;
+ }