CHG: doesnt flush the printf() calls

[proxmark3-svn] / armsrc / iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index c4298fcb4ae7612c45aa5eb50b11a8b8c609b01c..ef10b033e5f171286bd7663fa47dd7ec2e0cf606 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -17,6 +17,7 @@
 #include "cmd.h"
 #include "iso14443crc.h"
 #include "iso14443a.h"
 #include "cmd.h"
 #include "iso14443crc.h"
 #include "iso14443a.h"

+#include "iso14443b.h"

 #include "crapto1.h"
 #include "mifareutil.h"
 #include "BigBuf.h"
 #include "crapto1.h"
 #include "mifareutil.h"
 #include "BigBuf.h"


@@ -145,11 +146,11 @@ void iso14a_set_ATS_timeout(uint8_t *ats) {
                                tb1 = ats[2];
 
                        fwi = (tb1 & 0xf0) >> 4;                        // frame waiting indicator (FWI)
                                tb1 = ats[2];
 
                        fwi = (tb1 & 0xf0) >> 4;                        // frame waiting indicator (FWI)

-                       //fwt = 256 * 16 * (1 << fwi);          // frame waiting time (FWT) in 1/fc
-                       fwt = 4096 * (1 << fwi);
+                       fwt = 256 * 16 * (1 << fwi);            // frame waiting time (FWT) in 1/fc
+                       //fwt = 4096 * (1 << fwi);

                        
                        

-                       //iso14a_set_timeout(fwt/(8*16));
-                       iso14a_set_timeout(fwt/128);
+                       iso14a_set_timeout(fwt/(8*16));
+                       //iso14a_set_timeout(fwt/128);

                }
        }
 }
                }
        }
 }


@@ -187,12 +188,6 @@ 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);
 }
 

-void AppendCrc14443b(uint8_t* data, int len)
-{
-       ComputeCrc14443(CRC_14443_B,data,len,data+len,data+len+1);
-}
-
-

 //=============================================================================
 // ISO 14443 Type A - Miller decoder
 //=============================================================================
 //=============================================================================
 // ISO 14443 Type A - Miller decoder
 //=============================================================================


@@ -436,7 +431,6 @@ void DemodInit(uint8_t *data, uint8_t *parity)
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 static RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time)
 {
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 static RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time)
 {

-

        Demod.twoBits = (Demod.twoBits << 8) | bit;
        
        if (Demod.state == DEMOD_UNSYNCD) {
        Demod.twoBits = (Demod.twoBits << 8) | bit;
        
        if (Demod.state == DEMOD_UNSYNCD) {


@@ -546,7 +540,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
        
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first
        
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first

-       BigBuf_free();
+       BigBuf_free(); BigBuf_Clear_ext(false);

        
        // init trace buffer
        clear_trace();
        
        // init trace buffer
        clear_trace();


@@ -745,13 +739,12 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
        ToSend[++ToSendMax] = SEC_F;
 
        // Convert from last byte pos to length
        ToSend[++ToSendMax] = SEC_F;
 
        // Convert from last byte pos to length

-       ToSendMax++;
+       ++ToSendMax;

 }
 
 static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len)
 {
        uint8_t par[MAX_PARITY_SIZE] = {0};
 }
 
 static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len)
 {
        uint8_t par[MAX_PARITY_SIZE] = {0};

-       

        GetParity(cmd, len, par);
        CodeIso14443aAsTagPar(cmd, len, par);
 }
        GetParity(cmd, len, par);
        CodeIso14443aAsTagPar(cmd, len, par);
 }


@@ -808,7 +801,7 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int
     LED_D_OFF();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
     LED_D_OFF();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 

-    // Now run a `software UART' on the stream of incoming samples.
+    // Now run a `software UART` on the stream of incoming samples.

        UartInit(received, parity);
 
        // clear RXRDY:
        UartInit(received, parity);
 
        // clear RXRDY:


