fix client/Makefile

[proxmark3-svn] / armsrc / iso14443a.c
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c

index 103f25e691cfa6106cfabe7ffd47ced9e29720d9..70dc54f17a39495cb8e374807015c3f2ce53aa63 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -15,15 +15,15 @@
  #include "util.h"
  #include "string.h"
  #include "cmd.h"
  #include "util.h"
  #include "string.h"
  #include "cmd.h"
-
  #include "iso14443crc.h"
  #include "iso14443a.h"
  #include "crapto1.h"
  #include "mifareutil.h"
  #include "iso14443crc.h"
  #include "iso14443a.h"
  #include "crapto1.h"
  #include "mifareutil.h"
+#include "BigBuf.h"
+#include "protocols.h"
  
  static uint32_t iso14a_timeout;
  int rsamples = 0;
  
  static uint32_t iso14a_timeout;
  int rsamples = 0;
-int tracing = TRUE;
  uint8_t trigger = 0;
  // the block number for the ISO14443-4 PCB
  static uint8_t iso14_pcb_blocknum = 0;
  uint8_t trigger = 0;
  // the block number for the ISO14443-4 PCB
  static uint8_t iso14_pcb_blocknum = 0;
@@ -142,25 +142,40 @@ const uint8_t OddByteParity[256] = {
    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
  };
  
    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
  };
  
+
  void iso14a_set_trigger(bool enable) {
         trigger = enable;
  }
  
  void iso14a_set_trigger(bool enable) {
         trigger = enable;
  }
  
-void iso14a_clear_trace() {
-       uint8_t *trace = BigBuf_get_addr();
-       uint16_t max_traceLen = BigBuf_max_traceLen();
-       memset(trace, 0x44, max_traceLen);
-       traceLen = 0;
-}
-
-void iso14a_set_tracing(bool enable) {
-       tracing = enable;
-}
  
  void iso14a_set_timeout(uint32_t timeout) {
         iso14a_timeout = timeout;
  
  void iso14a_set_timeout(uint32_t timeout) {
         iso14a_timeout = timeout;
+       if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443A Timeout set to %ld (%dms)", iso14a_timeout, iso14a_timeout / 106);
+}
+
+
+void iso14a_set_ATS_timeout(uint8_t *ats) {
+
+       uint8_t tb1;
+       uint8_t fwi; 
+       uint32_t fwt;
+       
+       if (ats[0] > 1) {                                                       // there is a format byte T0
+               if ((ats[1] & 0x20) == 0x20) {                  // there is an interface byte TB(1)
+                       if ((ats[1] & 0x10) == 0x10) {          // there is an interface byte TA(1) preceding TB(1)
+                               tb1 = ats[3];
+                       } else {
+                               tb1 = ats[2];
+                       }
+                       fwi = (tb1 & 0xf0) >> 4;                        // frame waiting indicator (FWI)
+                       fwt = 256 * 16 * (1 << fwi);            // frame waiting time (FWT) in 1/fc
+                       
+                       iso14a_set_timeout(fwt/(8*16));
+               }
+       }
  }
  
  }
  
+
  //-----------------------------------------------------------------------------
  // Generate the parity value for a byte sequence
  //
  //-----------------------------------------------------------------------------
  // Generate the parity value for a byte sequence
  //
@@ -199,63 +214,12 @@ void AppendCrc14443a(uint8_t* data, int len)
         ComputeCrc14443(CRC_14443_A,data,len,data+len,data+len+1);
  }
  
         ComputeCrc14443(CRC_14443_A,data,len,data+len,data+len+1);
  }
  
-// The function LogTrace() is also used by the iClass implementation in iClass.c
-bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
+void AppendCrc14443b(uint8_t* data, int len)
  {
  {
-       if (!tracing) return FALSE;
-       
-       uint8_t *trace = BigBuf_get_addr();
-       uint16_t num_paritybytes = (iLen-1)/8 + 1;      // number of valid paritybytes in *parity
-       uint16_t duration = timestamp_end - timestamp_start;
-
-       // Return when trace is full
-       uint16_t max_traceLen = BigBuf_max_traceLen();
-       if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= max_traceLen) {
-               tracing = FALSE;        // don't trace any more
-               return FALSE;
-       }
-       
-       // Traceformat:
-       // 32 bits timestamp (little endian)
-       // 16 bits duration (little endian)
-       // 16 bits data length (little endian, Highest Bit used as readerToTag flag)
-       // y Bytes data
-       // x Bytes parity (one byte per 8 bytes data)
-       
-       // timestamp (start)
-       trace[traceLen++] = ((timestamp_start >> 0) & 0xff);
-       trace[traceLen++] = ((timestamp_start >> 8) & 0xff);
-       trace[traceLen++] = ((timestamp_start >> 16) & 0xff);
-       trace[traceLen++] = ((timestamp_start >> 24) & 0xff);
-       
-       // duration
-       trace[traceLen++] = ((duration >> 0) & 0xff);
-       trace[traceLen++] = ((duration >> 8) & 0xff);
-
-       // data length
-       trace[traceLen++] = ((iLen >> 0) & 0xff);
-       trace[traceLen++] = ((iLen >> 8) & 0xff);
-
-       // readerToTag flag
-       if (!readerToTag) {
-               trace[traceLen - 1] |= 0x80;
-       }
-
-       // data bytes
-       if (btBytes != NULL && iLen != 0) {
-               memcpy(trace + traceLen, btBytes, iLen);
-       }
-       traceLen += iLen;
-
-       // parity bytes
-       if (parity != NULL && iLen != 0) {
-               memcpy(trace + traceLen, parity, num_paritybytes);
-       }
-       traceLen += num_paritybytes;
-
-       return TRUE;
+       ComputeCrc14443(CRC_14443_B,data,len,data+len,data+len+1);
  }
  
  }
  
+
  //=============================================================================
  // ISO 14443 Type A - Miller decoder
  //=============================================================================
  //=============================================================================
  // ISO 14443 Type A - Miller decoder
  //=============================================================================
@@ -275,13 +239,17 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
  static tUart Uart;
  
  // Lookup-Table to decide if 4 raw bits are a modulation.
  static tUart Uart;
  
  // Lookup-Table to decide if 4 raw bits are a modulation.
-// We accept two or three consecutive "0" in any position with the rest "1"
+// We accept the following:
+// 0001  -   a 3 tick wide pause
+// 0011  -   a 2 tick wide pause, or a three tick wide pause shifted left
+// 0111  -   a 2 tick wide pause shifted left
+// 1001  -   a 2 tick wide pause shifted right
  const bool Mod_Miller_LUT[] = {
  const bool Mod_Miller_LUT[] = {
-       TRUE,  TRUE,  FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE,
-       TRUE,  TRUE,  FALSE, FALSE, TRUE,  FALSE, FALSE, FALSE
+       FALSE,  TRUE, FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,
+       FALSE,  TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE
  };
  };
-#define IsMillerModulationNibble1(b) (Mod_Miller_LUT[(b & 0x00F0) >> 4])
-#define IsMillerModulationNibble2(b) (Mod_Miller_LUT[(b & 0x000F)])
+#define IsMillerModulationNibble1(b) (Mod_Miller_LUT[(b & 0x000000F0) >> 4])
+#define IsMillerModulationNibble2(b) (Mod_Miller_LUT[(b & 0x0000000F)])
  
  void UartReset()
  {
  
  void UartReset()
  {
@@ -291,8 +259,6 @@ void UartReset()
         Uart.parityLen = 0;                                     // number of decoded parity bytes
         Uart.shiftReg = 0;                                      // shiftreg to hold decoded data bits
         Uart.parityBits = 0;                            // holds 8 parity bits
         Uart.parityLen = 0;                                     // number of decoded parity bytes
         Uart.shiftReg = 0;                                      // shiftreg to hold decoded data bits
         Uart.parityBits = 0;                            // holds 8 parity bits
-       Uart.twoBits = 0x0000;                          // buffer for 2 Bits
-       Uart.highCnt = 0;
         Uart.startTime = 0;
         Uart.endTime = 0;
  }
         Uart.startTime = 0;
         Uart.endTime = 0;
  }
@@ -301,6 +267,7 @@ void UartInit(uint8_t *data, uint8_t *parity)
  {
         Uart.output = data;
         Uart.parity = parity;
  {
         Uart.output = data;
         Uart.parity = parity;
+       Uart.fourBits = 0x00000000;                     // clear the buffer for 4 Bits
         UartReset();
  }
  
         UartReset();
  }
  
