]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/iso14443a.c
linux patch by Wil
[proxmark3-svn] / armsrc / iso14443a.c
index c0bdb7426248137613f05a440d35ef637917691f..9e1eea540c34e52ca23c5839794f0d6a0835794e 100644 (file)
@@ -1,5 +1,7 @@
 //-----------------------------------------------------------------------------
+// Merlok - June 2011
 // Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 #include "string.h"
 
 #include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1.h"
+#include "mifareutil.h"
 
 static uint8_t *trace = (uint8_t *) BigBuf;
 static int traceLen = 0;
 static int rsamples = 0;
 static int tracing = TRUE;
-
-typedef enum {
-       SEC_D = 1,
-       SEC_E = 2,
-       SEC_F = 3,
-       SEC_X = 4,
-       SEC_Y = 5,
-       SEC_Z = 6
-} SecType;
+static uint32_t iso14a_timeout;
+
+// CARD TO READER
+// Sequence D: 11110000 modulation with subcarrier during first half
+// Sequence E: 00001111 modulation with subcarrier during second half
+// Sequence F: 00000000 no modulation with subcarrier
+// READER TO CARD
+// Sequence X: 00001100 drop after half a period
+// Sequence Y: 00000000 no drop
+// Sequence Z: 11000000 drop at start
+#define        SEC_D 0xf0
+#define        SEC_E 0x0f
+#define        SEC_F 0x00
+#define        SEC_X 0x0c
+#define        SEC_Y 0x00
+#define        SEC_Z 0xc0
 
 static const uint8_t OddByteParity[256] = {
   1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
@@ -55,10 +67,20 @@ static const uint8_t OddByteParity[256] = {
 #define DMA_BUFFER_SIZE   4096
 #define TRACE_LENGTH      3000
 
+uint8_t trigger = 0;
+void iso14a_set_trigger(int enable) {
+       trigger = enable;
+}
+
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //
 //-----------------------------------------------------------------------------
+byte_t oddparity (const byte_t bt)
+{
+  return OddByteParity[bt];
+}
+
 uint32_t GetParity(const uint8_t * pbtCmd, int iLen)
 {
   int i;
@@ -72,12 +94,12 @@ uint32_t GetParity(const uint8_t * pbtCmd, int iLen)
   return dwPar;
 }
 
-static void AppendCrc14443a(uint8_t* data, int len)
+void AppendCrc14443a(uint8_t* data, int len)
 {
   ComputeCrc14443(CRC_14443_A,data,len,data+len,data+len+1);
 }
 
-int LogTrace(const uint8_t * btBytes, size_t iLen, int iSamples, uint32_t dwParity, int bReader)
+int LogTrace(const uint8_t * btBytes, int iLen, int iSamples, uint32_t dwParity, int bReader)
 {
   // Return when trace is full
   if (traceLen >= TRACE_LENGTH) return FALSE;
@@ -101,11 +123,6 @@ int LogTrace(const uint8_t * btBytes, size_t iLen, int iSamples, uint32_t dwPari
   return TRUE;
 }
 
-int LogTraceInfo(byte_t* data, size_t len)
-{
-  return LogTrace(data,len,0,GetParity(data,len),TRUE);
-}
-
 //-----------------------------------------------------------------------------
 // The software UART that receives commands from the reader, and its state
 // variables.
@@ -137,7 +154,7 @@ static struct {
     uint8_t   *output;
 } Uart;
 
-static int MillerDecoding(int bit)
+static RAMFUNC int MillerDecoding(int bit)
 {
        int error = 0;
        int bitright;
@@ -339,7 +356,7 @@ static int MillerDecoding(int bit)
                                if(!Uart.syncBit)       { Uart.syncBit = bit & 2; Uart.samples = 1; }
                                else if(bit & 2)        { Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; }
                                if(!Uart.syncBit)       { Uart.syncBit = bit & 1; Uart.samples = 0;
-                                       if(Uart.syncBit & (Uart.bitBuffer & 8)) {
+                                       if(Uart.syncBit && (Uart.bitBuffer & 8)) {
                                                Uart.syncBit = 8;
 
                                                // the first half bit period is expected in next sample
@@ -401,7 +418,7 @@ static struct {
     uint8_t   *output;
 } Demod;
 
-static int ManchesterDecoding(int v)
+static RAMFUNC int ManchesterDecoding(int v)
 {
        int bit;
        int modulation;
@@ -422,28 +439,29 @@ static int ManchesterDecoding(int v)
                Demod.syncBit = 0;
                //Demod.samples = 0;
                Demod.posCount = 1;             // This is the first half bit period, so after syncing handle the second part
-               if(bit & 0x08) { Demod.syncBit = 0x08; }
-               if(!Demod.syncBit)      {
-                       if(bit & 0x04) { Demod.syncBit = 0x04; }
-               }
-               else if(bit & 0x04) { Demod.syncBit = 0x04; bit <<= 4; }
-               if(!Demod.syncBit)      {
-                       if(bit & 0x02) { Demod.syncBit = 0x02; }
+
+               if(bit & 0x08) {
+                       Demod.syncBit = 0x08;
                }
-               else if(bit & 0x02) { Demod.syncBit = 0x02; bit <<= 4; }
-               if(!Demod.syncBit)      {
-                       if(bit & 0x01) { Demod.syncBit = 0x01; }
 
-                       if(Demod.syncBit & (Demod.buffer & 0x08)) {
-                               Demod.syncBit = 0x08;
+               if(bit & 0x04) {
+                       if(Demod.syncBit) {
+                               bit <<= 4;
+                       }
+                       Demod.syncBit = 0x04;
+               }
 
-                               // The first half bitperiod is expected in next sample
-                               Demod.posCount = 0;
-                               Demod.output[Demod.len] = 0xfb;
+               if(bit & 0x02) {
+                       if(Demod.syncBit) {
+                               bit <<= 2;
                        }
+                       Demod.syncBit = 0x02;
                }
-               else if(bit & 0x01) { Demod.syncBit = 0x01; }
 
+               if(bit & 0x01 && Demod.syncBit) {
+                       Demod.syncBit = 0x01;
+               }
+               
                if(Demod.syncBit) {
                        Demod.len = 0;
                        Demod.state = DEMOD_START_OF_COMMUNICATION;
@@ -453,6 +471,7 @@ static int ManchesterDecoding(int v)
                        Demod.parityBits = 0;
                        Demod.samples = 0;
                        if(Demod.posCount) {
+                               if(trigger) LED_A_OFF();
                                switch(Demod.syncBit) {
                                        case 0x08: Demod.samples = 3; break;
                                        case 0x04: Demod.samples = 2; break;
@@ -597,7 +616,7 @@ static int ManchesterDecoding(int v)
 // triggering so that we start recording at the point that the tag is moved
 // near the reader.
 //-----------------------------------------------------------------------------
-void SnoopIso14443a(void)
+void RAMFUNC SnoopIso14443a(void)
 {
 //     #define RECV_CMD_OFFSET         2032    // original (working as of 21/2/09) values
 //     #define RECV_RES_OFFSET         2096    // original (working as of 21/2/09) values
@@ -608,7 +627,7 @@ void SnoopIso14443a(void)
     // 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.
-    int triggered = TRUE; // FALSE to wait first for card
+    int triggered = FALSE; // FALSE to wait first for card
 
     // The command (reader -> tag) that we're receiving.
        // The length of a received command will in most cases be no more than 18 bytes.
@@ -620,7 +639,8 @@ void SnoopIso14443a(void)
     // 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;
-    //int traceLen = 0;
+    
+    traceLen = 0; // uncommented to fix ISSUE 15 - gerhard - jan2011
 
     // The DMA buffer, used to stream samples from the FPGA
     int8_t *dmaBuf = ((int8_t *)BigBuf) + DMA_BUFFER_OFFSET;
@@ -632,7 +652,7 @@ void SnoopIso14443a(void)
     // Count of samples received so far, so that we can include timing
     // information in the trace buffer.
     int samples = 0;
-       int rsamples = 0;
+    int rsamples = 0;
 
     memset(trace, 0x44, RECV_CMD_OFFSET);
 
@@ -641,6 +661,12 @@ void SnoopIso14443a(void)
     Demod.len = 0;
     Demod.state = DEMOD_UNSYNCD;
 
+    // Setup for the DMA.
+    FpgaSetupSsc();
+    upTo = dmaBuf;
+    lastRxCounter = DMA_BUFFER_SIZE;
+    FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
+
     // And the reader -> tag commands
     memset(&Uart, 0, sizeof(Uart));
     Uart.output = receivedCmd;
@@ -653,28 +679,23 @@ void SnoopIso14443a(void)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_SNIFFER);
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-       // Setup for the DMA.
-    FpgaSetupSsc();
-    upTo = dmaBuf;
-    lastRxCounter = DMA_BUFFER_SIZE;
-    FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
-
-    LED_A_ON();
 
     // And now we loop, receiving samples.
     for(;;) {
-               WDT_HIT();
+        LED_A_ON();
+        WDT_HIT();
         int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) &
                                 (DMA_BUFFER_SIZE-1);
         if(behindBy > maxBehindBy) {
             maxBehindBy = behindBy;
             if(behindBy > 400) {
-                DbpString("blew circular buffer!");
+                Dbprintf("blew circular buffer! behindBy=0x%x", behindBy);
                 goto done;
             }
         }
         if(behindBy < 1) continue;
 
+       LED_A_OFF();
         smpl = upTo[0];
         upTo++;
         lastRxCounter -= 1;
@@ -686,60 +707,58 @@ void SnoopIso14443a(void)
         }
 
         samples += 4;
-#define HANDLE_BIT_IF_BODY \
-            LED_C_ON(); \
-                       if(triggered) { \
-                               trace[traceLen++] = ((rsamples >>  0) & 0xff); \
-                trace[traceLen++] = ((rsamples >>  8) & 0xff); \
-                trace[traceLen++] = ((rsamples >> 16) & 0xff); \
-                trace[traceLen++] = ((rsamples >> 24) & 0xff); \
-                               trace[traceLen++] = ((Uart.parityBits >>  0) & 0xff); \
-                               trace[traceLen++] = ((Uart.parityBits >>  8) & 0xff); \
-                               trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff); \
-                               trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff); \
-                trace[traceLen++] = Uart.byteCnt; \
-                memcpy(trace+traceLen, receivedCmd, Uart.byteCnt); \
-                traceLen += Uart.byteCnt; \
-                if(traceLen > TRACE_LENGTH) break; \
-            } \
-            /* And ready to receive another command. */ \
-            Uart.state = STATE_UNSYNCD; \
-            /* And also reset the demod code, which might have been */ \
-            /* false-triggered by the commands from the reader. */ \
-            Demod.state = DEMOD_UNSYNCD; \
-                       LED_B_OFF(); \
-
-               if(MillerDecoding((smpl & 0xF0) >> 4)) {
+        if(MillerDecoding((smpl & 0xF0) >> 4)) {
             rsamples = samples - Uart.samples;
-                       HANDLE_BIT_IF_BODY
+            LED_C_ON();
+            if(triggered) {
+                trace[traceLen++] = ((rsamples >>  0) & 0xff);
+                trace[traceLen++] = ((rsamples >>  8) & 0xff);
+                trace[traceLen++] = ((rsamples >> 16) & 0xff);
+                trace[traceLen++] = ((rsamples >> 24) & 0xff);
+                trace[traceLen++] = ((Uart.parityBits >>  0) & 0xff);
+                trace[traceLen++] = ((Uart.parityBits >>  8) & 0xff);
+                trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff);
+                trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff);
+                trace[traceLen++] = Uart.byteCnt;
+                memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
+                traceLen += Uart.byteCnt;
+                if(traceLen > TRACE_LENGTH) break;
+            }
+            /* And ready to receive another command. */
+            Uart.state = STATE_UNSYNCD;
+            /* And also reset the demod code, which might have been */
+            /* false-triggered by the commands from the reader. */
+            Demod.state = DEMOD_UNSYNCD;
+            LED_B_OFF();
         }
-               if(ManchesterDecoding(smpl & 0x0F)) {
-                       rsamples = samples - Demod.samples;
-                       LED_B_ON();
 
-                       // timestamp, as a count of samples
-                       trace[traceLen++] = ((rsamples >>  0) & 0xff);
-                       trace[traceLen++] = ((rsamples >>  8) & 0xff);
-                       trace[traceLen++] = ((rsamples >> 16) & 0xff);
-                       trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff);
-                       trace[traceLen++] = ((Demod.parityBits >>  0) & 0xff);
-                       trace[traceLen++] = ((Demod.parityBits >>  8) & 0xff);
-                       trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff);
-                       trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff);
-                       // length
-                       trace[traceLen++] = Demod.len;
-                       memcpy(trace+traceLen, receivedResponse, Demod.len);
-                       traceLen += Demod.len;
-                       if(traceLen > TRACE_LENGTH) break;
-
-               triggered = TRUE;
+        if(ManchesterDecoding(smpl & 0x0F)) {
+            rsamples = samples - Demod.samples;
+            LED_B_ON();
+
+            // timestamp, as a count of samples
+            trace[traceLen++] = ((rsamples >>  0) & 0xff);
+            trace[traceLen++] = ((rsamples >>  8) & 0xff);
+            trace[traceLen++] = ((rsamples >> 16) & 0xff);
+            trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff);
+            trace[traceLen++] = ((Demod.parityBits >>  0) & 0xff);
+            trace[traceLen++] = ((Demod.parityBits >>  8) & 0xff);
+            trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff);
+            trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff);
+            // length
+            trace[traceLen++] = Demod.len;
+            memcpy(trace+traceLen, receivedResponse, Demod.len);
+            traceLen += Demod.len;
+            if(traceLen > TRACE_LENGTH) break;
+
+            triggered = TRUE;
 
             // And ready to receive another response.
             memset(&Demod, 0, sizeof(Demod));
             Demod.output = receivedResponse;
             Demod.state = DEMOD_UNSYNCD;
-                       LED_C_OFF();
-               }
+            LED_C_OFF();
+        }
 
         if(BUTTON_PRESS()) {
             DbpString("cancelled_a");
@@ -762,47 +781,6 @@ done:
        LED_D_OFF();
 }
 
-// Prepare communication bits to send to FPGA
-void Sequence(SecType seq)
-{
-       ToSendMax++;
-       switch(seq) {
-       // CARD TO READER
-       case SEC_D:
-               // Sequence D: 11110000
-               // modulation with subcarrier during first half
-        ToSend[ToSendMax] = 0xf0;
-               break;
-       case SEC_E:
-               // Sequence E: 00001111
-               // modulation with subcarrier during second half
-        ToSend[ToSendMax] = 0x0f;
-               break;
-       case SEC_F:
-               // Sequence F: 00000000
-               // no modulation with subcarrier
-        ToSend[ToSendMax] = 0x00;
-               break;
-       // READER TO CARD
-       case SEC_X:
-               // Sequence X: 00001100
-               // drop after half a period
-        ToSend[ToSendMax] = 0x0c;
-               break;
-       case SEC_Y:
-       default:
-               // Sequence Y: 00000000
-               // no drop
-        ToSend[ToSendMax] = 0x00;
-               break;
-       case SEC_Z:
-               // Sequence Z: 11000000
-               // drop at start
-        ToSend[ToSendMax] = 0xc0;
-               break;
-       }
-}
-
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
@@ -824,7 +802,7 @@ static void CodeIso14443aAsTag(const uint8_t *cmd, int len)
        ToSendStuffBit(0);
 
        // Send startbit
-       Sequence(SEC_D);
+       ToSend[++ToSendMax] = SEC_D;
 
     for(i = 0; i < len; i++) {
         int j;
@@ -835,27 +813,27 @@ static void CodeIso14443aAsTag(const uint8_t *cmd, int len)
                for(j = 0; j < 8; j++) {
             oddparity ^= (b & 1);
                        if(b & 1) {
-                               Sequence(SEC_D);
+                               ToSend[++ToSendMax] = SEC_D;
                        } else {
-                               Sequence(SEC_E);
+                               ToSend[++ToSendMax] = SEC_E;
             }
             b >>= 1;
         }
 
         // Parity bit
         if(oddparity) {
-                       Sequence(SEC_D);
+               ToSend[++ToSendMax] = SEC_D;
                } else {
-                       Sequence(SEC_E);
+                       ToSend[++ToSendMax] = SEC_E;
                }
     }
 
     // Send stopbit
-       Sequence(SEC_F);
+    ToSend[++ToSendMax] = SEC_F;
 
        // Flush the buffer in FPGA!!
        for(i = 0; i < 5; i++) {
-               Sequence(SEC_F);
+               ToSend[++ToSendMax] = SEC_F;
        }
 
     // Convert from last byte pos to length
@@ -887,23 +865,23 @@ static void CodeStrangeAnswer()
        ToSendStuffBit(0);
 
        // Send startbit
-       Sequence(SEC_D);
+       ToSend[++ToSendMax] = SEC_D;
 
        // 0
-       Sequence(SEC_E);
+       ToSend[++ToSendMax] = SEC_E;
 
        // 0
-       Sequence(SEC_E);
+       ToSend[++ToSendMax] = SEC_E;
 
        // 1
-       Sequence(SEC_D);
+       ToSend[++ToSendMax] = SEC_D;
 
     // Send stopbit
-       Sequence(SEC_F);
+       ToSend[++ToSendMax] = SEC_F;
 
        // Flush the buffer in FPGA!!
        for(i = 0; i < 5; i++) {
-               Sequence(SEC_F);
+               ToSend[++ToSendMax] = SEC_F;
        }
 
     // Convert from last byte pos to length
@@ -974,8 +952,6 @@ void SimulateIso14443aTag(int tagType, int TagUid)
     // static const uint8_t cmd2[] = { 0x93, 0x20 };
     //static const uint8_t response2[] = { 0x9a, 0xe5, 0xe4, 0x43, 0xd8 }; // original value - greg
 
-
-
 // my desfire
     static const uint8_t response2[] = { 0x88, 0x04, 0x21, 0x3f, 0x4d }; // known uid - note cascade (0x88), 2nd byte (0x04) = NXP/Phillips
 
@@ -989,7 +965,6 @@ ComputeCrc14443(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
 static const uint8_t response2a[] = { 0x51, 0x48, 0x1d, 0x80, 0x84 }; //  uid - cascade2 - 2nd half (4 bytes) of UID+ BCCheck
 // NOTE : THE CRC on the above may be wrong as I have obfuscated the actual UID
 
-
 // When reader selects us during cascade2 it will send cmd3a
 //uint8_t response3a[] = { 0x00, 0x00, 0x00 }; // SAK Select (cascade2) successful response (ULTRALITE)
 uint8_t response3a[] = { 0x20, 0x00, 0x00 }; // SAK Select (cascade2) successful response (DESFire)
@@ -1013,7 +988,6 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
        // 166 bytes, since every bit that needs to be send costs us a byte
        //
 
-
     // Respond with card type
     uint8_t *resp1 = (((uint8_t *)BigBuf) + 800);
     int resp1Len;
@@ -1174,10 +1148,11 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
                                receivedCmd[0], receivedCmd[1], receivedCmd[2]);
         } else {
             // Never seen this command before
-               Dbprintf("Unknown command received from reader: %x %x %x %x %x %x %x %x %x",
+               Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
+                       len,
                        receivedCmd[0], receivedCmd[1], receivedCmd[2],
-                       receivedCmd[3], receivedCmd[3], receivedCmd[4],
-                       receivedCmd[5], receivedCmd[6], receivedCmd[7]);
+                       receivedCmd[3], receivedCmd[4], receivedCmd[5],
+                       receivedCmd[6], receivedCmd[7], receivedCmd[8]);
                        // Do not respond
                        resp = resp1; respLen = 0; order = 0;
         }
@@ -1288,86 +1263,6 @@ static void TransmitFor14443a(const uint8_t *cmd, int len, int *samples, int *wa
        if (samples) *samples = (c + *wait) << 3;
 }
 
-//-----------------------------------------------------------------------------
-// To generate an arbitrary stream from reader
-//
-//-----------------------------------------------------------------------------
-void ArbitraryFromReader(const uint8_t *cmd, int parity, int len)
-{
-       int i;
-       int j;
-       int last;
-    uint8_t b;
-
-       ToSendReset();
-
-       // Start of Communication (Seq. Z)
-       Sequence(SEC_Z);
-       last = 0;
-
-       for(i = 0; i < len; i++) {
-        // Data bits
-        b = cmd[i];
-               for(j = 0; j < 8; j++) {
-                       if(b & 1) {
-                               // Sequence X
-                               Sequence(SEC_X);
-                               last = 1;
-                       } else {
-                               if(last == 0) {
-                                       // Sequence Z
-                                       Sequence(SEC_Z);
-                               }
-                               else {
-                                       // Sequence Y
-                                       Sequence(SEC_Y);
-                                       last = 0;
-                               }
-                       }
-                       b >>= 1;
-
-               }
-
-               // Predefined parity bit, the flipper flips when needed, because of flips in byte sent
-               if(((parity >> (len - i - 1)) & 1)) {
-                       // Sequence X
-                       Sequence(SEC_X);
-                       last = 1;
-               } else {
-                       if(last == 0) {
-                               // Sequence Z
-                               Sequence(SEC_Z);
-                       }
-                       else {
-                               // Sequence Y
-                               Sequence(SEC_Y);
-                               last = 0;
-                       }
-               }
-       }
-
-       // End of Communication
-       if(last == 0) {
-               // Sequence Z
-               Sequence(SEC_Z);
-       }
-       else {
-               // Sequence Y
-               Sequence(SEC_Y);
-               last = 0;
-       }
-       // Sequence Y
-       Sequence(SEC_Y);
-
-       // Just to be sure!
-       Sequence(SEC_Y);
-       Sequence(SEC_Y);
-       Sequence(SEC_Y);
-
-    // Convert from last character reference to length
-    ToSendMax++;
-}
-
 //-----------------------------------------------------------------------------
 // Code a 7-bit command without parity bit
 // This is especially for 0x26 and 0x52 (REQA and WUPA)
@@ -1381,23 +1276,23 @@ void ShortFrameFromReader(const uint8_t bt)
        ToSendReset();
 
        // Start of Communication (Seq. Z)
-       Sequence(SEC_Z);
+       ToSend[++ToSendMax] = SEC_Z;
        last = 0;
 
        b = bt;
        for(j = 0; j < 7; j++) {
                if(b & 1) {
                        // Sequence X
-                       Sequence(SEC_X);
+                       ToSend[++ToSendMax] = SEC_X;
                        last = 1;
                } else {
                        if(last == 0) {
                                // Sequence Z
-                               Sequence(SEC_Z);
+                               ToSend[++ToSendMax] = SEC_Z;
                        }
                        else {
                                // Sequence Y
-                               Sequence(SEC_Y);
+                               ToSend[++ToSendMax] = SEC_Y;
                                last = 0;
                        }
                }
@@ -1407,20 +1302,20 @@ void ShortFrameFromReader(const uint8_t bt)
        // End of Communication
        if(last == 0) {
                // Sequence Z
-               Sequence(SEC_Z);
+               ToSend[++ToSendMax] = SEC_Z;
        }
        else {
                // Sequence Y
-               Sequence(SEC_Y);
+               ToSend[++ToSendMax] = SEC_Y;
                last = 0;
        }
        // Sequence Y
-       Sequence(SEC_Y);
+       ToSend[++ToSendMax] = SEC_Y;
 
        // Just to be sure!
-       Sequence(SEC_Y);
-       Sequence(SEC_Y);
-       Sequence(SEC_Y);
+       ToSend[++ToSendMax] = SEC_Y;
+       ToSend[++ToSendMax] = SEC_Y;
+       ToSend[++ToSendMax] = SEC_Y;
 
     // Convert from last character reference to length
     ToSendMax++;
@@ -1439,7 +1334,7 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity)
   ToSendReset();
 
   // Start of Communication (Seq. Z)
-  Sequence(SEC_Z);
+  ToSend[++ToSendMax] = SEC_Z;
   last = 0;
 
   // Generate send structure for the data bits
@@ -1450,15 +1345,15 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity)
     for (j = 0; j < 8; j++) {
       if (b & 1) {
         // Sequence X
-        Sequence(SEC_X);
+         ToSend[++ToSendMax] = SEC_X;
         last = 1;
       } else {
         if (last == 0) {
           // Sequence Z
-          Sequence(SEC_Z);
+               ToSend[++ToSendMax] = SEC_Z;
         } else {
           // Sequence Y
-          Sequence(SEC_Y);
+               ToSend[++ToSendMax] = SEC_Y;
           last = 0;
         }
       }
@@ -1468,15 +1363,15 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity)
     // Get the parity bit
     if ((dwParity >> i) & 0x01) {
       // Sequence X
-      Sequence(SEC_X);
+       ToSend[++ToSendMax] = SEC_X;
       last = 1;
     } else {
       if (last == 0) {
         // Sequence Z
-        Sequence(SEC_Z);
+         ToSend[++ToSendMax] = SEC_Z;
       } else {
         // Sequence Y
-        Sequence(SEC_Y);
+         ToSend[++ToSendMax] = SEC_Y;
         last = 0;
       }
     }
@@ -1485,19 +1380,19 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity)
   // End of Communication
   if (last == 0) {
     // Sequence Z
-    Sequence(SEC_Z);
+         ToSend[++ToSendMax] = SEC_Z;
   } else {
     // Sequence Y
-    Sequence(SEC_Y);
+         ToSend[++ToSendMax] = SEC_Y;
     last = 0;
   }
   // Sequence Y