@@ -842,11 +835,11 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 static uint8_t* free_buffer_pointer;
 
 typedef struct {
 static uint8_t* free_buffer_pointer;
 
 typedef struct {

-  uint8_t* response;
-  size_t   response_n;
-  uint8_t* modulation;
-  size_t   modulation_n;
-  uint32_t ProxToAirDuration;
+       uint8_t* response;
+       size_t   response_n;
+       uint8_t* modulation;
+       size_t   modulation_n;
+       uint32_t ProxToAirDuration;

 } tag_response_info_t;
 
 bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffer_size) {
 } tag_response_info_t;
 
 bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffer_size) {


@@ -892,20 +885,20 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453 
 
 bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453 
 
 bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {

-  // Retrieve and store the current buffer index
-  response_info->modulation = free_buffer_pointer;
-  
-  // Determine the maximum size we can use from our buffer
-  size_t max_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
-  
-  // Forward the prepare tag modulation function to the inner function
-  if (prepare_tag_modulation(response_info, max_buffer_size)) {
-    // Update the free buffer offset
-    free_buffer_pointer += ToSendMax;
-    return true;
-  } else {
-    return false;
-  }
+       // Retrieve and store the current buffer index
+       response_info->modulation = free_buffer_pointer;
+
+       // Determine the maximum size we can use from our buffer
+       size_t max_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
+
+       // Forward the prepare tag modulation function to the inner function
+       if (prepare_tag_modulation(response_info, max_buffer_size)) {
+               // Update the free buffer offset
+               free_buffer_pointer += ToSendMax;
+               return true;
+       } else {
+               return false;
+       }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -1167,20 +1160,12 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data)
                                p_response = NULL;
                                
                } else if(receivedCmd[0] == 0x3C && tagType == 7) {     // Received a READ SIGNATURE -- 
                                p_response = NULL;
                                
                } else if(receivedCmd[0] == 0x3C && tagType == 7) {     // Received a READ SIGNATURE -- 

-                               // ECC data,  taken from a NTAG215 amiibo token. might work. LEN: 32, + 2 crc

                                //first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
                                uint16_t start = 4 * 4;
                                uint8_t emdata[34];
                                emlGetMemBt( emdata, start, 32);
                                AppendCrc14443a(emdata, 32);
                                EmSendCmdEx(emdata, sizeof(emdata), false);
                                //first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
                                uint16_t start = 4 * 4;
                                uint8_t emdata[34];
                                emlGetMemBt( emdata, start, 32);
                                AppendCrc14443a(emdata, 32);
                                EmSendCmdEx(emdata, sizeof(emdata), false);

-                               //uint8_t data[] = {0x56,0x06,0xa6,0x4f,0x43,0x32,0x53,0x6f,
-                               //                                0x43,0xda,0x45,0xd6,0x61,0x38,0xaa,0x1e,
-                               //                                0xcf,0xd3,0x61,0x36,0xca,0x5f,0xbb,0x05,
-                               //                                0xce,0x21,0x24,0x5b,0xa6,0x7a,0x79,0x07,
-                               //                                0x00,0x00};
-                               //AppendCrc14443a(data, sizeof(data)-2);
-                               //EmSendCmdEx(data,sizeof(data),false);

                                p_response = NULL;                                      
                } else if (receivedCmd[0] == 0x39 && tagType == 7) {    // Received a READ COUNTER -- 
                        uint8_t index = receivedCmd[1];
                                p_response = NULL;                                      
                } else if (receivedCmd[0] == 0x39 && tagType == 7) {    // Received a READ COUNTER -- 
                        uint8_t index = receivedCmd[1];


@@ -1210,9 +1195,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data)
                        emlGetMemBt( emdata, 10+counter, 1);
                        AppendCrc14443a(emdata, sizeof(emdata)-2);
                        EmSendCmdEx(emdata, sizeof(emdata), false);     
                        emlGetMemBt( emdata, 10+counter, 1);
                        AppendCrc14443a(emdata, sizeof(emdata)-2);
                        EmSendCmdEx(emdata, sizeof(emdata), false);     

-                       p_response = NULL;
-                       //p_response = &responses[9];                           
-               
+                       p_response = NULL;              

                } else if(receivedCmd[0] == 0x50) {     // Received a HALT
                        LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                        p_response = NULL;
                } else if(receivedCmd[0] == 0x50) {     // Received a HALT
                        LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
                        p_response = NULL;


@@ -1224,7 +1207,6 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data)
                                AppendCrc14443a(emdata, sizeof(emdata)-2);
                                EmSendCmdEx(emdata, sizeof(emdata), false);     
                                p_response = NULL;
                                AppendCrc14443a(emdata, sizeof(emdata)-2);
                                EmSendCmdEx(emdata, sizeof(emdata), false);     
                                p_response = NULL;