@@ -308,40 +275,37 @@ void UartInit(uint8_t *data, uint8_t *parity)
  static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
  {
  
  static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
  {
  
-       Uart.twoBits = (Uart.twoBits << 8) | bit;
+       Uart.fourBits = (Uart.fourBits << 8) | bit;
         
         if (Uart.state == STATE_UNSYNCD) {                                                                                      // not yet synced
         
         
         if (Uart.state == STATE_UNSYNCD) {                                                                                      // not yet synced
         
-               if (Uart.highCnt < 2) {                                                                                                 // wait for a stable unmodulated signal
-                       if (Uart.twoBits == 0xffff) {
-                               Uart.highCnt++;
-                       } else {
-                               Uart.highCnt = 0;
-                       }
-               } else {        
-                       Uart.syncBit = 0xFFFF;                                                                                          // not set
-                                                                                                                                                               // we look for a ...1111111100x11111xxxxxx pattern (the start bit)
-                       if              ((Uart.twoBits & 0xDF00) == 0x1F00) Uart.syncBit = 8;           // mask is   11x11111 xxxxxxxx, 
-                                                                                                                                                               // check for 00x11111 xxxxxxxx
-                       else if ((Uart.twoBits & 0xEF80) == 0x8F80) Uart.syncBit = 7;           // both masks shifted right one bit, left padded with '1'
-                       else if ((Uart.twoBits & 0xF7C0) == 0xC7C0) Uart.syncBit = 6;           // ...
-                       else if ((Uart.twoBits & 0xFBE0) == 0xE3E0) Uart.syncBit = 5;
-                       else if ((Uart.twoBits & 0xFDF0) == 0xF1F0) Uart.syncBit = 4;
-                       else if ((Uart.twoBits & 0xFEF8) == 0xF8F8) Uart.syncBit = 3;
-                       else if ((Uart.twoBits & 0xFF7C) == 0xFC7C) Uart.syncBit = 2;
-                       else if ((Uart.twoBits & 0xFFBE) == 0xFE3E) Uart.syncBit = 1;
-                       if (Uart.syncBit != 0xFFFF) {                                                                           // found a sync bit
-                               Uart.startTime = non_real_time?non_real_time:(GetCountSspClk() & 0xfffffff8);
-                               Uart.startTime -= Uart.syncBit;
-                               Uart.endTime = Uart.startTime;
-                               Uart.state = STATE_START_OF_COMMUNICATION;
-                       }
+               Uart.syncBit = 9999;                                                                                                    // not set
+               // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
+               // Sequence X followed by Sequence Y followed by Sequence Z (111100x1 11111111 00x11111)
+               // we therefore look for a ...xx11111111111100x11111xxxxxx... pattern 
+               // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
+               #define ISO14443A_STARTBIT_MASK         0x07FFEF80                                                      // mask is    00000111 11111111 11101111 10000000
+               #define ISO14443A_STARTBIT_PATTERN      0x07FF8F80                                                      // pattern is 00000111 11111111 10001111 10000000
+               if              ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 0)) == ISO14443A_STARTBIT_PATTERN >> 0) Uart.syncBit = 7;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 1)) == ISO14443A_STARTBIT_PATTERN >> 1) Uart.syncBit = 6;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 2)) == ISO14443A_STARTBIT_PATTERN >> 2) Uart.syncBit = 5;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 3)) == ISO14443A_STARTBIT_PATTERN >> 3) Uart.syncBit = 4;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 4)) == ISO14443A_STARTBIT_PATTERN >> 4) Uart.syncBit = 3;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 5)) == ISO14443A_STARTBIT_PATTERN >> 5) Uart.syncBit = 2;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 6)) == ISO14443A_STARTBIT_PATTERN >> 6) Uart.syncBit = 1;
+               else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 7)) == ISO14443A_STARTBIT_PATTERN >> 7) Uart.syncBit = 0;
+
+               if (Uart.syncBit != 9999) {                                                                                             // found a sync bit
+                       Uart.startTime = non_real_time?non_real_time:(GetCountSspClk() & 0xfffffff8);
+                       Uart.startTime -= Uart.syncBit;
+                       Uart.endTime = Uart.startTime;
+                       Uart.state = STATE_START_OF_COMMUNICATION;
                 }
  
         } else {
  
                 }
  
         } else {
  
-               if (IsMillerModulationNibble1(Uart.twoBits >> Uart.syncBit)) {                  
-                       if (IsMillerModulationNibble2(Uart.twoBits >> Uart.syncBit)) {          // Modulation in both halves - error
+               if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {                 
+                       if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {         // Modulation in both halves - error
                                 UartReset();
                         } else {                                                                                                                        // Modulation in first half = Sequence Z = logic "0"
                                 if (Uart.state == STATE_MILLER_X) {                                                             // error - must not follow after X
                                 UartReset();
                         } else {                                                                                                                        // Modulation in first half = Sequence Z = logic "0"
                                 if (Uart.state == STATE_MILLER_X) {                                                             // error - must not follow after X
@@ -365,7 +329,7 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
                                 }
                         }
                 } else {
                                 }
                         }
                 } else {
-                       if (IsMillerModulationNibble2(Uart.twoBits >> Uart.syncBit)) {          // Modulation second half = Sequence X = logic "1"
+                       if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {         // Modulation second half = Sequence X = logic "1"
                                 Uart.bitCount++;
                                 Uart.shiftReg = (Uart.shiftReg >> 1) | 0x100;                                   // add a 1 to the shiftreg
                                 Uart.state = STATE_MILLER_X;
                                 Uart.bitCount++;
                                 Uart.shiftReg = (Uart.shiftReg >> 1) | 0x100;                                   // add a 1 to the shiftreg
                                 Uart.state = STATE_MILLER_X;
@@ -401,12 +365,10 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
                                                 return TRUE;                                                                                    // we are finished with decoding the raw data sequence
                                         } else {
                                                 UartReset();                                                                                    // Nothing received - start over
                                                 return TRUE;                                                                                    // we are finished with decoding the raw data sequence
                                         } else {
                                                 UartReset();                                                                                    // Nothing received - start over
-                                               Uart.highCnt = 1;
                                         }
                                 }
                                 if (Uart.state == STATE_START_OF_COMMUNICATION) {                               // error - must not follow directly after SOC
                                         UartReset();
                                         }
                                 }
                                 if (Uart.state == STATE_START_OF_COMMUNICATION) {                               // error - must not follow directly after SOC
                                         UartReset();
-                                       Uart.highCnt = 1;
                                 } else {                                                                                                                // a logic "0"
                                         Uart.bitCount++;
                                         Uart.shiftReg = (Uart.shiftReg >> 1);                                           // add a 0 to the shiftreg
                                 } else {                                                                                                                // a logic "0"
                                         Uart.bitCount++;
                                         Uart.shiftReg = (Uart.shiftReg >> 1);                                           // add a 0 to the shiftreg
@@ -594,12 +556,8 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
         
         LEDsoff();
  
         
         LEDsoff();
  
-       // We won't start recording the frames that we acquire until we trigger;
-       // a good trigger condition to get started is probably when we see a
-       // response from the tag.
-       // triggered == FALSE -- to wait first for card
-       bool triggered = !(param & 0x03); 
-       
+       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+
         // Allocate memory from BigBuf for some buffers
         // free all previous allocations first
         BigBuf_free();
         // Allocate memory from BigBuf for some buffers
         // free all previous allocations first
         BigBuf_free();
@@ -616,8 +574,8 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
         uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
  
         // init trace buffer
         uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
  
         // init trace buffer
-       iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       clear_trace();
+       set_tracing(TRUE);
  
         uint8_t *data = dmaBuf;
         uint8_t previous_data = 0;
  
         uint8_t *data = dmaBuf;
         uint8_t previous_data = 0;
@@ -626,8 +584,6 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
         bool TagIsActive = FALSE;
         bool ReaderIsActive = FALSE;
         
         bool TagIsActive = FALSE;
         bool ReaderIsActive = FALSE;
         
-       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-
         // Set up the demodulator for tag -> reader responses.
         DemodInit(receivedResponse, receivedResponsePar);
         
         // Set up the demodulator for tag -> reader responses.
         DemodInit(receivedResponse, receivedResponsePar);
         
@@ -637,6 +593,12 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
         // Setup and start DMA.
         FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
         
         // Setup and start DMA.
         FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
         
+       // We won't start recording the frames that we acquire until we trigger;
+       // a good trigger condition to get started is probably when we see a
+       // response from the tag.
+       // triggered == FALSE -- to wait first for card
+       bool triggered = !(param & 0x03); 
+       
         // And now we loop, receiving samples.
         for(uint32_t rsamples = 0; TRUE; ) {
  
         // And now we loop, receiving samples.
         for(uint32_t rsamples = 0; TRUE; ) {
  
@@ -723,6 +685,9 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
  
                                         // And ready to receive another response.
                                         DemodReset();
  
                                         // And ready to receive another response.
                                         DemodReset();
+                                       // And reset the Miller decoder including itS (now outdated) input buffer
+                                       UartInit(receivedCmd, receivedCmdPar);
+
                                         LED_C_OFF();
                                 } 
                                 TagIsActive = (Demod.state != DEMOD_UNSYNCD);
                                         LED_C_OFF();
                                 } 
                                 TagIsActive = (Demod.state != DEMOD_UNSYNCD);
@@ -741,7 +706,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
  
         FpgaDisableSscDma();
         Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
  
         FpgaDisableSscDma();
         Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
-       Dbprintf("traceLen=%d, Uart.output[0]=%08x", traceLen, (uint32_t)Uart.output[0]);
+       Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
         LEDsoff();
  }
  
         LEDsoff();
  }
  
@@ -1069,6 +1034,9 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data)
                 .modulation_n = 0
         };
    
                 .modulation_n = 0
         };
    