-  Sequence(SEC_Y);
+  ToSend[++ToSendMax] = SEC_Y;
 
   // Just to be sure!
-  Sequence(SEC_Y);
-  Sequence(SEC_Y);
-  Sequence(SEC_Y);
+  ToSend[++ToSendMax] = SEC_Y;
+  ToSend[++ToSendMax] = SEC_Y;
+  ToSend[++ToSendMax] = SEC_Y;
 
   // Convert from last character reference to length
   ToSendMax++;
@@ -1514,31 +1409,31 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, int maxLen, int
        int c;
 
        // Set FPGA mode to "reader listen mode", no modulation (listen
-    // only, since we are receiving, not transmitting).
-    // Signal field is on with the appropriate LED
-    LED_D_ON();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
+       // only, since we are receiving, not transmitting).
+       // Signal field is on with the appropriate LED
+       LED_D_ON();
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
 
-    // Now get the answer from the card
-    Demod.output = receivedResponse;
-    Demod.len = 0;
-    Demod.state = DEMOD_UNSYNCD;
+       // Now get the answer from the card
+       Demod.output = receivedResponse;
+       Demod.len = 0;
+       Demod.state = DEMOD_UNSYNCD;
 
        uint8_t b;
        if (elapsed) *elapsed = 0;
 
        c = 0;
        for(;;) {
-        WDT_HIT();
+               WDT_HIT();
 
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-            AT91C_BASE_SSC->SSC_THR = 0x00;  // To make use of exact timing of next command from reader!!
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+                       AT91C_BASE_SSC->SSC_THR = 0x00;  // To make use of exact timing of next command from reader!!
                        if (elapsed) (*elapsed)++;
-        }
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-                       if(c < 512) { c++; } else { return FALSE; }
-            b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-                       if(ManchesterDecoding((b & 0xf0) >> 4)) {
+               }
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+                       if(c < iso14a_timeout) { c++; } else { return FALSE; }
+                       b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+                       if(ManchesterDecoding((b>>4) & 0xf)) {
                                *samples = ((c - 1) << 3) + 4;
                                return TRUE;
                        }