-                               //p_response = &responses[7];

                        } else {
                                p_response = &responses[5]; order = 7;
                        }
                        } else {
                                p_response = &responses[5]; order = 7;
                        }


@@ -1299,7 +1281,6 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data)
                                AppendCrc14443a(emdata, 2);
                                EmSendCmdEx(emdata, sizeof(emdata), false);
                                p_response = NULL;
                                AppendCrc14443a(emdata, 2);
                                EmSendCmdEx(emdata, sizeof(emdata), false);
                                p_response = NULL;

-                               //p_response =  &responses[8]; // PACK response

                                uint32_t pwd = bytes_to_num(receivedCmd+1,4);
                                
                                if ( MF_DBGLEVEL >= 3)  Dbprintf("Auth attempt: %08x", pwd);    
                                uint32_t pwd = bytes_to_num(receivedCmd+1,4);
                                
                                if ( MF_DBGLEVEL >= 3)  Dbprintf("Auth attempt: %08x", pwd);    


@@ -1439,7 +1420,7 @@ void PrepareDelayedTransfer(uint16_t delay)
        for (i = 0; i < delay; ++i)
                bitmask |= (0x01 << i);
 
        for (i = 0; i < delay; ++i)
                bitmask |= (0x01 << i);
 

-               ToSend[++ToSendMax] = 0x00;
+       ToSend[++ToSendMax] = 0x00;

 
        for (i = 0; i < ToSendMax; ++i) {
                        bits_to_shift = ToSend[i] & bitmask;
 
        for (i = 0; i < ToSendMax; ++i) {
                        bits_to_shift = ToSend[i] & bitmask;


@@ -1465,21 +1446,13 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
        uint32_t ThisTransferTime = 0;
 
        if (timing) {
        uint32_t ThisTransferTime = 0;
 
        if (timing) {

-
-               if (*timing != 0)
-                       // Delay transfer (fine tuning - up to 7 MF clock ticks)
-                       PrepareDelayedTransfer(*timing & 0x00000007);   
-               else
-                       // Measure time
+               if(*timing == 0) {                                                                              // Measure time

                        *timing = (GetCountSspClk() + 8) & 0xfffffff8;
                        *timing = (GetCountSspClk() + 8) & 0xfffffff8;

-
-               
-               if (MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8)) 
-                       Dbprintf("TransmitFor14443a: Missed timing");
-               
-               // Delay transfer (multiple of 8 MF clock ticks)
-               while (GetCountSspClk() < (*timing & 0xfffffff8));      
-
+               } else {
+                       PrepareDelayedTransfer(*timing & 0x00000007);           // Delay transfer (fine tuning - up to 7 MF clock ticks)
+               }
+               if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8)) Dbprintf("TransmitFor14443a: Missed timing");
+               while(GetCountSspClk() < (*timing & 0xfffffff8));               // Delay transfer (multiple of 8 MF clock ticks)

                LastTimeProxToAirStart = *timing;
        } else {
                ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);
                LastTimeProxToAirStart = *timing;
        } else {
                ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);


@@ -1591,8 +1564,7 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 //-----------------------------------------------------------------------------
 void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity)
 {
 //-----------------------------------------------------------------------------
 void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity)
 {

-  //CodeIso14443aBitsAsReaderPar(cmd, len*8, parity);
-  CodeIso14443aBitsAsReaderPar(cmd, len<<3, parity);
+  CodeIso14443aBitsAsReaderPar(cmd, len*8, parity);

 }
 
 
 }
 
 


@@ -1856,16 +1828,14 @@ 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)
 {
 
 void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *timing)
 {

-  //ReaderTransmitBitsPar(frame, len*8, par, timing);
-  ReaderTransmitBitsPar(frame, len<<3, par, timing);
+  ReaderTransmitBitsPar(frame, len*8, par, timing);

 }
 
 void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing)
 {
   // Generate parity and redirect
   uint8_t par[MAX_PARITY_SIZE] = {0x00};
 }
 
 void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing)
 {
   // Generate parity and redirect
   uint8_t par[MAX_PARITY_SIZE] = {0x00};

-  //GetParity(frame, len/8, par);
-  GetParity(frame, len >> 3, par);
+  GetParity(frame, len/8, par);  

   ReaderTransmitBitsPar(frame, len, par, timing);
 }
 
   ReaderTransmitBitsPar(frame, len, par, timing);
 }
 