+       // We need to listen to the high-frequency, peak-detected path.
+       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+
         BigBuf_free_keep_EM();
  
         // allocate buffers:
         BigBuf_free_keep_EM();
  
         // allocate buffers:
@@ -1077,8 +1045,8 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data)
         free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
  
         // clear trace
         free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
  
         // clear trace
-    iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       clear_trace();
+       set_tracing(TRUE);
  
         // Prepare the responses of the anticollision phase
         // there will be not enough time to do this at the moment the reader sends it REQA
  
         // Prepare the responses of the anticollision phase
         // there will be not enough time to do this at the moment the reader sends it REQA
@@ -1097,16 +1065,12 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data)
         int happened2 = 0;
         int cmdsRecvd = 0;
  
         int happened2 = 0;
         int cmdsRecvd = 0;
  
-       // We need to listen to the high-frequency, peak-detected path.
-       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-
         cmdsRecvd = 0;
         tag_response_info_t* p_response;
  
         LED_A_ON();
         for(;;) {
                 // Clean receive command buffer
         cmdsRecvd = 0;
         tag_response_info_t* p_response;
  
         LED_A_ON();
         for(;;) {
                 // Clean receive command buffer
-               
                 if(!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
                         DbpString("Button press");
                         break;
                 if(!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
                         DbpString("Button press");
                         break;
@@ -1380,7 +1344,7 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
                 }
  
                 // Only transmit parity bit if we transmitted a complete byte
                 }
  
                 // Only transmit parity bit if we transmitted a complete byte
-               if (j == 8) {
+               if (j == 8 && parity != NULL) {
                         // Get the parity bit
                         if (parity[i>>3] & (0x80 >> (i&0x0007))) {
                                 // Sequence X
                         // Get the parity bit
                         if (parity[i>>3] & (0x80 >> (i&0x0007))) {
                                 // Sequence X
@@ -1667,13 +1631,14 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
                         if(ManchesterDecoding(b, offset, 0)) {
                                 NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
                                 return TRUE;
                         if(ManchesterDecoding(b, offset, 0)) {
                                 NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
                                 return TRUE;
-                       } else if (c++ > iso14a_timeout) {
+                       } else if (c++ > iso14a_timeout && Demod.state == DEMOD_UNSYNCD) {
                                 return FALSE; 
                         }
                 }
         }
  }
  
                                 return FALSE; 
                         }
                 }
         }
  }
  
+
  void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t *timing)
  {
         CodeIso14443aBitsAsReaderPar(frame, bits, par);
  void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t *timing)
  {
         CodeIso14443aBitsAsReaderPar(frame, bits, par);
@@ -1689,11 +1654,13 @@ void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t
         }
  }
  
         }
  }
  
+
  void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *timing)
  {
    ReaderTransmitBitsPar(frame, len*8, par, timing);
  }
  
  void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *timing)
  {
    ReaderTransmitBitsPar(frame, len*8, par, timing);
  }
  
+
  void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing)
  {
    // Generate parity and redirect
  void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing)
  {
    // Generate parity and redirect
@@ -1702,6 +1669,7 @@ void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing)
    ReaderTransmitBitsPar(frame, len, par, timing);
  }
  
    ReaderTransmitBitsPar(frame, len, par, timing);
  }
  
+
  void ReaderTransmit(uint8_t* frame, uint16_t len, uint32_t *timing)
  {
    // Generate parity and redirect
  void ReaderTransmit(uint8_t* frame, uint16_t len, uint32_t *timing)
  {
    // Generate parity and redirect
@@ -1762,6 +1730,11 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u
                 memset(uid_ptr,0,10);
         }
  
                 memset(uid_ptr,0,10);
         }
  
+       // check for proprietary anticollision:
+       if ((resp[0] & 0x1F) == 0) {
+               return 3;
+       }
+       
         // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
         // which case we need to make a cascade 2 request and select - this is a long UID
         // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
         // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
         // which case we need to make a cascade 2 request and select - this is a long UID
         // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
@@ -1865,6 +1838,10 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u
  
         // reset the PCB block number
         iso14_pcb_blocknum = 0;
  
         // reset the PCB block number
         iso14_pcb_blocknum = 0;
+
+       // set default timeout based on ATS
+       iso14a_set_ATS_timeout(resp);
+
         return 1;       
  }
  
         return 1;       
  }
  
@@ -1929,17 +1906,18 @@ void ReaderIso14443a(UsbCommand *c)
  {
         iso14a_command_t param = c->arg[0];
         uint8_t *cmd = c->d.asBytes;
  {
         iso14a_command_t param = c->arg[0];
         uint8_t *cmd = c->d.asBytes;
-       size_t len = c->arg[1];
-       size_t lenbits = c->arg[2];
+       size_t len = c->arg[1] & 0xffff;
+       size_t lenbits = c->arg[1] >> 16;
+       uint32_t timeout = c->arg[2];
         uint32_t arg0 = 0;
         byte_t buf[USB_CMD_DATA_SIZE];
         uint8_t par[MAX_PARITY_SIZE];
    
         if(param & ISO14A_CONNECT) {
         uint32_t arg0 = 0;
         byte_t buf[USB_CMD_DATA_SIZE];
         uint8_t par[MAX_PARITY_SIZE];
    
         if(param & ISO14A_CONNECT) {
-               iso14a_clear_trace();
+               clear_trace();
         }
  
         }
  
-       iso14a_set_tracing(TRUE);
+       set_tracing(TRUE);
  
         if(param & ISO14A_REQUEST_TRIGGER) {
                 iso14a_set_trigger(TRUE);
  
         if(param & ISO14A_REQUEST_TRIGGER) {
                 iso14a_set_trigger(TRUE);
@@ -1955,7 +1933,7 @@ void ReaderIso14443a(UsbCommand *c)
         }
  
         if(param & ISO14A_SET_TIMEOUT) {
         }
  
         if(param & ISO14A_SET_TIMEOUT) {
-               iso14a_set_timeout(c->arg[2]);
+               iso14a_set_timeout(timeout);
         }
  
         if(param & ISO14A_APDU) {
         }
  
         if(param & ISO14A_APDU) {
@@ -1965,15 +1943,38 @@ void ReaderIso14443a(UsbCommand *c)
  
         if(param & ISO14A_RAW) {
                 if(param & ISO14A_APPEND_CRC) {
  
         if(param & ISO14A_RAW) {
                 if(param & ISO14A_APPEND_CRC) {
-                       AppendCrc14443a(cmd,len);
+                       if(param & ISO14A_TOPAZMODE) {
+                               AppendCrc14443b(cmd,len);
+                       } else {
+                               AppendCrc14443a(cmd,len);
+                       }
                         len += 2;
                         if (lenbits) lenbits += 16;
                 }
                         len += 2;
                         if (lenbits) lenbits += 16;
                 }
-               if(lenbits>0) {
-                       GetParity(cmd, lenbits/8, par);
-                       ReaderTransmitBitsPar(cmd, lenbits, par, NULL);
-               } else {
-                       ReaderTransmit(cmd,len, NULL);
+               if(lenbits>0) {                         // want to send a specific number of bits (e.g. short commands)
+                       if(param & ISO14A_TOPAZMODE) {
+                               int bits_to_send = lenbits;
+                               uint16_t i = 0;
+                               ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 7), NULL, NULL);             // first byte is always short (7bits) and no parity
+                               bits_to_send -= 7;
+                               while (bits_to_send > 0) {
+                                       ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 8), NULL, NULL);     // following bytes are 8 bit and no parity
+                                       bits_to_send -= 8;
+                               }
+                       } else {
+                               GetParity(cmd, lenbits/8, par);
+                               ReaderTransmitBitsPar(cmd, lenbits, par, NULL);                                                 // bytes are 8 bit with odd parity
+                       }
+               } else {                                        // want to send complete bytes only
+                       if(param & ISO14A_TOPAZMODE) {
+                               uint16_t i = 0;
+                               ReaderTransmitBitsPar(&cmd[i++], 7, NULL, NULL);                                                // first byte: 7 bits, no paritiy
+                               while (i < len) {
+                                       ReaderTransmitBitsPar(&cmd[i++], 8, NULL, NULL);                                        // following bytes: 8 bits, no paritiy
+                               }
+                       } else {
+                               ReaderTransmit(cmd,len, NULL);                                                                                  // 8 bits, odd parity
+                       }
                 }
                 arg0 = ReaderReceive(buf, par);
                 cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));
                 }
                 arg0 = ReaderReceive(buf, par);
                 cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));
