removed output that slowed down the process, this is to avoid missing frames

[proxmark3-svn] / armsrc / iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index e4b1a48854d68cc083cd381e294748f6d8b2db0b..ced29424f28498f7c4b44ac1b8daa2be11282999 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -60,22 +60,6 @@ static int timeout = 4096;
 #define        SEC_Y 0x00
 #define        SEC_Z 0xc0
 
 #define        SEC_Y 0x00
 #define        SEC_Z 0xc0
 

-// SAME AS IN iso14443a.
-#define RECV_CMD_OFFSET   3032
-#define RECV_RES_OFFSET   3096
-#define DMA_BUFFER_OFFSET 3160
-#define DMA_BUFFER_SIZE   4096
-#define TRACE_LENGTH      3000
-
-uint32_t SwapBits(uint32_t value, int nrbits) {
-       int i;
-       uint32_t newvalue = 0;
-       for(i = 0; i < nrbits; i++) {
-               newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
-       }
-       return newvalue;
-}
-

 static int SendIClassAnswer(uint8_t *resp, int respLen, int delay);
 
 //-----------------------------------------------------------------------------
 static int SendIClassAnswer(uint8_t *resp, int respLen, int delay);
 
 //-----------------------------------------------------------------------------


@@ -687,7 +671,7 @@ void RAMFUNC SnoopIClass(void)
 // #define RECV_RES_OFFSET   3096
 // #define DMA_BUFFER_OFFSET 3160
 // #define DMA_BUFFER_SIZE   4096
 // #define RECV_RES_OFFSET   3096
 // #define DMA_BUFFER_OFFSET 3160
 // #define DMA_BUFFER_SIZE   4096

-// #define TRACE_LENGTH      3000
+// #define TRACE_SIZE        3000

 
     // 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
 
     // 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


@@ -816,7 +800,7 @@ void RAMFUNC SnoopIClass(void)
                        trace[traceLen++] = Uart.byteCnt;
                        memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
                        traceLen += Uart.byteCnt;
                        trace[traceLen++] = Uart.byteCnt;
                        memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
                        traceLen += Uart.byteCnt;

-                       if(traceLen > TRACE_LENGTH) break;
+                       if(traceLen > TRACE_SIZE) break;

                    //}
                    /* And ready to receive another command. */
                    Uart.state = STATE_UNSYNCD;
                    //}
                    /* And ready to receive another command. */
                    Uart.state = STATE_UNSYNCD;


@@ -848,7 +832,7 @@ void RAMFUNC SnoopIClass(void)
                    trace[traceLen++] = Demod.len;
                    memcpy(trace+traceLen, receivedResponse, Demod.len);
                    traceLen += Demod.len;
                    trace[traceLen++] = Demod.len;
                    memcpy(trace+traceLen, receivedResponse, Demod.len);
                    traceLen += Demod.len;

-                   if(traceLen > TRACE_LENGTH) break;
+                   if(traceLen > TRACE_SIZE) break;

 
                    //triggered = TRUE;
 
 
                    //triggered = TRUE;
 


@@ -1011,6 +995,11 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
 {
        uint8_t simType = arg0;
 
 {
        uint8_t simType = arg0;
 

+  // Enable and clear the trace
+       tracing = TRUE;
+       traceLen = 0;
+  memset(trace, 0x44, TRACE_SIZE);
+

        // CSN followed by two CRC bytes
        uint8_t response2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
        uint8_t response3[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
        // CSN followed by two CRC bytes
        uint8_t response2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
        uint8_t response3[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };


@@ -1037,31 +1026,34 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
        // Reader 81 anticoll. CSN
        // Tag    CSN
 
        // Reader 81 anticoll. CSN
        // Tag    CSN
 

-        uint8_t *resp;
-        int respLen;
+       uint8_t *resp;
+       int respLen;
+       uint8_t* respdata = NULL;
+       int respsize = 0;
+       uint8_t sof = 0x0f;

 
        // Respond SOF -- takes 8 bytes
 
        // Respond SOF -- takes 8 bytes

-       uint8_t *resp1 = (((uint8_t *)BigBuf) + 800);
+       uint8_t *resp1 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET);

        int resp1Len;
 
        // Anticollision CSN (rotated CSN)
        // 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)
        int resp1Len;
 
        // Anticollision CSN (rotated CSN)
        // 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)

-       uint8_t *resp2 = (((uint8_t *)BigBuf) + 810);
+       uint8_t *resp2 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 10);

        int resp2Len;
 
        // CSN
        // 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)
        int resp2Len;
 
        // CSN
        // 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)

-       uint8_t *resp3 = (((uint8_t *)BigBuf) + 990);
+       uint8_t *resp3 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 190);

        int resp3Len;
 
        // e-Purse
        // 144: Takes 16 bytes for SOF/EOF and 8 * 16 = 128 bytes (2 bytes/bit)
        int resp3Len;
 
        // e-Purse
        // 144: Takes 16 bytes for SOF/EOF and 8 * 16 = 128 bytes (2 bytes/bit)