@@ -1874,27 +1844,24 @@ void ReaderTransmit(uint8_t* frame, uint16_t len, uint32_t *timing)
   // Generate parity and redirect
   uint8_t par[MAX_PARITY_SIZE] = {0x00};
   GetParity(frame, len, par);
   // Generate parity and redirect
   uint8_t par[MAX_PARITY_SIZE] = {0x00};
   GetParity(frame, len, par);

-  //ReaderTransmitBitsPar(frame, len*8, par, timing);
-  ReaderTransmitBitsPar(frame, len<<3, par, timing);
+  ReaderTransmitBitsPar(frame, len*8, par, timing);

 }
 
 int ReaderReceiveOffset(uint8_t* receivedAnswer, uint16_t offset, uint8_t *parity)
 {
 }
 
 int ReaderReceiveOffset(uint8_t* receivedAnswer, uint16_t offset, uint8_t *parity)
 {

-       if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset)) 
-               return FALSE;
-
-       //LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, FALSE);
-       LogTrace(receivedAnswer, Demod.len, (Demod.startTime<<4) - DELAY_AIR2ARM_AS_READER, (Demod.endTime<<4) - DELAY_AIR2ARM_AS_READER, parity, FALSE);
+       if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset)) return FALSE;
+       //if (tracing) {
+               LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, FALSE);
+       //}

        return Demod.len;
 }
 
 int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
 {
        return Demod.len;
 }
 
 int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
 {

-       if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0)) 
-               return FALSE;
-
-       //LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, FALSE);
-       LogTrace(receivedAnswer, Demod.len, (Demod.startTime<<4) - DELAY_AIR2ARM_AS_READER, (Demod.endTime<<4) - DELAY_AIR2ARM_AS_READER, parity, FALSE);
+       if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0)) return FALSE;
+       //if (tracing) {
+               LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, FALSE);
+       //}

        return Demod.len;
 }
 
        return Demod.len;
 }
 


