]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/iso14443a.c
Added iClass eavesdrop support for Proxmark3
[proxmark3-svn] / armsrc / iso14443a.c
index c36962543706f8977b7193660214686e278e6b03..1c5e9265d3224df0ca088e7c04f3a6eca889a71f 100644 (file)
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // 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"
 
 static uint8_t *trace = (uint8_t *) BigBuf;
 static int traceLen = 0;
 static int rsamples = 0;
 static int tracing = TRUE;
+static uint32_t iso14a_timeout;
 
 // CARD TO READER
 // Sequence D: 11110000 modulation with subcarrier during first half
@@ -61,6 +64,11 @@ 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
 //
@@ -78,7 +86,7 @@ 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);
 }
@@ -138,7 +146,7 @@ static struct {
     uint8_t   *output;
 } Uart;
 
-static int MillerDecoding(int bit)
+static RAMFUNC int MillerDecoding(int bit)
 {
        int error = 0;
        int bitright;
@@ -340,7 +348,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
@@ -402,7 +410,7 @@ static struct {
     uint8_t   *output;
 } Demod;
 
-static int ManchesterDecoding(int v)
+static RAMFUNC int ManchesterDecoding(int v)
 {
        int bit;
        int modulation;
@@ -423,28 +431,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;
@@ -454,6 +463,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;
@@ -598,7 +608,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
@@ -609,7 +619,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.
@@ -621,7 +631,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;
@@ -633,7 +644,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);
 
@@ -642,6 +653,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;
@@ -654,28 +671,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;
@@ -687,18 +699,18 @@ void SnoopIso14443a(void)
         }
 
         samples += 4;