@@ -2009,7 +2010,7 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
                 nttmp1 = prng_successor(nttmp1, 1);
                 if (nttmp1 == nt2) return i;
                 nttmp2 = prng_successor(nttmp2, 1);
                 nttmp1 = prng_successor(nttmp1, 1);
                 if (nttmp1 == nt2) return i;
                 nttmp2 = prng_successor(nttmp2, 1);
-                       if (nttmp2 == nt1) return -i;
+               if (nttmp2 == nt1) return -i;
                 }
         
         return(-99999); // either nt1 or nt2 are invalid nonces
                 }
         
         return(-99999); // either nt1 or nt2 are invalid nonces
@@ -2032,11 +2033,15 @@ void ReaderMifare(bool first_try)
         uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
         uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
  
         uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
         uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
  
+       if (first_try) { 
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+       }
+       
         // free eventually allocated BigBuf memory. We want all for tracing.
         BigBuf_free();
         
         // free eventually allocated BigBuf memory. We want all for tracing.
         BigBuf_free();
         
-       iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       clear_trace();
+       set_tracing(TRUE);
  
         byte_t nt_diff = 0;
         uint8_t par[1] = {0};   // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
  
         byte_t nt_diff = 0;
         uint8_t par[1] = {0};   // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
@@ -2051,20 +2056,20 @@ void ReaderMifare(bool first_try)
         byte_t par_list[8] = {0x00};
         byte_t ks_list[8] = {0x00};
  
         byte_t par_list[8] = {0x00};
         byte_t ks_list[8] = {0x00};
  
+       #define PRNG_SEQUENCE_LENGTH  (1 << 16);
         static uint32_t sync_time;
         static uint32_t sync_time;
-       static uint32_t sync_cycles;
+       static int32_t sync_cycles;
         int catch_up_cycles = 0;
         int last_catch_up = 0;
         int catch_up_cycles = 0;
         int last_catch_up = 0;
+       uint16_t elapsed_prng_sequences;
         uint16_t consecutive_resyncs = 0;
         int isOK = 0;
  
         if (first_try) { 
                 mf_nr_ar3 = 0;
         uint16_t consecutive_resyncs = 0;
         int isOK = 0;
  
         if (first_try) { 
                 mf_nr_ar3 = 0;
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
                 sync_time = GetCountSspClk() & 0xfffffff8;
                 sync_time = GetCountSspClk() & 0xfffffff8;
-               sync_cycles = 65536;                                                                    // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
+               sync_cycles = PRNG_SEQUENCE_LENGTH;                                                     // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the tag nonces).
                 nt_attacked = 0;
                 nt_attacked = 0;
-               nt = 0;
                 par[0] = 0;
         }
         else {
                 par[0] = 0;
         }
         else {
@@ -2078,33 +2083,84 @@ void ReaderMifare(bool first_try)
         LED_B_OFF();
         LED_C_OFF();
         
         LED_B_OFF();
         LED_C_OFF();
         
-  
+
+       #define MAX_UNEXPECTED_RANDOM   4               // maximum number of unexpected (i.e. real) random numbers when trying to sync. Then give up.
+       #define MAX_SYNC_TRIES                  32
+       #define NUM_DEBUG_INFOS                 8               // per strategy
+       #define MAX_STRATEGY                    3
+       uint16_t unexpected_random = 0;
+       uint16_t sync_tries = 0;
+       int16_t debug_info_nr = -1;
+       uint16_t strategy = 0;
+       int32_t debug_info[MAX_STRATEGY][NUM_DEBUG_INFOS];
+       uint32_t select_time;
+       uint32_t halt_time;
+       
         for(uint16_t i = 0; TRUE; i++) {
                 
         for(uint16_t i = 0; TRUE; i++) {
                 
+               LED_C_ON();
                 WDT_HIT();
  
                 // Test if the action was cancelled
                 if(BUTTON_PRESS()) {
                 WDT_HIT();
  
                 // Test if the action was cancelled
                 if(BUTTON_PRESS()) {
+                       isOK = -1;
                         break;
                 }
                 
                         break;
                 }
                 
-               LED_C_ON();
+               if (strategy == 2) {
+                       // test with additional hlt command
+                       halt_time = 0;
+                       int len = mifare_sendcmd_short(NULL, false, 0x50, 0x00, receivedAnswer, receivedAnswerPar, &halt_time);
+                       if (len && MF_DBGLEVEL >= 3) {
+                               Dbprintf("Unexpected response of %d bytes to hlt command (additional debugging).", len);
+                       }
+               }
  
  
+               if (strategy == 3) {
+                       // test with FPGA power off/on
+                       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+                       SpinDelay(200);
+                       iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+                       SpinDelay(100);
+               }
+               
                 if(!iso14443a_select_card(uid, NULL, &cuid)) {
                         if (MF_DBGLEVEL >= 1)   Dbprintf("Mifare: Can't select card");
                         continue;
                 }
                 if(!iso14443a_select_card(uid, NULL, &cuid)) {
                         if (MF_DBGLEVEL >= 1)   Dbprintf("Mifare: Can't select card");
                         continue;
                 }
+               select_time = GetCountSspClk();
  
  
-               sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
-               catch_up_cycles = 0;
+               elapsed_prng_sequences = 1;
+               if (debug_info_nr == -1) {
+                       sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
+                       catch_up_cycles = 0;
  
  
-               // if we missed the sync time already, advance to the next nonce repeat
-               while(GetCountSspClk() > sync_time) {
-                       sync_time = (sync_time & 0xfffffff8) + sync_cycles;
-               }
+                       // if we missed the sync time already, advance to the next nonce repeat
+                       while(GetCountSspClk() > sync_time) {
+                               elapsed_prng_sequences++;
+                               sync_time = (sync_time & 0xfffffff8) + sync_cycles;
+                       }
  
  
-               // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked) 
-               ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
+                       // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked) 
+                       ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
+               } else {
+                       // collect some information on tag nonces for debugging:
+                       #define DEBUG_FIXED_SYNC_CYCLES PRNG_SEQUENCE_LENGTH
+                       if (strategy == 0) {
+                               // nonce distances at fixed time after card select:
+                               sync_time = select_time + DEBUG_FIXED_SYNC_CYCLES;
+                       } else if (strategy == 1) {
+                               // nonce distances at fixed time between authentications:
+                               sync_time = sync_time + DEBUG_FIXED_SYNC_CYCLES;
+                       } else if (strategy == 2) {
+                               // nonce distances at fixed time after halt:
+                               sync_time = halt_time + DEBUG_FIXED_SYNC_CYCLES;
+                       } else {
+                               // nonce_distances at fixed time after power on
+                               sync_time = DEBUG_FIXED_SYNC_CYCLES;
+                       }
+                       ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
+               }                       
  
                 // Receive the (4 Byte) "random" nonce
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar)) {
  
                 // Receive the (4 Byte) "random" nonce
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar)) {
@@ -2122,13 +2178,37 @@ void ReaderMifare(bool first_try)
                         int nt_distance = dist_nt(previous_nt, nt);
                         if (nt_distance == 0) {
                                 nt_attacked = nt;
                         int nt_distance = dist_nt(previous_nt, nt);
                         if (nt_distance == 0) {
                                 nt_attacked = nt;
-                       }
-                       else {
-                               if (nt_distance == -99999) { // invalid nonce received, try again
-                                       continue;
+                       } else {
+                               if (nt_distance == -99999) { // invalid nonce received
+                                       unexpected_random++;
+                                       if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
+                                               isOK = -3;              // Card has an unpredictable PRNG. Give up      
+                                               break;
+                                       } else {
+                                               continue;               // continue trying...
+                                       }
+                               }
+                               if (++sync_tries > MAX_SYNC_TRIES) {
+                                       if (strategy > MAX_STRATEGY || MF_DBGLEVEL < 3) {
+                                               isOK = -4;                      // Card's PRNG runs at an unexpected frequency or resets unexpectedly
+                                               break;
+                                       } else {                                // continue for a while, just to collect some debug info
+                                               debug_info[strategy][debug_info_nr] = nt_distance;
+                                               debug_info_nr++;
+                                               if (debug_info_nr == NUM_DEBUG_INFOS) {
+                                                       strategy++;
+                                                       debug_info_nr = 0;
+                                               }
+                                               continue;
+                                       }
+                               }
+                               sync_cycles = (sync_cycles - nt_distance/elapsed_prng_sequences);
+                               if (sync_cycles <= 0) {
+                                       sync_cycles += PRNG_SEQUENCE_LENGTH;
+                               }
+                               if (MF_DBGLEVEL >= 3) {
+                                       Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
                                 }
                                 }
-                               sync_cycles = (sync_cycles - nt_distance);
-                               if (MF_DBGLEVEL >= 3) Dbprintf("calibrating in cycle %d. nt_distance=%d, Sync_cycles: %d\n", i, nt_distance, sync_cycles);
                                 continue;
                         }
                 }
                                 continue;
                         }
                 }