@@ -2061,23 +2028,24 @@ void iso14443a_setup(uint8_t fpga_minor_mode) {
        FpgaSetupSsc();
        // connect Demodulated Signal to ADC:
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
        // connect Demodulated Signal to ADC:
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

-
+       
+       LED_D_OFF();

        // Signal field is on with the appropriate LED
        // Signal field is on with the appropriate LED

-       if (fpga_minor_mode == FPGA_HF_ISO14443A_READER_MOD
-               || fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN) {
+       if (fpga_minor_mode == FPGA_HF_ISO14443A_READER_MOD ||
+               fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN)

                LED_D_ON();
                LED_D_ON();

-       } else {
-               LED_D_OFF();
-       }
+

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
 

-       // Start the timer
-       StartCountSspClk();
-       

        DemodReset();
        UartReset();
        DemodReset();
        UartReset();

-       NextTransferTime = 2*DELAY_ARM2AIR_AS_READER;
+

        iso14a_set_timeout(10*106); // 10ms default
        iso14a_set_timeout(10*106); // 10ms default

+       
+       // Start the timer
+       StartCountSspClk();
+
+       NextTransferTime = 2*DELAY_ARM2AIR_AS_READER;

 }
 
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 }
 
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {


@@ -2092,12 +2060,14 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
  
        ReaderTransmit(real_cmd, cmd_len+4, NULL);
        size_t len = ReaderReceive(data, parity);
  
        ReaderTransmit(real_cmd, cmd_len+4, NULL);
        size_t len = ReaderReceive(data, parity);

+        //DATA LINK ERROR
+       if (!len) return 0;
+       

        uint8_t *data_bytes = (uint8_t *) data;
        uint8_t *data_bytes = (uint8_t *) data;

-       if (!len)
-               return 0; //DATA LINK ERROR
+

        // if we received an I- or R(ACK)-Block with a block number equal to the
        // current block number, toggle the current block number
        // if we received an I- or R(ACK)-Block with a block number equal to the
        // current block number, toggle the current block number

-       else if (len >= 4 // PCB+CID+CRC = 4 bytes
+       if (len >= 4 // PCB+CID+CRC = 4 bytes

                 && ((data_bytes[0] & 0xC0) == 0 // I-Block
                     || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
                 && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
                 && ((data_bytes[0] & 0xC0) == 0 // I-Block
                     || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
                 && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers


@@ -2131,13 +2101,14 @@ void ReaderIso14443a(UsbCommand *c)
        if (param & ISO14A_REQUEST_TRIGGER)
                iso14a_set_trigger(TRUE);
 
        if (param & ISO14A_REQUEST_TRIGGER)
                iso14a_set_trigger(TRUE);
 

-

        if (param & ISO14A_CONNECT) {
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
                if(!(param & ISO14A_NO_SELECT)) {
                        iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
                        arg0 = iso14443a_select_card(NULL,card,NULL, true, 0);
                        cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));
        if (param & ISO14A_CONNECT) {
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
                if(!(param & ISO14A_NO_SELECT)) {
                        iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
                        arg0 = iso14443a_select_card(NULL,card,NULL, true, 0);
                        cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));

+                       // if it fails,  the cmdhf14a.c client quites.. however this one still executes.
+                       if ( arg0 == 0 ) return;

                }
        }
 
                }
        }
 


@@ -2206,64 +2177,19 @@ void ReaderIso14443a(UsbCommand *c)
 // Therefore try in alternating directions.
 int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 
 // Therefore try in alternating directions.
 int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 

-       if (nt1 == nt2) return 0;
-

        uint16_t i;
        uint16_t i;

-       uint32_t nttmp1 = nt1;
-       uint32_t nttmp2 = nt2;
-       
-       for (i = 1; i < 0xFFFF; i += 8) {
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+1;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+1;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+2;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+2;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+3;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+3;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+4;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+4;
+       uint32_t nttmp1, nttmp2;

 
 

-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+5;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+5;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+6;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+6;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+7;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+7;
-
-               nttmp1 = prng_successor_one(nttmp1); if (nttmp1 == nt2) return i+8;
-               nttmp2 = prng_successor_one(nttmp2); if (nttmp2 == nt1) return -i+8;
-/*
-               if ( prng_successor(nttmp1, i) == nt2) return i;
-               if ( prng_successor(nttmp2, i) == nt1) return -i;
-
-               if ( prng_successor(nttmp1, i+2) == nt2) return i+2;
-               if ( prng_successor(nttmp2, i+2) == nt1) return -(i+2);
-
-               if ( prng_successor(nttmp1, i+3) == nt2) return i+3;
-               if ( prng_successor(nttmp2, i+3) == nt1) return -(i+3);
-
-               if ( prng_successor(nttmp1, i+4) == nt2) return i+4;
-               if ( prng_successor(nttmp2, i+4) == nt1) return -(i+4);
-
-               if ( prng_successor(nttmp1, i+5) == nt2) return i+5;
-               if ( prng_successor(nttmp2, i+5) == nt1) return -(i+5);
-
-               if ( prng_successor(nttmp1, i+6) == nt2) return i+6;
-               if ( prng_successor(nttmp2, i+6) == nt1) return -(i+6);
-
-               if ( prng_successor(nttmp1, i+7) == nt2) return i+7;
-               if ( prng_successor(nttmp2, i+7) == nt1) return -(i+7);
+       if (nt1 == nt2) return 0;

 
 

-               if ( prng_successor(nttmp1, i+8) == nt2) return i+8;
-               if ( prng_successor(nttmp2, i+8) == nt1) return -(i+8);
-*/
+       nttmp1 = nt1;
+       nttmp2 = nt2;
+       
+       for (i = 1; i < 32768; i++) {
+               nttmp1 = prng_successor(nttmp1, 1);
+               if (nttmp1 == nt2) return i;
+               nttmp2 = prng_successor(nttmp2, 1);
+               if (nttmp2 == nt1) return -i;

        }
        
        return(-99999); // either nt1 or nt2 are invalid nonces
        }
        
        return(-99999); // either nt1 or nt2 are invalid nonces


@@ -2281,73 +2207,72 @@ void ReaderMifare(bool first_try, uint8_t block )
        // Mifare AUTH
        //uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
        //uint8_t mf_auth[]    = { 0x60,0x05, 0x58, 0x2c };
        // Mifare AUTH
        //uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
        //uint8_t mf_auth[]    = { 0x60,0x05, 0x58, 0x2c };

-       uint8_t mf_auth[]    = { 0x60,0x00, 0x00, 0x00 };
-       uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-       static uint8_t mf_nr_ar3 = 0;
-
-       mf_auth[1] = block;
-       AppendCrc14443a(mf_auth, 2);
-       
+       uint8_t mf_auth[]       = { 0x60,0x00, 0x00, 0x00 };
+       uint8_t mf_nr_ar[]      = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+       uint8_t uid[10]         = {0,0,0,0,0,0,0,0,0,0};
+       uint8_t par_list[8]     = {0,0,0,0,0,0,0,0};
+       uint8_t ks_list[8]      = {0,0,0,0,0,0,0,0};

        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};