@@ -1546,8 +1441,8 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, int maxLen, int
                                *samples = c << 3;
                                return TRUE;
                        }
-        }
-    }
+               }
+       }
 }
 
 void ReaderTransmitShort(const uint8_t* bt)
@@ -1575,6 +1470,8 @@ void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par)
 
   // Select the card
   TransmitFor14443a(ToSend, ToSendMax, &samples, &wait);
+  if(trigger)
+       LED_A_ON();
 
   // Store reader command in buffer
   if (tracing) LogTrace(frame,len,0,par,TRUE);
@@ -1590,271 +1487,941 @@ void ReaderTransmit(uint8_t* frame, int len)
 int ReaderReceive(uint8_t* receivedAnswer)
 {
   int samples = 0;
-  if (!GetIso14443aAnswerFromTag(receivedAnswer,100,&samples,0)) return FALSE;
+  if (!GetIso14443aAnswerFromTag(receivedAnswer,160,&samples,0)) return FALSE;
   if (tracing) LogTrace(receivedAnswer,Demod.len,samples,Demod.parityBits,FALSE);
-  return TRUE;
+  if(samples == 0) return FALSE;
+  return Demod.len;
 }
 
-//-----------------------------------------------------------------------------
-// Read an ISO 14443a tag. Send out commands and store answers.
-//
-//-----------------------------------------------------------------------------
-void ReaderIso14443a(uint32_t parameter)
+int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr)
 {
-       // Anticollision
-       uint8_t wupa[]       = { 0x52 };
+  int samples = 0;
+  if (!GetIso14443aAnswerFromTag(receivedAnswer,160,&samples,0)) return FALSE;
+  if (tracing) LogTrace(receivedAnswer,Demod.len,samples,Demod.parityBits,FALSE);
+       *parptr = Demod.parityBits;
+  if(samples == 0) return FALSE;
+  return Demod.len;
+}
+
+/* performs iso14443a anticolision procedure
+ * fills the uid pointer unless NULL
+ * fills resp_data unless NULL */
+int iso14443a_select_card(uint8_t * uid_ptr, iso14a_card_select_t * resp_data, uint32_t * cuid_ptr) {
+       uint8_t wupa[]       = { 0x52 };  // 0x26 - REQA  0x52 - WAKE-UP
        uint8_t sel_all[]    = { 0x93,0x20 };
        uint8_t sel_uid[]    = { 0x93,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-       uint8_t sel_all_c2[] = { 0x95,0x20 };
-       uint8_t sel_uid_c2[] = { 0x95,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+       uint8_t rats[]       = { 0xE0,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0
+
+       uint8_t* resp = (((uint8_t *)BigBuf) + 3560);   // was 3560 - tied to other size changes
+
+       uint8_t sak = 0x04; // cascade uid
+       int cascade_level = 0;
+
+       int len;
+       
+       // clear uid
+       memset(uid_ptr, 0, 8);
+
+       // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
+       ReaderTransmitShort(wupa);
+       // Receive the ATQA
+       if(!ReaderReceive(resp)) return 0;
+
+       if(resp_data)
+               memcpy(resp_data->atqa, resp, 2);
+       
+       // 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.
+       for(; sak & 0x04; cascade_level++)
+       {
+               // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
+               sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
+
+               // SELECT_ALL
+               ReaderTransmit(sel_all,sizeof(sel_all));
+               if (!ReaderReceive(resp)) return 0;
+               if(uid_ptr) memcpy(uid_ptr + cascade_level*4, resp, 4);
+               
+               // calculate crypto UID
+               if(cuid_ptr) *cuid_ptr = bytes_to_num(resp, 4);
 
-       // Mifare AUTH
-       uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
-//     uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00 };
+               // Construct SELECT UID command
+               memcpy(sel_uid+2,resp,5);
+               AppendCrc14443a(sel_uid,7);
+               ReaderTransmit(sel_uid,sizeof(sel_uid));
 
-  uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560);      // was 3560 - tied to other size changes
-  traceLen = 0;
+               // Receive the SAK
+               if (!ReaderReceive(resp)) return 0;
+               sak = resp[0];
+       }
+       if(resp_data) {
+               resp_data->sak = sak;
+               resp_data->ats_len = 0;
+       }
+       //--  this byte not UID, it CT.  http://www.nxp.com/documents/application_note/AN10927.pdf  page 3
+       if (uid_ptr[0] == 0x88) {  
+               memcpy(uid_ptr, uid_ptr + 1, 7);
+               uid_ptr[7] = 0;
+       }
 
+       if( (sak & 0x20) == 0)
+               return 2; // non iso14443a compliant tag
+
+       // Request for answer to select
+       if(resp_data) {  // JCOP cards - if reader sent RATS then there is no MIFARE session at all!!!
+               AppendCrc14443a(rats, 2);
+               ReaderTransmit(rats, sizeof(rats));
+               
+               if (!(len = ReaderReceive(resp))) return 0;
+               
+               memcpy(resp_data->ats, resp, sizeof(resp_data->ats));
+               resp_data->ats_len = len;
+       }
+       
+       return 1;
+}
+
+void iso14443a_setup() {
        // Setup SSC
        FpgaSetupSsc();
-
        // Start from off (no field generated)
-  // Signal field is off with the appropriate LED
-  LED_D_OFF();
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-  SpinDelay(200);
+       // Signal field is off with the appropriate LED
+       LED_D_OFF();
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelay(200);
 
-  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-  FpgaSetupSsc();
+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // Now give it time to spin up.
-  // Signal field is on with the appropriate LED
-  LED_D_ON();
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+       // Signal field is on with the appropriate LED
+       LED_D_ON();
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
        SpinDelay(200);
 
+       iso14a_timeout = 2048; //default
+}
+
+int iso14_apdu(uint8_t * cmd, size_t cmd_len, void * data) {
+       uint8_t real_cmd[cmd_len+4];
+       real_cmd[0] = 0x0a; //I-Block
+       real_cmd[1] = 0x00; //CID: 0 //FIXME: allow multiple selected cards
+       memcpy(real_cmd+2, cmd, cmd_len);
+       AppendCrc14443a(real_cmd,cmd_len+2);
+       ReaderTransmit(real_cmd, cmd_len+4);
+       size_t len = ReaderReceive(data);
+       if(!len)
+               return -1; //DATA LINK ERROR
+       
+       return len;
+}
+
+
+//-----------------------------------------------------------------------------
+// Read an ISO 14443a tag. Send out commands and store answers.
+//
+//-----------------------------------------------------------------------------
+void ReaderIso14443a(UsbCommand * c, UsbCommand * ack)
+{
+       iso14a_command_t param = c->arg[0];
+       uint8_t * cmd = c->d.asBytes;
+       size_t len = c->arg[1];
+
+       if(param & ISO14A_REQUEST_TRIGGER) iso14a_set_trigger(1);
+
+       if(param & ISO14A_CONNECT) {
+               iso14443a_setup();
+               ack->arg[0] = iso14443a_select_card(ack->d.asBytes, (iso14a_card_select_t *) (ack->d.asBytes+12), NULL);
+               UsbSendPacket((void *)ack, sizeof(UsbCommand));
+       }
+
+       if(param & ISO14A_SET_TIMEOUT) {
+               iso14a_timeout = c->arg[2];
+       }
+
+       if(param & ISO14A_SET_TIMEOUT) {
+               iso14a_timeout = c->arg[2];
+       }
+
+       if(param & ISO14A_APDU) {
+               ack->arg[0] = iso14_apdu(cmd, len, ack->d.asBytes);
+               UsbSendPacket((void *)ack, sizeof(UsbCommand));
+       }
+
+       if(param & ISO14A_RAW) {
+               if(param & ISO14A_APPEND_CRC) {
+                       AppendCrc14443a(cmd,len);
+                       len += 2;
+               }
+               ReaderTransmit(cmd,len);
+               ack->arg[0] = ReaderReceive(ack->d.asBytes);
+               UsbSendPacket((void *)ack, sizeof(UsbCommand));
+       }
+
+       if(param & ISO14A_REQUEST_TRIGGER) iso14a_set_trigger(0);
+
+       if(param & ISO14A_NO_DISCONNECT)
+               return;
+
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
+//-----------------------------------------------------------------------------
+// Read an ISO 14443a tag. Send out commands and store answers.
+//
+//-----------------------------------------------------------------------------
+void ReaderMifare(uint32_t parameter)
+{
+       // Mifare AUTH
+       uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
+       uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+
+       uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes
+       traceLen = 0;
+       tracing = false;
+
+       iso14443a_setup();
+
        LED_A_ON();
        LED_B_OFF();
        LED_C_OFF();
 
-       while(traceLen < TRACE_LENGTH)
-  {
-    // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-    ReaderTransmitShort(wupa);
+       byte_t nt_diff = 0;
+       LED_A_OFF();
+       byte_t par = 0;
+       byte_t par_mask = 0xff;
+       byte_t par_low = 0;
+       int led_on = TRUE;
+       uint8_t uid[8];
+       uint32_t cuid;
+
+       tracing = FALSE;
+       byte_t nt[4] = {0,0,0,0};
+       byte_t nt_attacked[4], nt_noattack[4];
+       byte_t par_list[8] = {0,0,0,0,0,0,0,0};
+       byte_t ks_list[8] = {0,0,0,0,0,0,0,0};
+       num_to_bytes(parameter, 4, nt_noattack);
+       int isOK = 0, isNULL = 0;
+
+       while(TRUE)
+       {
+               LED_C_ON();
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               SpinDelay(200);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+               LED_C_OFF();
+
+               // Test if the action was cancelled
+               if(BUTTON_PRESS()) {
+                       break;
+               }
 
-    // Test if the action was cancelled
-    if(BUTTON_PRESS()) {
-      break;
-    }
+               if(!iso14443a_select_card(uid, NULL, &cuid)) continue;
 
-    // Receive the ATQA
-    if (!ReaderReceive(receivedAnswer)) continue;
+               // Transmit MIFARE_CLASSIC_AUTH
+               ReaderTransmit(mf_auth, sizeof(mf_auth));
 
-    // Transmit SELECT_ALL
-    ReaderTransmit(sel_all,sizeof(sel_all));
+               // Receive the (16 bit) "random" nonce
+               if (!ReaderReceive(receivedAnswer)) continue;
+               memcpy(nt, receivedAnswer, 4);
 
-    // Receive the UID
-    if (!ReaderReceive(receivedAnswer)) continue;
+               // Transmit reader nonce and reader answer
+               ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar),par);
 
-               // Construct SELECT UID command
-               // First copy the 5 bytes (Mifare Classic) after the 93 70
-               memcpy(sel_uid+2,receivedAnswer,5);
-               // Secondly compute the two CRC bytes at the end
-    AppendCrc14443a(sel_uid,7);
+               // Receive 4 bit answer
+               if (ReaderReceive(receivedAnswer))
+               {
+                       if ( (parameter != 0) && (memcmp(nt, nt_noattack, 4) == 0) ) continue;
 
-    // Transmit SELECT_UID
-    ReaderTransmit(sel_uid,sizeof(sel_uid));
+                       isNULL = (nt_attacked[0] = 0) && (nt_attacked[1] = 0) && (nt_attacked[2] = 0) && (nt_attacked[3] = 0);
+                       if ( (isNULL != 0 ) && (memcmp(nt, nt_attacked, 4) != 0) ) continue;
 
-    // Receive the SAK
-    if (!ReaderReceive(receivedAnswer)) continue;
+                       if (nt_diff == 0)
+                       {
+                               LED_A_ON();
+                               memcpy(nt_attacked, nt, 4);
+                               par_mask = 0xf8;
+                               par_low = par & 0x07;
+                       }
 
-    // OK we have selected 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
-    // When the UID is not complete, the 3nd bit (from the right) is set in the SAK.
-               if (receivedAnswer[0] &= 0x04)
-               {
-      // Transmit SELECT_ALL
-      ReaderTransmit(sel_all_c2,sizeof(sel_all_c2));
+                       led_on = !led_on;
+                       if(led_on) LED_B_ON(); else LED_B_OFF();
+                       par_list[nt_diff] = par;
+                       ks_list[nt_diff] = receivedAnswer[0] ^ 0x05;
 
-      // Receive the UID
-      if (!ReaderReceive(receivedAnswer)) continue;
+                       // Test if the information is complete
+                       if (nt_diff == 0x07) {
+                               isOK = 1;
+                               break;
+                       }
 
-      // Construct SELECT UID command
-      memcpy(sel_uid_c2+2,receivedAnswer,5);
-      // Secondly compute the two CRC bytes at the end
-      AppendCrc14443a(sel_uid_c2,7);
+                       nt_diff = (nt_diff + 1) & 0x07;
+                       mf_nr_ar[3] = nt_diff << 5;
+                       par = par_low;
+               } else {
+                       if (nt_diff == 0)
+                       {
+                               par++;
+                       } else {
+                               par = (((par >> 3) + 1) << 3) | par_low;
+                       }
+               }
+       }
 
-      // Transmit SELECT_UID
-      ReaderTransmit(sel_uid_c2,sizeof(sel_uid_c2));
+       LogTrace(nt, 4, 0, GetParity(nt, 4), TRUE);
+       LogTrace(par_list, 8, 0, GetParity(par_list, 8), TRUE);
+       LogTrace(ks_list, 8, 0, GetParity(ks_list, 8), TRUE);
+
+       UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       memcpy(ack.d.asBytes + 0,  uid, 4);
+       memcpy(ack.d.asBytes + 4,  nt, 4);
+       memcpy(ack.d.asBytes + 8,  par_list, 8);
+       memcpy(ack.d.asBytes + 16, ks_list, 8);
+               
+       LED_B_ON();
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();    
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+       tracing = TRUE;
+       
+       if (MF_DBGLEVEL >= 1)   DbpString("COMMAND mifare FINISHED");
+}
 
-      // Receive the SAK
-      if (!ReaderReceive(receivedAnswer)) continue;
-               }
+//-----------------------------------------------------------------------------
+// Select, Authenticaate, Read an MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+       uint8_t uid[8];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       traceLen = 0;
+//     tracing = false;
+
+       iso14443a_setup();
 
-    // Transmit MIFARE_CLASSIC_AUTH
-    ReaderTransmit(mf_auth,sizeof(mf_auth));
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
 
-    // Receive the (16 bit) "random" nonce
-    if (!ReaderReceive(receivedAnswer)) continue;
+       while (true) {
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");
+                       break;
+               };
+
+               if(mifare_classic_halt(pcs, cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+               
+               isOK = 1;
+               break;
        }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");
+
+       // add trace trailer
+       uid[0] = 0xff;
+       uid[1] = 0xff;
+       uid[2] = 0xff;
+       uid[3] = 0xff;
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       memcpy(ack.d.asBytes, dataoutbuf, 16);
+       
+       LED_B_ON();
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
+
 
   // Thats it...
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();
-       Dbprintf("%x %x %x", rsamples, 0xCC, 0xCC);
-       DbpString("ready..");
+//  tracing = TRUE;
+
 }
 
 //-----------------------------------------------------------------------------
-// Read an ISO 14443a tag. Send out commands and store answers.
-//
+// Select, Authenticaate, Read an MIFARE tag. 
+// read sector (data = 4 x 16 bytes = 64 bytes)
 //-----------------------------------------------------------------------------
-void ReaderMifare(uint32_t parameter)
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
+  // params
+       uint8_t sectorNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16 * 4];
+       uint8_t uid[8];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       traceLen = 0;
+//     tracing = false;
+
+       iso14443a_setup();
 
-       // Anticollision
-       uint8_t wupa[]       = { 0x52 };
-       uint8_t sel_all[]    = { 0x93,0x20 };
-       uint8_t sel_uid[]    = { 0x93,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
 
-       // Mifare AUTH
-       uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
-  uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+       while (true) {
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf + 16 * 0)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 0 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf + 16 * 1)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 1 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf + 16 * 2)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 2 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf + 16 * 3)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 3 error");
+                       break;
+               };
+               
+               if(mifare_classic_halt(pcs, cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+
+       // add trace trailer
+       uid[0] = 0xff;
+       uid[1] = 0xff;
+       uid[2] = 0xff;
+       uid[3] = 0xff;
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       memcpy(ack.d.asBytes, dataoutbuf, 16 * 2);
+       
+       LED_B_ON();
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+
+       SpinDelay(100);
+       
+       memcpy(ack.d.asBytes, dataoutbuf + 16 * 2, 16 * 2);
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();    
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+//  tracing = TRUE;
 
-  uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560);      // was 3560 - tied to other size changes
-  traceLen = 0;
-  tracing = false;
+}
 