@@ -2139,6 +2219,7 @@ void ReaderMifare(bool first_try)
                                 catch_up_cycles = 0;
                                 continue;
                         }
                                 catch_up_cycles = 0;
                                 continue;
                         }
+                       catch_up_cycles /= elapsed_prng_sequences;
                         if (catch_up_cycles == last_catch_up) {
                                 consecutive_resyncs++;
                         }
                         if (catch_up_cycles == last_catch_up) {
                                 consecutive_resyncs++;
                         }
@@ -2152,6 +2233,9 @@ void ReaderMifare(bool first_try)
                         else {  
                                 sync_cycles = sync_cycles + catch_up_cycles;
                                 if (MF_DBGLEVEL >= 3) Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, -catch_up_cycles, sync_cycles);
                         else {  
                                 sync_cycles = sync_cycles + catch_up_cycles;
                                 if (MF_DBGLEVEL >= 3) Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, -catch_up_cycles, sync_cycles);
+                               last_catch_up = 0;
+                               catch_up_cycles = 0;
+                               consecutive_resyncs = 0;
                         }
                         continue;
                 }
                         }
                         continue;
                 }
@@ -2159,12 +2243,10 @@ void ReaderMifare(bool first_try)
                 consecutive_resyncs = 0;
                 
                 // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
                 consecutive_resyncs = 0;
                 
                 // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
-               if (ReaderReceive(receivedAnswer, receivedAnswerPar))
-               {
+               if (ReaderReceive(receivedAnswer, receivedAnswerPar)) {
                         catch_up_cycles = 8;    // the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
         
                         catch_up_cycles = 8;    // the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
         
-                       if (nt_diff == 0)
-                       {
+                       if (nt_diff == 0) {
                                 par_low = par[0] & 0xE0; // there is no need to check all parities for other nt_diff. Parity Bits for mf_nr_ar[0..2] won't change
                         }
  
                                 par_low = par[0] & 0xE0; // there is no need to check all parities for other nt_diff. Parity Bits for mf_nr_ar[0..2] won't change
                         }
  
@@ -2187,6 +2269,10 @@ void ReaderMifare(bool first_try)
                         if (nt_diff == 0 && first_try)
                         {
                                 par[0]++;
                         if (nt_diff == 0 && first_try)
                         {
                                 par[0]++;
+                               if (par[0] == 0x00) {           // tried all 256 possible parities without success. Card doesn't send NACK.
+                                       isOK = -2;
+                                       break;
+                               }
                         } else {
                                 par[0] = ((par[0] & 0x1F) + 1) | par_low;
                         }
                         } else {
                                 par[0] = ((par[0] & 0x1F) + 1) | par_low;
                         }
@@ -2195,6 +2281,16 @@ void ReaderMifare(bool first_try)
  
  
         mf_nr_ar[3] &= 0x1F;
  
  
         mf_nr_ar[3] &= 0x1F;
+
+       if (isOK == -4) {
+               if (MF_DBGLEVEL >= 3) {
+                       for (uint16_t i = 0; i <= MAX_STRATEGY; i++) {
+                               for(uint16_t j = 0; j < NUM_DEBUG_INFOS; j++) {
+                                       Dbprintf("collected debug info[%d][%d] = %d", i, j, debug_info[i][j]);
+                               }
+                       }
+               }
+       }
         
         byte_t buf[28];
         memcpy(buf + 0,  uid, 4);
         
         byte_t buf[28];
         memcpy(buf + 0,  uid, 4);
@@ -2203,29 +2299,43 @@ void ReaderMifare(bool first_try)
         memcpy(buf + 16, ks_list, 8);
         memcpy(buf + 24, mf_nr_ar, 4);
                 
         memcpy(buf + 16, ks_list, 8);
         memcpy(buf + 24, mf_nr_ar, 4);
                 
-       cmd_send(CMD_ACK,isOK,0,0,buf,28);
+       cmd_send(CMD_ACK, isOK, 0, 0, buf, 28);
  
         // Thats it...
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
  
  
         // Thats it...
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
  
-       iso14a_set_tracing(FALSE);
+       set_tracing(FALSE);
  }
  
  }
  
+typedef struct {
+  uint32_t cuid;
+  uint8_t  sector;
+  uint8_t  keytype;
+  uint32_t nonce;
+  uint32_t ar;
+  uint32_t nr;
+  uint32_t nonce2;
+  uint32_t ar2;
+  uint32_t nr2;
+} nonces_t;
+
  /**
    *MIFARE 1K simulate.
    *
    *@param flags :
    *    FLAG_INTERACTIVE - In interactive mode, we are expected to finish the operation with an ACK
  /**
    *MIFARE 1K simulate.
    *
    *@param flags :
    *    FLAG_INTERACTIVE - In interactive mode, we are expected to finish the operation with an ACK
-  * 4B_FLAG_UID_IN_DATA - means that there is a 4-byte UID in the data-section, we're expected to use that
-  * 7B_FLAG_UID_IN_DATA - means that there is a 7-byte UID in the data-section, we're expected to use that
+  * FLAG_4B_UID_IN_DATA - means that there is a 4-byte UID in the data-section, we're expected to use that
+  * FLAG_7B_UID_IN_DATA - means that there is a 7-byte UID in the data-section, we're expected to use that
+  * FLAG_10B_UID_IN_DATA       - use 10-byte UID in the data-section not finished
    *    FLAG_NR_AR_ATTACK  - means we should collect NR_AR responses for bruteforcing later
    *    FLAG_NR_AR_ATTACK  - means we should collect NR_AR responses for bruteforcing later
-  *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
+  *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is infinite ...
+  * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
    */
  void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain)
  {
         int cardSTATE = MFEMUL_NOFIELD;
    */
  void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain)
  {
         int cardSTATE = MFEMUL_NOFIELD;
-       int _7BUID = 0;
+       int _UID_LEN = 0; // 4, 7, 10
         int vHf = 0;    // in mV
         int res;
         uint32_t selTimer = 0;
         int vHf = 0;    // in mV
         int res;
         uint32_t selTimer = 0;
@@ -2249,27 +2359,32 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
         uint8_t response[MAX_MIFARE_FRAME_SIZE];
         uint8_t response_par[MAX_MIFARE_PARITY_SIZE];
         
         uint8_t response[MAX_MIFARE_FRAME_SIZE];
         uint8_t response_par[MAX_MIFARE_PARITY_SIZE];
         
-       uint8_t rATQA[] = {0x04, 0x00}; // Mifare classic 1k 4BUID
+       uint8_t rATQA[]    = {0x04, 0x00}; // Mifare classic 1k 4BUID
         uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
         uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; // !!!
         uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
         uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; // !!!
-       uint8_t rSAK[] = {0x08, 0xb6, 0xdd};
-       uint8_t rSAK1[] = {0x04, 0xda, 0x17};
+       uint8_t rUIDBCC3[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+
+       uint8_t rSAKfinal[]= {0x08, 0xb6, 0xdd};      // mifare 1k indicated
+       uint8_t rSAK1[]    = {0x04, 0xda, 0x17};      // indicate UID not finished
  
         uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
         uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
                 
  
         uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
         uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
                 
-       //Here, we collect UID,NT,AR,NR,UID2,NT2,AR2,NR2
-       // This can be used in a reader-only attack.
-       // (it can also be retrieved via 'hf 14a list', but hey...
-       uint32_t ar_nr_responses[] = {0,0,0,0,0,0,0,0};
-       uint8_t ar_nr_collected = 0;
-
-       // free eventually allocated BigBuf memory but keep Emulator Memory
-       BigBuf_free_keep_EM();
-
-       // clear trace
-    iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       //Here, we collect UID,sector,keytype,NT,AR,NR,NT2,AR2,NR2
+       // This will be used in the reader-only attack.
+
+       //allow collecting up to 8 sets of nonces to allow recovery of up to 8 keys
+       #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
+       nonces_t ar_nr_resp[ATTACK_KEY_COUNT*2]; //*2 for 2 separate attack types (nml, moebius)
+       memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp));
+
+       uint8_t ar_nr_collected[ATTACK_KEY_COUNT*2]; //*2 for 2nd attack type (moebius)
+       memset(ar_nr_collected, 0x00, sizeof(ar_nr_collected));
+       uint8_t nonce1_count = 0;
+       uint8_t nonce2_count = 0;
+       uint8_t moebius_n_count = 0;
+       bool gettingMoebius = false;
+       uint8_t mM = 0; //moebius_modifier for collection storage
  
         // Authenticate response - nonce
         uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
  
         // Authenticate response - nonce
         uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
@@ -2282,52 +2397,111 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 // 4B uid comes from data-portion of packet
                 memcpy(rUIDBCC1,datain,4);
                 rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
                 // 4B uid comes from data-portion of packet
                 memcpy(rUIDBCC1,datain,4);
                 rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-