+       uint8_t par[1] = {0};   // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
+       
+       mf_auth[1] = block;
+       AppendCrc14443a(mf_auth, 2);

 
        byte_t nt_diff = 0;
 
        byte_t nt_diff = 0;

-       uint8_t par[1] = {0};   // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
-       static byte_t par_low = 0;
-       uint8_t uid[10] = {0};
-       //uint32_t cuid = 0;

 
        uint32_t nt = 0;
 
        uint32_t nt = 0;

-       uint32_t previous_nt = 0;
-       static uint32_t nt_attacked = 0;
-       byte_t par_list[8] = {0x00};
-       byte_t ks_list[8] = {0x00};
-
-       static uint32_t sync_time = 0;
-       static int32_t sync_cycles = 0;
+       uint32_t previous_nt = 0;       
+       uint32_t halt_time = 0;
+       uint32_t cuid = 0;
+       

        int catch_up_cycles = 0;
        int last_catch_up = 0;
        int catch_up_cycles = 0;
        int last_catch_up = 0;

+       int isOK = 0;
+       

        uint16_t elapsed_prng_sequences = 1;
        uint16_t consecutive_resyncs = 0;
        uint16_t elapsed_prng_sequences = 1;
        uint16_t consecutive_resyncs = 0;

-       int isOK = 0;
-
-       #define PRNG_SEQUENCE_LENGTH  (1 << 16);
-       #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;
        uint16_t strategy = 0;
        uint16_t unexpected_random = 0;
        uint16_t sync_tries = 0;
        uint16_t strategy = 0;

-       uint32_t halt_time = 0;

 
 

+       static uint32_t nt_attacked = 0;
+       static uint32_t sync_time = 0;
+       static int32_t sync_cycles = 0;
+       static uint8_t par_low = 0;
+       static uint8_t mf_nr_ar3 = 0;
+
+       #define PRNG_SEQUENCE_LENGTH    (1 << 16)
+       #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 MAX_STRATEGY            3
+
+       // free eventually allocated BigBuf memory
+       BigBuf_free(); BigBuf_Clear_ext(false);
+       

        clear_trace();
        set_tracing(TRUE);
        
        LED_A_ON();
        clear_trace();
        set_tracing(TRUE);
        
        LED_A_ON();

-       LED_B_OFF();
-       LED_C_OFF();

        
        if (first_try)
                iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
        
        if (first_try)
                iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);

-       
-       // free eventually allocated BigBuf memory. We want all for tracing.
-       BigBuf_free();

 
        if (first_try) { 
                sync_time = GetCountSspClk() & 0xfffffff8;
 
        if (first_try) { 
                sync_time = GetCountSspClk() & 0xfffffff8;

-               sync_cycles = PRNG_SEQUENCE_LENGTH; //65536;    //0x10000                       // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
+               sync_cycles = PRNG_SEQUENCE_LENGTH + 1100; //65536;     //0x10000                       // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).

                mf_nr_ar3 = 0;                  
                nt_attacked = 0;
                mf_nr_ar3 = 0;                  
                nt_attacked = 0;

-               par[0] = 0;
+

        } else {
        } else {

-               // we were unsuccessful on a previous call. Try another READER nonce (first 3 parity bits remain the same)
-               mf_nr_ar3++;
+               // we were unsuccessful on a previous call. 
+               // Try another READER nonce (first 3 parity bits remain the same)
+               ++mf_nr_ar3;

                mf_nr_ar[3] = mf_nr_ar3;
                par[0] = par_low;
        }
                
                mf_nr_ar[3] = mf_nr_ar3;
                par[0] = par_low;
        }
                

+               LED_A_ON();

        LED_C_ON(); 
        for(uint16_t i = 0; TRUE; ++i) {
 
        LED_C_ON(); 
        for(uint16_t i = 0; TRUE; ++i) {
 


@@ -2378,18 +2303,22 @@ void ReaderMifare(bool first_try, uint8_t block )
                        WDT_HIT();
                }
                
                        WDT_HIT();
                }
                