-       // Setup SSC
-       FpgaSetupSsc();
+//-----------------------------------------------------------------------------
+// Select, Authenticaate, Read an MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+       // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       byte_t blockdata[16];
+
+       ui64Key = bytes_to_num(datain, 6);
+       memcpy(blockdata, datain + 10, 16);
+       
+       // variables
+       byte_t isOK = 0;
+       uint8_t uid[8];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       traceLen = 0;
+//  tracing = false;
+
+       iso14443a_setup();
 
-       // Start from off (no field generated)
-  // Signal field is off with the appropriate LED
-  LED_D_OFF();
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-  SpinDelay(200);
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+       while (true) {
+                       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+                       break;
+               };
+
+               if(mifare_classic_halt(pcs, cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+               
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+
+       // add trace trailer
+       uid[0] = 0xff;
+       uid[1] = 0xff;
+       uid[2] = 0xff;
+       uid[3] = 0xff;
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       
+       LED_B_ON();
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();    
+
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+//  tracing = TRUE;
 
-  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-  FpgaSetupSsc();
+}
 
-       // Now give it time to spin up.
-  // Signal field is on with the appropriate LED
-  LED_D_ON();
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-       SpinDelay(200);
+// Return 1 if the nonce is invalid else return 0
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity) {
+       return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
+       (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
+       (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// MIFARE nested authentication. 
+// 
+//-----------------------------------------------------------------------------
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
+       // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint8_t targetBlockNo = arg2 & 0xff;
+       uint8_t targetKeyType = (arg2 >> 8) & 0xff;
+       uint64_t ui64Key = 0;
+
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       int rtr, i, j, m, len;
+       int davg, dmin, dmax;
+       uint8_t uid[8];
+       uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;
+       uint8_t par_array[4];
+       nestedVector nvector[NES_MAX_INFO + 1][10];
+       int nvectorcount[NES_MAX_INFO + 1];
+       int ncount = 0;
+       UsbCommand ack = {CMD_ACK, {0, 0, 0}};
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+       //init
+       for (i = 0; i < NES_MAX_INFO + 1; i++) nvectorcount[i] = 11;  //  11 - empty block;
+       
+       // clear trace
+       traceLen = 0;
+  tracing = false;
+       
+       iso14443a_setup();
 
        LED_A_ON();
-       LED_B_OFF();
+       LED_B_ON();
        LED_C_OFF();
 
-  // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-  ReaderTransmitShort(wupa);
-  // Receive the ATQA
-  ReaderReceive(receivedAnswer);
-  // Transmit SELECT_ALL
-  ReaderTransmit(sel_all,sizeof(sel_all));
-  // Receive the UID
-  ReaderReceive(receivedAnswer);
-  // Construct SELECT UID command
-  // First copy the 5 bytes (Mifare Classic) after the 93 70
-  memcpy(sel_uid+2,receivedAnswer,5);
-  // Secondly compute the two CRC bytes at the end
-  AppendCrc14443a(sel_uid,7);
-
-  byte_t nt_diff = 0;
-  LED_A_OFF();
-  byte_t par = 0;
-  byte_t par_mask = 0xff;
-  byte_t par_low = 0;
-  int led_on = TRUE;
-
-  tracing = FALSE;
-  byte_t nt[4];
-  byte_t nt_attacked[4];
-  byte_t par_list[8];
-  byte_t ks_list[8];
-  num_to_bytes(parameter,4,nt_attacked);
-
-  while(TRUE)
-  {
+  FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+  SpinDelay(200);
+       
+       davg = dmax = 0;
+       dmin = 2000;
+
+       // test nonce distance
+       for (rtr = 0; rtr < 10; rtr++) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    SpinDelay(200);
+    SpinDelay(100);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 
-    // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-    ReaderTransmitShort(wupa);
-
     // Test if the action was cancelled
     if(BUTTON_PRESS()) {
       break;
     }
 
-    // Receive the ATQA
-    if (!ReaderReceive(receivedAnswer)) continue;
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+               
+               if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth1 error");
+                       break;
+               };
+
+               if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth2 error");
+                       break;
+               };
+               
+               nttmp = prng_successor(nt1, 500);
+               for (i = 501; i < 2000; i++) {
+                       nttmp = prng_successor(nttmp, 1);
+                       if (nttmp == nt2) break;
+               }
+               
+               if (i != 2000) {
+                       davg += i;
+                       if (dmin > i) dmin = i;
+                       if (dmax < i) dmax = i;
+                       if (MF_DBGLEVEL >= 4)   Dbprintf("r=%d nt1=%08x nt2=%08x distance=%d", rtr, nt1, nt2, i);
+               }
+       }
+       
+       if (rtr == 0)   return;
 
-    // Transmit SELECT_ALL
-    ReaderTransmit(sel_all,sizeof(sel_all));
+       davg = davg / rtr;
+       if (MF_DBGLEVEL >= 3)   Dbprintf("distance: min=%d max=%d avg=%d", dmin, dmax, davg);
 
-    // Receive the UID
-    if (!ReaderReceive(receivedAnswer)) continue;
+       LED_B_OFF();
 
-    // Transmit SELECT_UID
-    ReaderTransmit(sel_uid,sizeof(sel_uid));
+//  -------------------------------------------------------------------------------------------------  
+       
+       LED_C_ON();
 
-    // Receive the SAK
-    if (!ReaderReceive(receivedAnswer)) continue;
+       //  get crypted nonces for target sector
+       for (rtr = 0; rtr < NS_RETRIES_GETNONCE; rtr++) {
+       if (MF_DBGLEVEL >= 4)                   Dbprintf("------------------------------");
 
-    // Transmit MIFARE_CLASSIC_AUTH
-    ReaderTransmit(mf_auth,sizeof(mf_auth));
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    SpinDelay(100);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 
-    // Receive the (16 bit) "random" nonce
-    if (!ReaderReceive(receivedAnswer)) continue;
-    memcpy(nt,receivedAnswer,4);
+    // Test if the action was cancelled
+    if(BUTTON_PRESS()) {
+      break;
+    }
 
-    // Transmit reader nonce and reader answer
-    ReaderTransmitPar(mf_nr_ar,sizeof(mf_nr_ar),par);
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+               
+               if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth1 error");
+                       break;
+               };
+
+               // nested authentication
+               len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par);
+               if (len != 4) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth2 error len=%d", len);
+                       break;
+               };
+       
+               nt2 = bytes_to_num(receivedAnswer, 4);          
+               if (MF_DBGLEVEL >= 4)   Dbprintf("r=%d nt1=%08x nt2enc=%08x nt2par=%08x", rtr, nt1, nt2, par);
+               
+               // Parity validity check
+               for (i = 0; i < 4; i++) {
+                       par_array[i] = (oddparity(receivedAnswer[i]) != ((par & 0x08) >> 3));
+                       par = par << 1;
+               }
+               
+               ncount = 0;
+               for (m = dmin - NS_TOLERANCE; m < dmax + NS_TOLERANCE; m++) {
+                       nttest = prng_successor(nt1, m);
+                       ks1 = nt2 ^ nttest;
+
+                       if (valid_nonce(nttest, nt2, ks1, par_array) && (ncount < 11)){
+                               
+                               nvector[NES_MAX_INFO][ncount].nt = nttest;
+                               nvector[NES_MAX_INFO][ncount].ks1 = ks1;
+                               ncount++;
+                               nvectorcount[NES_MAX_INFO] = ncount;
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("valid m=%d ks1=%08x nttest=%08x", m, ks1, nttest);
+                       }
 
-    // Receive 4 bit answer
-    if (ReaderReceive(receivedAnswer))
-    {
-      if (nt_diff == 0)
-      {
-        LED_A_ON();
-        memcpy(nt_attacked,nt,4);
-        par_mask = 0xf8;
-        par_low = par & 0x07;
-      }
+               }
+               
+               // select vector with length less than got
+               if (nvectorcount[NES_MAX_INFO] != 0) {
+                       m = NES_MAX_INFO;
+                       
+                       for (i = 0; i < NES_MAX_INFO; i++)
+                               if (nvectorcount[i] > 10) {
+                                       m = i;
+                                       break;
+                               }
+                               
+                       if (m == NES_MAX_INFO)
+                               for (i = 0; i < NES_MAX_INFO; i++)
+                                       if (nvectorcount[NES_MAX_INFO] < nvectorcount[i]) {
+                                               m = i;
+                                               break;
+                                       }
+                                       
+                       if (m != NES_MAX_INFO) {
+                               for (i = 0; i < nvectorcount[m]; i++) {
+                                       nvector[m][i] = nvector[NES_MAX_INFO][i];
+                               }
+                               nvectorcount[m] = nvectorcount[NES_MAX_INFO];
+                       }
+               }
+       }
 