-               if(MillerDecoding((smpl & 0xF0) >> 4)) {
+        if(MillerDecoding((smpl & 0xF0) >> 4)) {
             rsamples = samples - Uart.samples;
             LED_C_ON();
-                       if(triggered) {
-                               trace[traceLen++] = ((rsamples >>  0) & 0xff);
+            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.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;
@@ -709,35 +721,36 @@ void SnoopIso14443a(void)
             /* 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();
+            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");
@@ -1387,30 +1400,30 @@ 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(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;
@@ -1419,8 +1432,8 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, int maxLen, int
                                *samples = c << 3;
                                return TRUE;
                        }
-        }
-    }
+               }
+       }
 }
 
 void ReaderTransmitShort(const uint8_t* bt)
@@ -1448,6 +1461,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);
@@ -1465,130 +1480,171 @@ int ReaderReceive(uint8_t* receivedAnswer)
   int samples = 0;
   if (!GetIso14443aAnswerFromTag(receivedAnswer,100,&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)
-{
-       // Anticollision
+/* 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) {
        uint8_t wupa[]       = { 0x52 };
        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
 
-       // Mifare AUTH
-       uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
-//     uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00 };
+       uint8_t* resp = (((uint8_t *)BigBuf) + 3560);   // was 3560 - tied to other size changes
+       uint8_t* uid  = resp + 7;
 
-  uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560);      // was 3560 - tied to other size changes
-  traceLen = 0;
+       uint8_t sak = 0x04; // cascade uid
+       int cascade_level = 0;
 
-       // Setup SSC
-       FpgaSetupSsc();
+       int len;
 
-       // Start from off (no field generated)
-  // Signal field is off with the appropriate LED
-  LED_D_OFF();
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-  SpinDelay(200);
+       // 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;
 
-  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+       if(resp_data)
+               memcpy(resp_data->atqa, resp, 2);
+       
+       ReaderTransmit(sel_all,sizeof(sel_all)); 
+       if(!ReaderReceive(uid)) return 0;
 
-       // 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);
+       // 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;
 
-       LED_A_ON();
-       LED_B_OFF();
-       LED_C_OFF();
+               // SELECT_ALL
+               ReaderTransmit(sel_all,sizeof(sel_all));
+               if (!ReaderReceive(resp)) return 0;
+               if(uid_ptr) memcpy(uid_ptr + cascade_level*4, resp, 4);
 
-       while(traceLen < TRACE_LENGTH)
-  {
-    // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-    ReaderTransmitShort(wupa);
+               // Construct SELECT UID command
+               memcpy(sel_uid+2,resp,5);
+               AppendCrc14443a(sel_uid,7);
+               ReaderTransmit(sel_uid,sizeof(sel_uid));
 
-    // Test if the action was cancelled
-    if(BUTTON_PRESS()) {
-      break;
-    }
+               // Receive the SAK
+               if (!ReaderReceive(resp)) return 0;
+               sak = resp[0];
+       }
+       if(resp_data) {
+               resp_data->sak = sak;
+               resp_data->ats_len = 0;
+       }
 
-    // Receive the ATQA
-    if (!ReaderReceive(receivedAnswer)) continue;
+       if( (sak & 0x20) == 0)
+               return 2; // non iso14443a compliant tag
 
-    // Transmit SELECT_ALL
-    ReaderTransmit(sel_all,sizeof(sel_all));
+       // Request for answer to select
+       AppendCrc14443a(rats, 2);
+       ReaderTransmit(rats, sizeof(rats));
+       if (!(len = ReaderReceive(resp))) return 0;
+       if(resp_data) {
+               memcpy(resp_data->ats, resp, sizeof(resp_data->ats));
+               resp_data->ats_len = len;
+       }
 
-    // Receive the UID
-    if (!ReaderReceive(receivedAnswer)) continue;
+       return 1;
+}
 
-               // 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);
+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);
 
-    // Transmit SELECT_UID
-    ReaderTransmit(sel_uid,sizeof(sel_uid));
+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-    // Receive the SAK
-    if (!ReaderReceive(receivedAnswer)) continue;
+       // 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);
 
-    // 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));
+       iso14a_timeout = 2048; //default
+}
 
-      // Receive the UID
-      if (!ReaderReceive(receivedAnswer)) continue;
+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;
+}
 
-      // 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);
 
-      // Transmit SELECT_UID
-      ReaderTransmit(sel_uid_c2,sizeof(sel_uid_c2));
+//-----------------------------------------------------------------------------
+// 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];
 
-      // Receive the SAK
-      if (!ReaderReceive(receivedAnswer)) continue;
-               }
+       if(param & ISO14A_REQUEST_TRIGGER) iso14a_set_trigger(1);
 
-    // Transmit MIFARE_CLASSIC_AUTH
-    ReaderTransmit(mf_auth,sizeof(mf_auth));
+       if(param & ISO14A_CONNECT) {
+               iso14443a_setup();
+               ack->arg[0] = iso14443a_select_card(ack->d.asBytes, (iso14a_card_select_t *) (ack->d.asBytes+12));
+               UsbSendPacket((void *)ack, sizeof(UsbCommand));
+       }
 
-    // Receive the (16 bit) "random" nonce
-    if (!ReaderReceive(receivedAnswer)) continue;
+       if(param & ISO14A_SET_TIMEOUT) {
+               iso14a_timeout = c->arg[2];
        }
 
-  // Thats it...
+       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();
-       Dbprintf("%x %x %x", rsamples, 0xCC, 0xCC);
-       DbpString("ready..");
 }
-
 //-----------------------------------------------------------------------------
 // Read an ISO 14443a tag. Send out commands and store answers.
 //
 //-----------------------------------------------------------------------------
 void ReaderMifare(uint32_t parameter)
 {
-
-       // Anticollision
-       uint8_t wupa[]       = { 0x52 };
-       uint8_t sel_all[]    = { 0x93,0x20 };
-       uint8_t sel_uid[]    = { 0x93,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-
        // Mifare AUTH
        uint8_t mf_auth[]    = { 0x60,0x00,0xf5,0x7b };
   uint8_t mf_nr_ar[]   = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
@@ -1597,41 +1653,12 @@ void ReaderMifare(uint32_t parameter)
   traceLen = 0;
   tracing = false;
 
-       // 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);
-
-  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);
-       SpinDelay(200);
+       iso14443a_setup();
 
        LED_A_ON();
        LED_B_OFF();
        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;
@@ -1652,28 +1679,12 @@ void ReaderMifare(uint32_t parameter)
     SpinDelay(200);
     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;
-
-    // Transmit SELECT_ALL
-    ReaderTransmit(sel_all,sizeof(sel_all));
-
-    // Receive the UID
-    if (!ReaderReceive(receivedAnswer)) continue;
-
-    // Transmit SELECT_UID
-    ReaderTransmit(sel_uid,sizeof(sel_uid));
-
-    // Receive the SAK
-    if (!ReaderReceive(receivedAnswer)) continue;
+    if(!iso14443a_select_card(NULL, NULL)) continue;
 
     // Transmit MIFARE_CLASSIC_AUTH
     ReaderTransmit(mf_auth,sizeof(mf_auth));
@@ -1719,7 +1730,6 @@ void ReaderMifare(uint32_t parameter)
     }
   }
 
-  LogTrace(sel_uid+2,4,0,GetParity(sel_uid+2,4),TRUE);
   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);
Impressum, Datenschutz