+               _UID_LEN = 4;
         } else if (flags & FLAG_7B_UID_IN_DATA) {
                 // 7B uid comes from data-portion of packet
                 memcpy(&rUIDBCC1[1],datain,3);
                 memcpy(rUIDBCC2, datain+3, 4);
         } else if (flags & FLAG_7B_UID_IN_DATA) {
                 // 7B uid comes from data-portion of packet
                 memcpy(&rUIDBCC1[1],datain,3);
                 memcpy(rUIDBCC2, datain+3, 4);
-               _7BUID = true;
+               _UID_LEN = 7;
+       } else if (flags & FLAG_10B_UID_IN_DATA) {
+               memcpy(&rUIDBCC1[1], datain,   3);
+               memcpy(&rUIDBCC2[1], datain+3, 3);
+               memcpy( rUIDBCC3,    datain+6, 4);
+               _UID_LEN = 10;
         } else {
         } else {
-               // get UID from emul memory
+               // get UID from emul memory - guess at length
                 emlGetMemBt(receivedCmd, 7, 1);
                 emlGetMemBt(receivedCmd, 7, 1);
-               _7BUID = !(receivedCmd[0] == 0x00);
-               if (!_7BUID) {                     // ---------- 4BUID
+               if (receivedCmd[0] == 0x00) {      // ---------- 4BUID
                         emlGetMemBt(rUIDBCC1, 0, 4);
                         emlGetMemBt(rUIDBCC1, 0, 4);
+                       _UID_LEN = 4;
                 } else {                           // ---------- 7BUID
                         emlGetMemBt(&rUIDBCC1[1], 0, 3);
                         emlGetMemBt(rUIDBCC2, 3, 4);
                 } else {                           // ---------- 7BUID
                         emlGetMemBt(&rUIDBCC1[1], 0, 3);
                         emlGetMemBt(rUIDBCC2, 3, 4);
+                       _UID_LEN = 7;
                 }
         }
  
                 }
         }
  
-       /*
-        * Regardless of what method was used to set the UID, set fifth byte and modify
-        * the ATQA for 4 or 7-byte UID
-        */
-       rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-       if (_7BUID) {
-               rATQA[0] = 0x44;
-               rUIDBCC1[0] = 0x88;
-               rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+       switch (_UID_LEN) {
+               case 4:
+                       // save CUID
+                       cuid = bytes_to_num(rUIDBCC1, 4);
+                       // BCC
+                       rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+                       if (MF_DBGLEVEL >= 2)   {
+                               Dbprintf("4B UID: %02x%02x%02x%02x", 
+                                       rUIDBCC1[0],
+                                       rUIDBCC1[1],
+                                       rUIDBCC1[2],
+                                       rUIDBCC1[3]
+                               );
+                       }
+                       break;
+               case 7:
+                       rATQA[0] |= 0x40;
+                       // save CUID
+                       cuid = bytes_to_num(rUIDBCC2, 4);
+                        // CascadeTag, CT
+                       rUIDBCC1[0] = 0x88;
+                       // BCC
+                       rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3]; 
+                       rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3]; 
+                       if (MF_DBGLEVEL >= 2)   {
+                               Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
+                                       rUIDBCC1[1],
+                                       rUIDBCC1[2],
+                                       rUIDBCC1[3],
+                                       rUIDBCC2[0],
+                                       rUIDBCC2[1],
+                                       rUIDBCC2[2],
+                                       rUIDBCC2[3]
+                               );
+                       }
+                       break;
+               case 10:
+                       rATQA[0] |= 0x80;
+                       //sak_10[0] &= 0xFB;                                    
+                       // save CUID
+                       cuid = bytes_to_num(rUIDBCC3, 4);
+                        // CascadeTag, CT
+                       rUIDBCC1[0] = 0x88;
+                       rUIDBCC2[0] = 0x88;
+                       // BCC
+                       rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+                       rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+                       rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
+
+                       if (MF_DBGLEVEL >= 2)   {
+                               Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                                       rUIDBCC1[1],
+                                       rUIDBCC1[2],
+                                       rUIDBCC1[3],
+                                       rUIDBCC2[1],
+                                       rUIDBCC2[2],
+                                       rUIDBCC2[3],
+                                       rUIDBCC3[0],
+                                       rUIDBCC3[1],
+                                       rUIDBCC3[2],
+                                       rUIDBCC3[3]
+                               );
+                       }
+                       break;
+               default: 
+                       break;
         }
  
         // We need to listen to the high-frequency, peak-detected path.
         iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
  
         }
  
         // We need to listen to the high-frequency, peak-detected path.
         iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
  
+       // free eventually allocated BigBuf memory but keep Emulator Memory
+       BigBuf_free_keep_EM();
  
  
-       if (MF_DBGLEVEL >= 1)   {
-               if (!_7BUID) {
-                       Dbprintf("4B UID: %02x%02x%02x%02x", 
-                               rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
-               } else {
-                       Dbprintf("7B UID: (%02x)%02x%02x%02x%02x%02x%02x%02x",
-                               rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
-                               rUIDBCC2[0], rUIDBCC2[1] ,rUIDBCC2[2], rUIDBCC2[3]);
-               }
-       }
+       // clear trace
+       clear_trace();
+       set_tracing(TRUE);
  
         bool finished = FALSE;
  
         bool finished = FALSE;
-       while (!BUTTON_PRESS() && !finished) {
+       bool button_pushed = BUTTON_PRESS();
+       while (!button_pushed && !finished && !usb_poll_validate_length()) {
                 WDT_HIT();
  
                 // find reader field
                 WDT_HIT();
  
                 // find reader field
@@ -2337,11 +2511,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                 cardSTATE_TO_IDLE();
                                 LED_A_ON();
                         }
                                 cardSTATE_TO_IDLE();
                                 LED_A_ON();
                         }
-               } 
-               if(cardSTATE == MFEMUL_NOFIELD) continue;
+               }
+               if (cardSTATE == MFEMUL_NOFIELD) continue;
  
                 //Now, get data
  
                 //Now, get data
-
                 res = EmGetCmd(receivedCmd, &len, receivedCmd_par);
                 if (res == 2) { //Field is off!
                         cardSTATE = MFEMUL_NOFIELD;
                 res = EmGetCmd(receivedCmd, &len, receivedCmd_par);
                 if (res == 2) { //Field is off!
                         cardSTATE = MFEMUL_NOFIELD;
@@ -2350,11 +2523,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 } else if (res == 1) {
                         break;  //return value 1 means button press
                 }
                 } else if (res == 1) {
                         break;  //return value 1 means button press
                 }
-                       
+
                 // REQ or WUP request in ANY state and WUP in HALTED state
                 // REQ or WUP request in ANY state and WUP in HALTED state