-      if (memcmp(nt,nt_attacked,4) != 0) continue;
+       LED_C_OFF();
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       // add trace trailer
+       uid[0] = 0xff;
+       uid[1] = 0xff;
+       uid[2] = 0xff;
+       uid[3] = 0xff;
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       for (i = 0; i < NES_MAX_INFO; i++) {
+               if (nvectorcount[i] > 10) continue;
+               
+               for (j = 0; j < nvectorcount[i]; j += 5) {
+                       ncount = nvectorcount[i] - j;
+                       if (ncount > 5) ncount = 5; 
+
+                       ack.arg[0] = 0; // isEOF = 0
+                       ack.arg[1] = ncount;
+                       ack.arg[2] = targetBlockNo + (targetKeyType * 0x100);
+                       memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));
+                       
+                       memcpy(ack.d.asBytes, &cuid, 4);
+                       for (m = 0; m < ncount; m++) {
+                               memcpy(ack.d.asBytes + 8 + m * 8 + 0, &nvector[i][m + j].nt, 4);
+                               memcpy(ack.d.asBytes + 8 + m * 8 + 4, &nvector[i][m + j].ks1, 4);
+                       }
+       
+                       LED_B_ON();
+                       SpinDelay(100);
+                       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+                       LED_B_OFF();    
+               }
+       }
 