-       uint8_t *resp4 = (((uint8_t *)BigBuf) + 1170);
+       uint8_t *resp4 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 370);

        int resp4Len;
 
        // + 1720..
        int resp4Len;
 
        // + 1720..

-       uint8_t *receivedCmd = (uint8_t *)BigBuf;
-       memset(receivedCmd, 0x44, 400);
+  uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
+       memset(receivedCmd, 0x44, RECV_CMD_SIZE);

        int len;
 
        // Prepare card messages
        int len;
 
        // Prepare card messages


@@ -1094,36 +1086,46 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
        for(;;) {
                LED_B_OFF();
                if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {
        for(;;) {
                LED_B_OFF();
                if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {

-                       DbpString("button press");
+                       DbpString("button press");

                        break;
                        break;

-                       }
+               }

 
 

-               // Okay, look at the command now.
-               if(receivedCmd[0] == 0x0a) {
+               // Okay, look at the command now.
+               if(receivedCmd[0] == 0x0a) {

                        // Reader in anticollission phase
                        resp = resp1; respLen = resp1Len; //order = 1;
                        // Reader in anticollission phase
                        resp = resp1; respLen = resp1Len; //order = 1;

+                       respdata = &sof;
+                       respsize = sizeof(sof);

                        //resp = resp2; respLen = resp2Len; order = 2;
                        //DbpString("Hello request from reader:");
                } else if(receivedCmd[0] == 0x0c) {
                        // Reader asks for anticollission CSN
                        resp = resp2; respLen = resp2Len; //order = 2;
                        //resp = resp2; respLen = resp2Len; order = 2;
                        //DbpString("Hello request from reader:");
                } else if(receivedCmd[0] == 0x0c) {
                        // Reader asks for anticollission CSN
                        resp = resp2; respLen = resp2Len; //order = 2;

+                       respdata = response2;
+                       respsize = sizeof(response2);

                        //DbpString("Reader requests anticollission CSN:");
                } else if(receivedCmd[0] == 0x81) {
                        // Reader selects anticollission CSN.
                        // Tag sends the corresponding real CSN
                        resp = resp3; respLen = resp3Len; //order = 3;
                        //DbpString("Reader requests anticollission CSN:");
                } else if(receivedCmd[0] == 0x81) {
                        // Reader selects anticollission CSN.
                        // Tag sends the corresponding real CSN
                        resp = resp3; respLen = resp3Len; //order = 3;

+                       respdata = response3;
+                       respsize = sizeof(response3);

                        //DbpString("Reader selects anticollission CSN:");
                } else if(receivedCmd[0] == 0x88) {
                        // Read e-purse (88 02)
                        resp = resp4; respLen = resp4Len; //order = 4;
                        //DbpString("Reader selects anticollission CSN:");
                } else if(receivedCmd[0] == 0x88) {
                        // Read e-purse (88 02)
                        resp = resp4; respLen = resp4Len; //order = 4;

+                       respdata = response4;
+                       respsize = sizeof(response4);

                        LED_B_ON();
                } else if(receivedCmd[0] == 0x05) {
                        // Reader random and reader MAC!!!
                        // Lets store this ;-)
                        LED_B_ON();
                } else if(receivedCmd[0] == 0x05) {
                        // Reader random and reader MAC!!!
                        // Lets store this ;-)

+/*

                        Dbprintf("                CSN: %02x %02x %02x %02x %02x %02x %02x %02x",
                        response3[0], response3[1], response3[2],
                        response3[3], response3[4], response3[5],
                        response3[6], response3[7]);
                        Dbprintf("                CSN: %02x %02x %02x %02x %02x %02x %02x %02x",
                        response3[0], response3[1], response3[2],
                        response3[3], response3[4], response3[5],
                        response3[6], response3[7]);

+*/                     

                        Dbprintf("READER AUTH (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                        len,
                        receivedCmd[0], receivedCmd[1], receivedCmd[2],
                        Dbprintf("READER AUTH (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                        len,
                        receivedCmd[0], receivedCmd[1], receivedCmd[2],


@@ -1133,15 +1135,14 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
                        // Do not respond
                        // We do not know what to answer, so lets keep quit
                        resp = resp1; respLen = 0; //order = 5;
                        // Do not respond
                        // We do not know what to answer, so lets keep quit
                        resp = resp1; respLen = 0; //order = 5;

+                       respdata = NULL;
+                       respsize = 0;

                } else if(receivedCmd[0] == 0x00 && len == 1) {
                        // Reader ends the session
                        resp = resp1; respLen = 0; //order = 0;
                } else if(receivedCmd[0] == 0x00 && len == 1) {
                        // Reader ends the session
                        resp = resp1; respLen = 0; //order = 0;

-/*             } else if(receivedCmd[0] == 0x50) {
-                       // Received a HALT
-                       resp = resp1; respLen = 0; order = 5; // Do nothing
-                       DbpString("Reader requested we HALT!:");
-*/
-               } else {
+                       respdata = NULL;
+                       respsize = 0;
+               } else {

                        // Never seen this command before
                        Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
                        len,
                        // Never seen this command before
                        Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
                        len,


@@ -1150,10 +1151,10 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
                        receivedCmd[6], receivedCmd[7], receivedCmd[8]);
                        // Do not respond
                        resp = resp1; respLen = 0; //order = 0;
                        receivedCmd[6], receivedCmd[7], receivedCmd[8]);
                        // Do not respond
                        resp = resp1; respLen = 0; //order = 0;

+                       respdata = NULL;
+                       respsize = 0;

                }
 
                }
 

-               memset(receivedCmd, 0x44, 32);
-

                if(cmdsRecvd > 999) {
                        DbpString("1000 commands later...");
                        break;
                if(cmdsRecvd > 999) {
                        DbpString("1000 commands later...");
                        break;


@@ -1162,10 +1163,23 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
                        cmdsRecvd++;
                }
 
                        cmdsRecvd++;
                }
 

-               if(respLen <= 0) continue;
+               if(respLen > 0) {
+                       SendIClassAnswer(resp, respLen, 21);
+               }
+               
+               if (tracing) {
+                       LogTrace(receivedCmd,len, 0, Uart.parityBits, TRUE);
+                       if (respdata != NULL) {
+                               LogTrace(respdata,respsize, 0, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
+                       }
+                       if(traceLen > TRACE_SIZE) {
+                               DbpString("Trace full");
+                               break;
+                       }
+               }

 
 

-               SendIClassAnswer(resp, respLen, 21);
-    }
+               memset(receivedCmd, 0x44, RECV_CMD_SIZE);
+       }

 
        Dbprintf("%x", cmdsRecvd);
        LED_A_OFF();
 
        Dbprintf("%x", cmdsRecvd);
        LED_A_OFF();


@@ -1402,7 +1416,7 @@ int ReaderReceiveIClass(uint8_t* receivedAnswer)
 void ReaderIClass(uint8_t arg0) {
        uint8_t act_all[]     = { 0x0a };
        uint8_t identify[]    = { 0x0c };
 void ReaderIClass(uint8_t arg0) {
        uint8_t act_all[]     = { 0x0a };
        uint8_t identify[]    = { 0x0c };

-       //uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+       uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

 
        uint8_t* resp = (((uint8_t *)BigBuf) + 3560);   // was 3560 - tied to other size changes
 
 
        uint8_t* resp = (((uint8_t *)BigBuf) + 3560);   // was 3560 - tied to other size changes
 


@@ -1428,74 +1442,37 @@ void ReaderIClass(uint8_t arg0) {
        LED_A_ON();
 
        for(;;) {
        LED_A_ON();
 
        for(;;) {

-               if(traceLen > TRACE_LENGTH || BUTTON_PRESS()) break;
+       
+               if(traceLen > TRACE_SIZE) {
+                       DbpString("Trace full");
+                       break;
+               }
+               
+               if (BUTTON_PRESS()) break;

 
                // Send act_all
                ReaderTransmitIClass(act_all, 1);
                // Card present?
                if(ReaderReceiveIClass(resp)) {
                        ReaderTransmitIClass(identify, 1);
 
                // Send act_all
                ReaderTransmitIClass(act_all, 1);
                // Card present?
                if(ReaderReceiveIClass(resp)) {
                        ReaderTransmitIClass(identify, 1);

-                       if(ReaderReceiveIClass(resp)) {
-                               //ReaderTransmitIClass(select, sizeof(select));
+                       if(ReaderReceiveIClass(resp) == 10) {
+                               // Select card          
+                               memcpy(&select[1],resp,8);
+                               ReaderTransmitIClass(select, sizeof(select));
+
+                               if(ReaderReceiveIClass(resp) == 10) {
+                                       Dbprintf("     Selected CSN: %02x %02x %02x %02x %02x %02x %02x %02x",
+                                       resp[0], resp[1], resp[2],
+                                       resp[3], resp[4], resp[5],
+                                       resp[6], resp[7]);
+                               }
+                               // Card selected, whats next... ;-)

                        }
                }
                WDT_HIT();
        }
        
        LED_A_OFF();
                        }
                }
                WDT_HIT();
        }
        
        LED_A_OFF();

-
-/*     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);
-
-               // Construct SELECT UID command
-               memcpy(sel_uid+2,resp,5);
-               AppendCrc14443a(sel_uid,7);
-               ReaderTransmit(sel_uid,sizeof(sel_uid));
-
-               // 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;
-       }
-*/     

 }
 
 
 }