-               if (len == 1 && ((receivedCmd[0] == 0x26 && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == 0x52)) {
+               if (len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
                         selTimer = GetTickCount();
                         selTimer = GetTickCount();
-                       EmSendCmdEx(rATQA, sizeof(rATQA), (receivedCmd[0] == 0x52));
+                       EmSendCmdEx(rATQA, sizeof(rATQA), (receivedCmd[0] == ISO14443A_CMD_WUPA));
                         cardSTATE = MFEMUL_SELECT1;
  
                         // init crypto block
                         cardSTATE = MFEMUL_SELECT1;
  
                         // init crypto block
@@ -2373,59 +2546,137 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                 break;
                         }
                         case MFEMUL_SELECT1:{
                                 break;
                         }
                         case MFEMUL_SELECT1:{
-                               // select all
-                               if (len == 2 && (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x20)) {
+                               // select all - 0x93 0x20
+                               if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
                                         if (MF_DBGLEVEL >= 4)   Dbprintf("SELECT ALL received");
                                         EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
                                         break;
                                 }
  
                                         if (MF_DBGLEVEL >= 4)   Dbprintf("SELECT ALL received");
                                         EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
                                         break;
                                 }
  
-                               if (MF_DBGLEVEL >= 4 && len == 9 && receivedCmd[0] == 0x93 && receivedCmd[1] == 0x70 )
-                               {
-                                       Dbprintf("SELECT %02x%02x%02x%02x received",receivedCmd[2],receivedCmd[3],receivedCmd[4],receivedCmd[5]);
+                               // select card - 0x93 0x70 ...
+                               if (len == 9 &&
+                                               (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
+                                       if (MF_DBGLEVEL >= 4) 
+                                               Dbprintf("SELECT %02x%02x%02x%02x received",receivedCmd[2],receivedCmd[3],receivedCmd[4],receivedCmd[5]);
+                                       
+                                       switch(_UID_LEN) {
+                                               case 4:
+                                                       cardSTATE = MFEMUL_WORK;
+                                                       LED_B_ON();
+                                                       if (MF_DBGLEVEL >= 4)   Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
+                                                       EmSendCmd(rSAKfinal, sizeof(rSAKfinal));
+                                                       break;
+                                               case 7:
+                                                       cardSTATE       = MFEMUL_SELECT2;
+                                                       EmSendCmd(rSAK1, sizeof(rSAK1));
+                                                       break;
+                                               case 10:
+                                                       cardSTATE       = MFEMUL_SELECT2;
+                                                       EmSendCmd(rSAK1, sizeof(rSAK1));
+                                                       break;
+                                               default:break;
+                                       }
+                               } else {
+                                       cardSTATE_TO_IDLE();
+                               }
+                               break;
+                       }
+                       case MFEMUL_SELECT3:{
+                               if (!len) { 
+                                       LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
+                                       break;
                                 }
                                 }
-                               // select card
+                               // select all cl3 - 0x97 0x20
+                               if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
+                                       EmSendCmd(rUIDBCC3, sizeof(rUIDBCC3));
+                                       break;
+                               }
+                               // select card cl3 - 0x97 0x70
                                 if (len == 9 && 
                                 if (len == 9 && 
-                                               (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
-                                       EmSendCmd(_7BUID?rSAK1:rSAK, _7BUID?sizeof(rSAK1):sizeof(rSAK));
-                                       cuid = bytes_to_num(rUIDBCC1, 4);
-                                       if (!_7BUID) {
-                                               cardSTATE = MFEMUL_WORK;
-                                               LED_B_ON();
-                                               if (MF_DBGLEVEL >= 4)   Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
-                                               break;
-                                       } else {
-                                               cardSTATE = MFEMUL_SELECT2;
-                                       }
+                                               (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
+                                                receivedCmd[1] == 0x70 && 
+                                                memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0) ) {
+
+                                       EmSendCmd(rSAKfinal, sizeof(rSAKfinal));
+                                       cardSTATE = MFEMUL_WORK;
+                                       LED_B_ON();
+                                       if (MF_DBGLEVEL >= 4)   Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
+                                       break;
                                 }
                                 }
+                               cardSTATE_TO_IDLE();
                                 break;
                         }
                         case MFEMUL_AUTH1:{
                                 break;
                         }
                         case MFEMUL_AUTH1:{
-                               if( len != 8)
-                               {
+                               if( len != 8) {
                                         cardSTATE_TO_IDLE();
                                         LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                                         break;
                                 }
  
                                         cardSTATE_TO_IDLE();
                                         LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                                         break;
                                 }
  
-                               uint32_t ar = bytes_to_num(receivedCmd, 4);
-                               uint32_t nr = bytes_to_num(&receivedCmd[4], 4);
-
-                               //Collect AR/NR
-                               if(ar_nr_collected < 2){
-                                       if(ar_nr_responses[2] != ar)
-                                       {// Avoid duplicates... probably not necessary, ar should vary. 
-                                               ar_nr_responses[ar_nr_collected*4] = cuid;
-                                               ar_nr_responses[ar_nr_collected*4+1] = nonce;
-                                               ar_nr_responses[ar_nr_collected*4+2] = ar;
-                                               ar_nr_responses[ar_nr_collected*4+3] = nr;
-                                               ar_nr_collected++;
+                               uint32_t nr = bytes_to_num(receivedCmd, 4);
+                               uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
+       
+                               // Collect AR/NR per keytype & sector
+                               if(flags & FLAG_NR_AR_ATTACK) {
+                                       for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+                                               if ( ar_nr_collected[i+mM]==0 || ((cardAUTHSC == ar_nr_resp[i+mM].sector) && (cardAUTHKEY == ar_nr_resp[i+mM].keytype) && (ar_nr_collected[i+mM] > 0)) ) {
+                                                       // if first auth for sector, or matches sector and keytype of previous auth
+                                                       if (ar_nr_collected[i+mM] < 2) {
+                                                               // if we haven't already collected 2 nonces for this sector
+                                                               if (ar_nr_resp[ar_nr_collected[i+mM]].ar != ar) {
+                                                                       // Avoid duplicates... probably not necessary, ar should vary. 
+                                                                       if (ar_nr_collected[i+mM]==0) {
+                                                                               // first nonce collect
+                                                                               ar_nr_resp[i+mM].cuid = cuid;
+                                                                               ar_nr_resp[i+mM].sector = cardAUTHSC;
+                                                                               ar_nr_resp[i+mM].keytype = cardAUTHKEY;
+                                                                               ar_nr_resp[i+mM].nonce = nonce;
+                                                                               ar_nr_resp[i+mM].nr = nr;
+                                                                               ar_nr_resp[i+mM].ar = ar;
+                                                                               nonce1_count++;
+                                                                               // add this nonce to first moebius nonce
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].cuid = cuid;
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].sector = cardAUTHSC;
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].keytype = cardAUTHKEY;
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].nonce = nonce;
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].nr = nr;
+                                                                               ar_nr_resp[i+ATTACK_KEY_COUNT].ar = ar;
+                                                                               ar_nr_collected[i+ATTACK_KEY_COUNT]++;
+                                                                       } else { // second nonce collect (std and moebius)
+                                                                               ar_nr_resp[i+mM].nonce2 = nonce;
+                                                                               ar_nr_resp[i+mM].nr2 = nr;
+                                                                               ar_nr_resp[i+mM].ar2 = ar;
+                                                                               if (!gettingMoebius) {
+                                                                                       nonce2_count++;
+                                                                                       // check if this was the last second nonce we need for std attack
+                                                                                       if ( nonce2_count == nonce1_count ) {
+                                                                                               // done collecting std test switch to moebius
+                                                                                               // first finish incrementing last sample
+                                                                                               ar_nr_collected[i+mM]++; 
+                                                                                               // switch to moebius collection
+                                                                                               gettingMoebius = true;
+                                                                                               mM = ATTACK_KEY_COUNT;
+                                                                                               nonce = nonce*7;
+                                                                                               break;
+                                                                                       }
+                                                                               } else {
+                                                                                       moebius_n_count++;
+                                                                                       // if we've collected all the nonces we need - finish.
+                                                                                       if (nonce1_count == moebius_n_count) finished = true;
+                                                                               }
+                                                                       }
+                                                                       ar_nr_collected[i+mM]++;
+                                                               }
+                                                       }
+                                                       // we found right spot for this nonce stop looking
+                                                       break;
+                                               }
                                         }
                                 }
  
                                 // --- crypto
                                         }
                                 }
  
                                 // --- crypto
-                               crypto1_word(pcs, ar , 1);
-                               cardRr = nr ^ crypto1_word(pcs, 0, 0);
+                               crypto1_word(pcs, nr , 1);
+                               cardRr = ar ^ crypto1_word(pcs, 0, 0);
  
                                 // test if auth OK
                                 if (cardRr != prng_successor(nonce, 64)){
  
                                 // test if auth OK
                                 if (cardRr != prng_successor(nonce, 64)){
@@ -2441,6 +2692,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                         break;
                                 }
  
                                         break;
                                 }
  
+                               //auth successful
                                 ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
  
                                 num_to_bytes(ans, 4, rAUTH_AT);
                                 ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
  
                                 num_to_bytes(ans, 4, rAUTH_AT);
@@ -2457,20 +2709,29 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                 if (!len) { 
                                         LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                                         break;
                                 if (!len) { 
                                         LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                                         break;
-                               }
-                               if (len == 2 && (receivedCmd[0] == 0x95 && receivedCmd[1] == 0x20)) {
+                               }       
+                               // select all cl2 - 0x95 0x20
+                               if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
                                         EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
                                         break;
                                 }
  
                                         EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
                                         break;
                                 }
  