-      led_on = !led_on;
-      if(led_on) LED_B_ON(); else LED_B_OFF();
-      par_list[nt_diff] = par;
-      ks_list[nt_diff] = receivedAnswer[0]^0x05;
+       // finalize list
+       ack.arg[0] = 1; // isEOF = 1
+       ack.arg[1] = 0;
+       ack.arg[2] = 0;
+       memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));
+       
+       LED_B_ON();
+       SpinDelay(300);
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();    
 
-      // Test if the information is complete
-      if (nt_diff == 0x07) break;
+       if (MF_DBGLEVEL >= 4)   DbpString("NESTED FINISHED");
 
-      nt_diff = (nt_diff+1) & 0x07;
-      mf_nr_ar[3] = nt_diff << 5;
-      par = par_low;
-    } else {
-      if (nt_diff == 0)
-      {
-        par++;
-      } else {
-        par = (((par>>3)+1) << 3) | par_low;
-      }
-    }
-  }
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+       
+  tracing = TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE check keys. key count up to 8. 
+// 
+//-----------------------------------------------------------------------------
+void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint8_t keyCount = arg2;
+       uint64_t ui64Key = 0;
+       
+       // variables
+       int i;
+       byte_t isOK = 0;
+       uint8_t uid[8];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+       
+       // clear debug level
+       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      
+       MF_DBGLEVEL = MF_DBG_NONE;
+       
+       // clear trace
+       traceLen = 0;
+  tracing = TRUE;
+
+       iso14443a_setup();
 