-               if (!iso14443a_select_card(uid, NULL, NULL, true, 0)) {
-                       if (MF_DBGLEVEL >= 1) Dbprintf("Mifare: Can't select card\n");
+               if (!iso14443a_select_card(uid, NULL,  &cuid, true, 0)) {
+                       if (MF_DBGLEVEL >= 2) Dbprintf("Mifare: Can't select card\n");

                        continue;
                }
                        continue;
                }

+
+               // Sending timeslot of ISO14443a frame

                
                sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
                catch_up_cycles = 0;
                
                sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
                catch_up_cycles = 0;

+               
+               //catch_up_cycles = 0;

                                                                
                // if we missed the sync time already, advance to the next nonce repeat
                while(GetCountSspClk() > sync_time) {
                        ++elapsed_prng_sequences;
                                                                
                // if we missed the sync time already, advance to the next nonce repeat
                while(GetCountSspClk() > sync_time) {
                        ++elapsed_prng_sequences;

-                       sync_time += sync_cycles;
+                       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);                   


@@ -2425,7 +2354,7 @@ void ReaderMifare(bool first_try, uint8_t block )
                                                break;
                                        } else {
                                                continue;
                                                break;
                                        } else {
                                                continue;

-                                       }
+                               }

                                }
                                
                                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
                                }
                                
                                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;


@@ -2474,7 +2403,7 @@ void ReaderMifare(bool first_try, uint8_t block )
                }
  
                // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
                }
  
                // 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
        
                        if (nt_diff == 0)
                        catch_up_cycles = 8;    // the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
        
                        if (nt_diff == 0)


@@ -2494,6 +2423,7 @@ void ReaderMifare(bool first_try, uint8_t block )
                        par[0] = par_low;
                        
                } else {
                        par[0] = par_low;
                        
                } else {

+                       // No NACK.     

                        if (nt_diff == 0 && first_try) {
                                par[0]++;
                                if (par[0] == 0x00) {   // tried all 256 possible parities without success. Card doesn't send NACK.
                        if (nt_diff == 0 && first_try) {
                                par[0]++;
                                if (par[0] == 0x00) {   // tried all 256 possible parities without success. Card doesn't send NACK.


@@ -2501,6 +2431,7 @@ void ReaderMifare(bool first_try, uint8_t block )
                                        break;
                                }
                        } else {
                                        break;
                                }
                        } else {

+                               // Why this?

                                par[0] = ((par[0] & 0x1F) + 1) | par_low;
                        }
                }
                                par[0] = ((par[0] & 0x1F) + 1) | par_low;
                        }
                }


@@ -2521,8 +2452,8 @@ void ReaderMifare(bool first_try, uint8_t block )
                par[0] = 0;
        }
        
                par[0] = 0;
        }
        

-       byte_t buf[28] = {0x00};
-       memcpy(buf + 0,  uid, 4);
+       uint8_t buf[28] = {0x00};
+       num_to_bytes(cuid, 4, buf);

        num_to_bytes(nt, 4, buf + 4);
        memcpy(buf + 8,  par_list, 8);
        memcpy(buf + 16, ks_list, 8);
        num_to_bytes(nt, 4, buf + 4);
        memcpy(buf + 8,  par_list, 8);
        memcpy(buf + 16, ks_list, 8);


@@ -3081,6 +3012,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
        // bit 1 - trigger from first reader 7-bit request
        LEDsoff();
 
        // bit 1 - trigger from first reader 7-bit request
        LEDsoff();
 

+       // free eventually allocated BigBuf memory
+       BigBuf_free(); BigBuf_Clear_ext(false);
+       

        // init trace buffer
        clear_trace();
        set_tracing(TRUE);
        // init trace buffer
        clear_trace();
        set_tracing(TRUE);


@@ -3097,9 +3031,6 @@ void RAMFUNC SniffMifare(uint8_t param) {
 
        iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
 
        iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 

-       // free eventually allocated BigBuf memory
-       BigBuf_free();
-       

        // allocate the DMA buffer, used to stream samples from the FPGA
        uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
        uint8_t *data = dmaBuf;
        // allocate the DMA buffer, used to stream samples from the FPGA
        uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
        uint8_t *data = dmaBuf;