-                               // select 2 card
+                               // select cl2 card - 0x95 0x70 xxxxxxxxxxxx
                                 if (len == 9 && 
                                 if (len == 9 && 
-                                               (receivedCmd[0] == 0x95 && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
-                                       EmSendCmd(rSAK, sizeof(rSAK));
-                                       cuid = bytes_to_num(rUIDBCC2, 4);
-                                       cardSTATE = MFEMUL_WORK;
-                                       LED_B_ON();
-                                       if (MF_DBGLEVEL >= 4)   Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
+                                               (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
+                                       switch(_UID_LEN) {
+                                               case 7:
+                                                       EmSendCmd(rSAKfinal, sizeof(rSAKfinal));
+                                                       cardSTATE = MFEMUL_WORK;
+                                                       LED_B_ON();
+                                                       if (MF_DBGLEVEL >= 4)   Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
+                                                       break;
+                                               case 10:
+                                                       EmSendCmd(rSAK1, sizeof(rSAK1));
+                                                       cardSTATE = MFEMUL_SELECT3;
+                                                       break;
+                                               default:break;
+                                       }
                                         break;
                                 }
                                 
                                         break;
                                 }
                                 
@@ -2498,11 +2759,22 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                 }
                                 
                                 if (len == 4 && (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61)) {
                                 }
                                 
                                 if (len == 4 && (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61)) {
+
+                                       // if authenticating to a block that shouldn't exist - as long as we are not doing the reader attack
+                                       if (receivedCmd[1] >= 16 * 4 && !(flags & FLAG_NR_AR_ATTACK)) {
+                                               //is this the correct response to an auth on a out of range block? marshmellow
+                                               EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                                               if (MF_DBGLEVEL >= 2) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
+                                               break;
+                                       }
+
                                         authTimer = GetTickCount();
                                         cardAUTHSC = receivedCmd[1] / 4;  // received block num
                                         cardAUTHKEY = receivedCmd[0] - 0x60;
                                         crypto1_destroy(pcs);//Added by martin
                                         crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
                                         authTimer = GetTickCount();
                                         cardAUTHSC = receivedCmd[1] / 4;  // received block num
                                         cardAUTHKEY = receivedCmd[0] - 0x60;
                                         crypto1_destroy(pcs);//Added by martin
                                         crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+                                       //uint64_t key=emlGetKey(cardAUTHSC, cardAUTHKEY);
+                                       //Dbprintf("key: %04x%08x",(uint32_t)(key>>32)&0xFFFF,(uint32_t)(key&0xFFFFFFFF));
  
                                         if (!encrypted_data) { // first authentication
                                                 if (MF_DBGLEVEL >= 4) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d",receivedCmd[1] ,receivedCmd[1],cardAUTHKEY  );
  
                                         if (!encrypted_data) { // first authentication
                                                 if (MF_DBGLEVEL >= 4) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d",receivedCmd[1] ,receivedCmd[1],cardAUTHKEY  );
@@ -2547,13 +2819,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                                 || receivedCmd[0] == 0xB0) { // transfer
                                         if (receivedCmd[1] >= 16 * 4) {
                                                 EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                                                 || receivedCmd[0] == 0xB0) { // transfer
                                         if (receivedCmd[1] >= 16 * 4) {
                                                 EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                                               if (MF_DBGLEVEL >= 2) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
+                                               if (MF_DBGLEVEL >= 2) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
                                                 break;
                                         }
  
                                         if (receivedCmd[1] / 4 != cardAUTHSC) {
                                                 EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                                                 break;
                                         }
  
                                         if (receivedCmd[1] / 4 != cardAUTHSC) {
                                                 EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                                               if (MF_DBGLEVEL >= 2) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking",receivedCmd[0],receivedCmd[1],cardAUTHSC);
+                                               if (MF_DBGLEVEL >= 2) Dbprintf("Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking",receivedCmd[0],receivedCmd[1],cardAUTHSC);
                                                 break;
                                         }
                                 }
                                                 break;
                                         }
                                 }
@@ -2679,45 +2951,48 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                 break;
                         }
                 }
                                 break;
                         }
                 }
+               button_pushed = BUTTON_PRESS();
         }
  
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
  
         }
  
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
  
-       if(flags & FLAG_INTERACTIVE)// Interactive mode flag, means we need to send ACK
-       {
-               //May just aswell send the collected ar_nr in the response aswell
-               cmd_send(CMD_ACK,CMD_SIMULATE_MIFARE_CARD,0,0,&ar_nr_responses,ar_nr_collected*4*4);
-       }
-
-       if(flags & FLAG_NR_AR_ATTACK)
-       {
-               if(ar_nr_collected > 1) {
-                       Dbprintf("Collected two pairs of AR/NR which can be used to extract keys from reader:");
-                       Dbprintf("../tools/mfkey/mfkey32 %08x %08x %08x %08x %08x %08x",
-                                       ar_nr_responses[0], // UID
-                                       ar_nr_responses[1], //NT
-                                       ar_nr_responses[2], //AR1
-                                       ar_nr_responses[3], //NR1
-                                       ar_nr_responses[6], //AR2
-                                       ar_nr_responses[7] //NR2
-                                       );
-               } else {
-                       Dbprintf("Failed to obtain two AR/NR pairs!");
-                       if(ar_nr_collected >0) {
-                               Dbprintf("Only got these: UID=%08x, nonce=%08x, AR1=%08x, NR1=%08x",
-                                               ar_nr_responses[0], // UID
-                                               ar_nr_responses[1], //NT
-                                               ar_nr_responses[2], //AR1
-                                               ar_nr_responses[3] //NR1
+       if(flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) {
+               for ( uint8_t   i = 0; i < ATTACK_KEY_COUNT; i++) {
+                       if (ar_nr_collected[i] == 2) {
+                               Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
+                               Dbprintf("../tools/mfkey/mfkey32 %08x %08x %08x %08x %08x %08x",
+                                               ar_nr_resp[i].cuid,  //UID
+                                               ar_nr_resp[i].nonce, //NT
+                                               ar_nr_resp[i].nr,    //NR1
+                                               ar_nr_resp[i].ar,    //AR1
+                                               ar_nr_resp[i].nr2,   //NR2
+                                               ar_nr_resp[i].ar2    //AR2
+                                               );
+                       }
+               }       
+               for ( uint8_t   i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT*2; i++) {
+                       if (ar_nr_collected[i] == 2) {
+                               Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
+                               Dbprintf("../tools/mfkey/mfkey32v2 %08x %08x %08x %08x %08x %08x %08x",
+                                               ar_nr_resp[i].cuid,  //UID
+                                               ar_nr_resp[i].nonce, //NT
+                                               ar_nr_resp[i].nr,    //NR1
+                                               ar_nr_resp[i].ar,    //AR1
+                                               ar_nr_resp[i].nonce2,//NT2
+                                               ar_nr_resp[i].nr2,   //NR2
+                                               ar_nr_resp[i].ar2    //AR2
                                                 );
                         }
                 }
         }
                                                 );
                         }
                 }
         }
-       if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, traceLen);
-       
-}
+       if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, BigBuf_get_traceLen());
  
  
+       if(flags & FLAG_INTERACTIVE) { // Interactive mode flag, means we need to send ACK
+               //Send the collected ar_nr in the response
+               cmd_send(CMD_ACK,CMD_SIMULATE_MIFARE_CARD,button_pushed,0,&ar_nr_resp,sizeof(ar_nr_resp));
+       }
+}
  
  
  //-----------------------------------------------------------------------------
  
  
  //-----------------------------------------------------------------------------
@@ -2732,8 +3007,8 @@ void RAMFUNC SniffMifare(uint8_t param) {
         // C(red) A(yellow) B(green)
         LEDsoff();
         // init trace buffer
         // C(red) A(yellow) B(green)
         LEDsoff();
         // init trace buffer
-       iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       clear_trace();
+       set_tracing(TRUE);
  
         // The command (reader -> tag) that we're receiving.
         // The length of a received command will in most cases be no more than 18 bytes.
  
         // The command (reader -> tag) that we're receiving.
         // The length of a received command will in most cases be no more than 18 bytes.
@@ -2744,10 +3019,8 @@ void RAMFUNC SniffMifare(uint8_t param) {
         uint8_t receivedResponse[MAX_MIFARE_FRAME_SIZE];
         uint8_t receivedResponsePar[MAX_MIFARE_PARITY_SIZE];
  
         uint8_t receivedResponse[MAX_MIFARE_FRAME_SIZE];
         uint8_t receivedResponsePar[MAX_MIFARE_PARITY_SIZE];
  
-       // As we receive stuff, we copy it from receivedCmd or receivedResponse
-       // into trace, along with its length and other annotations.
-       //uint8_t *trace = (uint8_t *)BigBuf;
-       
+       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+
         // free eventually allocated BigBuf memory
         BigBuf_free();
         // allocate the DMA buffer, used to stream samples from the FPGA
         // free eventually allocated BigBuf memory
         BigBuf_free();
         // allocate the DMA buffer, used to stream samples from the FPGA
@@ -2759,8 +3032,6 @@ void RAMFUNC SniffMifare(uint8_t param) {
         bool ReaderIsActive = FALSE;
         bool TagIsActive = FALSE;
  
         bool ReaderIsActive = FALSE;
         bool TagIsActive = FALSE;
  
-       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-
         // Set up the demodulator for tag -> reader responses.
         DemodInit(receivedResponse, receivedResponsePar);
  
         // Set up the demodulator for tag -> reader responses.
         DemodInit(receivedResponse, receivedResponsePar);
  
@@ -2840,7 +3111,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
                                         if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, TRUE)) break;
  
                                         /* And ready to receive another command. */
                                         if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, TRUE)) break;
  
                                         /* And ready to receive another command. */
-                                       UartReset();
+                                       UartInit(receivedCmd, receivedCmdPar);
                                         
                                         /* And also reset the demod code */
                                         DemodReset();
                                         
                                         /* And also reset the demod code */
                                         DemodReset();
@@ -2857,6 +3128,8 @@ void RAMFUNC SniffMifare(uint8_t param) {
  
                                         // And ready to receive another response.
                                         DemodReset();
  
                                         // And ready to receive another response.
                                         DemodReset();
+                                       // And reset the Miller decoder including its (now outdated) input buffer
+                                       UartInit(receivedCmd, receivedCmdPar);
                                 }
                                 TagIsActive = (Demod.state != DEMOD_UNSYNCD);
                         }
                                 }
                                 TagIsActive = (Demod.state != DEMOD_UNSYNCD);
                         }