-  LogTraceInfo(sel_uid+2,4);
-  LogTraceInfo(nt,4);
-  LogTraceInfo(par_list,8);
-  LogTraceInfo(ks_list,8);
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+       SpinDelay(300);
+       for (i = 0; i < keyCount; i++) {
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    SpinDelay(100);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("Can't select card");
+                       break;
+               };
+
+               ui64Key = bytes_to_num(datain + i * 6, 6);
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+                       continue;
+               };
+               
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       // add trace trailer
+       uid[0] = 0xff;
+       uid[1] = 0xff;
+       uid[2] = 0xff;
+       uid[3] = 0xff;
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       if (isOK) memcpy(ack.d.asBytes, datain + i * 6, 6);
+       
+       LED_B_ON();
+       UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
 
   // Thats it...
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();
-  tracing = TRUE;
+
+       // restore debug level
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE 1K simulate. 
+// 
+//-----------------------------------------------------------------------------
+void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+       int cardSTATE = MFEMUL_NOFIELD;
+
+       while (true) {
+
+               if(BUTTON_PRESS()) {
+      break;
+    }
+       
+               switch (cardSTATE) {
+                       case MFEMUL_NOFIELD:{
+                               break;
+                       }
+                       case MFEMUL_IDLE:{
+                               break;
+                       }
+                       case MFEMUL_SELECT1:{
+                               break;
+                       }
+                       case MFEMUL_SELECT2:{
+                               break;
+                       }
+                       case MFEMUL_AUTH1:{
+                               break;
+                       }
+                       case MFEMUL_AUTH2:{
+                               break;
+                       }
+                       case MFEMUL_HALTED:{
+                               break;
+                       }
+               
+               }
+       
+       }
+
 }
Impressum, Datenschutz