ADD: fixed some spelling misstakes in luascript.

[proxmark3-svn] / armsrc / iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index def6cc97828ce1483826700ac5dc90f2816e16e1..38b525338a403c47f2cbe2172598114d685ca1c4 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -36,7 +36,7 @@
 //
 //-----------------------------------------------------------------------------
 
 //
 //-----------------------------------------------------------------------------
 

-#include "../include/proxmark3.h"
+#include "proxmark3.h"

 #include "apps.h"
 #include "util.h"
 #include "string.h"
 #include "apps.h"
 #include "util.h"
 #include "string.h"


@@ -45,11 +45,10 @@
 // Needed for CRC in emulation mode;
 // same construction as in ISO 14443;
 // different initial value (CRC_ICLASS)
 // Needed for CRC in emulation mode;
 // same construction as in ISO 14443;
 // different initial value (CRC_ICLASS)

-#include "../common/iso14443crc.h"
-#include "../common/iso15693tools.h"
-//#include "iso15693tools.h"
-#include "cipher.h"
+#include "iso14443crc.h"
+#include "iso15693tools.h"

 #include "protocols.h"
 #include "protocols.h"

+#include "optimized_cipher.h"

 
 static int timeout = 4096;
 
 
 static int timeout = 4096;
 


@@ -1043,6 +1042,10 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
        Dbprintf("Done...");
 
 }
        Dbprintf("Done...");
 
 }

+void AppendCrc(uint8_t* data, int len)
+{
+       ComputeCrc14443(CRC_ICLASS,data,len,data+len,data+len+1);
+}

 
 /**
  * @brief Does the actual simulation
 
 /**
  * @brief Does the actual simulation


@@ -1054,6 +1057,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        // free eventually allocated BigBuf memory
        BigBuf_free_keep_EM();
 
        // free eventually allocated BigBuf memory
        BigBuf_free_keep_EM();
 

+       State cipher_state;
+//     State cipher_state_reserve;

        uint8_t *csn = BigBuf_get_EM_addr();
        uint8_t *emulator = csn;
        uint8_t sof_data[] = { 0x0F} ;
        uint8_t *csn = BigBuf_get_EM_addr();
        uint8_t *emulator = csn;
        uint8_t sof_data[] = { 0x0F} ;


@@ -1070,12 +1075,20 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        ComputeCrc14443(CRC_ICLASS, anticoll_data, 8, &anticoll_data[8], &anticoll_data[9]);
        ComputeCrc14443(CRC_ICLASS, csn_data, 8, &csn_data[8], &csn_data[9]);
 
        ComputeCrc14443(CRC_ICLASS, anticoll_data, 8, &anticoll_data[8], &anticoll_data[9]);
        ComputeCrc14443(CRC_ICLASS, csn_data, 8, &csn_data[8], &csn_data[9]);
 

+       uint8_t diversified_key[8] = { 0 };

        // e-Purse
        uint8_t card_challenge_data[8] = { 0x00 };
        if(simulationMode == MODE_FULLSIM)
        {
        // e-Purse
        uint8_t card_challenge_data[8] = { 0x00 };
        if(simulationMode == MODE_FULLSIM)
        {

+               //The diversified key should be stored on block 3
+               //Get the diversified key from emulator memory
+               memcpy(diversified_key, emulator+(8*3),8);
+

                //Card challenge, a.k.a e-purse is on block 2
                memcpy(card_challenge_data,emulator + (8 * 2) , 8);
                //Card challenge, a.k.a e-purse is on block 2
                memcpy(card_challenge_data,emulator + (8 * 2) , 8);

+               //Precalculate the cipher state, feeding it the CC
+               cipher_state = opt_doTagMAC_1(card_challenge_data,diversified_key);
+

        }
 
        int exitLoop = 0;
        }
 
        int exitLoop = 0;


@@ -1087,7 +1100,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        // Tag    CSN
 
        uint8_t *modulated_response;
        // Tag    CSN
 
        uint8_t *modulated_response;

-       int modulated_response_size;
+       int modulated_response_size = 0;

        uint8_t* trace_data = NULL;
        int trace_data_size = 0;
 
        uint8_t* trace_data = NULL;
        int trace_data_size = 0;
 


@@ -1112,7 +1125,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        int resp_cc_len;
 
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
        int resp_cc_len;
 
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);

-       memset(receivedCmd, 0x44, MAX_FRAME_SIZE);

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


@@ -1134,8 +1146,12 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
        memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
 
        CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
        memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
 

-       //This is used for responding to READ-block commands
-       uint8_t *data_response = BigBuf_malloc(8 * 2 + 2);
+       //This is used for responding to READ-block commands or other data which is dynamically generated
+       //First the 'trace'-data, not encoded for FPGA
+       uint8_t *data_generic_trace = BigBuf_malloc(8 + 2);//8 bytes data + 2byte CRC is max tag answer
+       //Then storage for the modulated data
+       //Each bit is doubled when modulated for FPGA, and we also have SOF and EOF (2 bytes)
+       uint8_t *data_response = BigBuf_malloc( (8+2) * 2 + 2);

 
        // Start from off (no field generated)
        //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
        // Start from off (no field generated)
        //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);


@@ -1155,9 +1171,9 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
 
        LED_A_ON();
        bool buttonPressed = false;
 
        LED_A_ON();
        bool buttonPressed = false;

-
+       uint8_t response_delay = 1;

        while(!exitLoop) {
        while(!exitLoop) {

-
+               response_delay = 1;

                LED_B_OFF();
                //Signal tracer
                // Can be used to get a trigger for an oscilloscope..
                LED_B_OFF();
                //Signal tracer
                // Can be used to get a trigger for an oscilloscope..


@@ -1199,25 +1215,18 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                } else if(receivedCmd[0] == ICLASS_CMD_CHECK) {
                        // Reader random and reader MAC!!!
                        if(simulationMode == MODE_FULLSIM)
                } else if(receivedCmd[0] == ICLASS_CMD_CHECK) {
                        // Reader random and reader MAC!!!
                        if(simulationMode == MODE_FULLSIM)

-                       {       //This is what we must do..
-                               //Reader just sent us NR and MAC(k,cc * nr)
-                               //The diversified key should be stored on block 3
-                               //However, from a typical dump, the key will not be there
-                               uint8_t *diversified_key = { 0 };
-                               //Get the diversified key from emulator memory
-                               memcpy(diversified_key, emulator+(8*3),8);
-                               uint8_t ccnr[12] = { 0 };
-                               //Put our cc there (block 2)
-                               memcpy(ccnr, emulator + (8 * 2), 8);
-                               //Put nr there
-                               memcpy(ccnr+8, receivedCmd+1,4);
-                               //Now, calc MAC
-                               doMAC(ccnr,diversified_key, trace_data);
+                       {
+                               //NR, from reader, is in receivedCmd +1
+                               opt_doTagMAC_2(cipher_state,receivedCmd+1,data_generic_trace,diversified_key);
+
+                               trace_data = data_generic_trace;

                                trace_data_size = 4;
                                CodeIClassTagAnswer(trace_data , trace_data_size);
                                memcpy(data_response, ToSend, ToSendMax);
                                modulated_response = data_response;
                                modulated_response_size = ToSendMax;
                                trace_data_size = 4;
                                CodeIClassTagAnswer(trace_data , trace_data_size);
                                memcpy(data_response, ToSend, ToSendMax);
                                modulated_response = data_response;
                                modulated_response_size = ToSendMax;

+                               response_delay = 0;//We need to hurry here...
+                               //exitLoop = true;

                        }else
                        {       //Not fullsim, we don't respond
             // We do not know what to answer, so lets keep quiet
                        }else
                        {       //Not fullsim, we don't respond
             // We do not know what to answer, so lets keep quiet


@@ -1248,13 +1257,40 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                } else if(simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){
                        //Read block
                        uint16_t blk = receivedCmd[1];
                } else if(simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){
                        //Read block
                        uint16_t blk = receivedCmd[1];

-                       trace_data = emulator+(blk << 3);
-                       trace_data_size = 8;
+                       //Take the data...
+                       memcpy(data_generic_trace, emulator+(blk << 3),8);
+                       //Add crc
+                       AppendCrc(data_generic_trace, 8);
+                       trace_data = data_generic_trace;
+                       trace_data_size = 10;
+                       CodeIClassTagAnswer(trace_data , trace_data_size);
+                       memcpy(data_response, ToSend, ToSendMax);
+                       modulated_response = data_response;
+                       modulated_response_size = ToSendMax;
+               }else if(receivedCmd[0] == ICLASS_CMD_UPDATE && simulationMode == MODE_FULLSIM)
+               {//Probably the reader wants to update the nonce. Let's just ignore that for now.
+                       // OBS! If this is implemented, don't forget to regenerate the cipher_state
+                       //We're expected to respond with the data+crc, exactly what's already in the receivedcmd
+                       //receivedcmd is now UPDATE 1b | ADDRESS 1b| DATA 8b| Signature 4b or CRC 2b|
+
+                       //Take the data...
+                       memcpy(data_generic_trace, receivedCmd+2,8);
+                       //Add crc
+                       AppendCrc(data_generic_trace, 8);
+                       trace_data = data_generic_trace;
+                       trace_data_size = 10;

                        CodeIClassTagAnswer(trace_data , trace_data_size);
                        memcpy(data_response, ToSend, ToSendMax);
                        modulated_response = data_response;
                        modulated_response_size = ToSendMax;
                }
                        CodeIClassTagAnswer(trace_data , trace_data_size);
                        memcpy(data_response, ToSend, ToSendMax);
                        modulated_response = data_response;
                        modulated_response_size = ToSendMax;
                }

+               else if(receivedCmd[0] == ICLASS_CMD_PAGESEL)
+               {//Pagesel
+                       //Pagesel enables to select a page in the selected chip memory and return its configuration block
+                       //Chips with a single page will not answer to this command
+                       // It appears we're fine ignoring this.
+                       //Otherwise, we should answer 8bytes (block) + 2bytes CRC
+               }

                else {
                        //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
                        // Never seen this command before
                else {
                        //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
                        // Never seen this command before


@@ -1280,7 +1316,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                A legit tag has about 380us delay between reader EOT and tag SOF.
                **/
                if(modulated_response_size > 0) {
                A legit tag has about 380us delay between reader EOT and tag SOF.
                **/
                if(modulated_response_size > 0) {

-                       SendIClassAnswer(modulated_response, modulated_response_size, 1);
+                       SendIClassAnswer(modulated_response, modulated_response_size, response_delay);

                        t2r_time = GetCountSspClk();
                }
 
                        t2r_time = GetCountSspClk();
                }
 


@@ -1299,7 +1335,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                        }
 
                }
                        }
 
                }

-               memset(receivedCmd, 0x44, MAX_FRAME_SIZE);

        }
 
        //Dbprintf("%x", cmdsRecvd);
        }
 
        //Dbprintf("%x", cmdsRecvd);


@@ -1590,7 +1625,10 @@ uint8_t handshakeIclassTag(uint8_t *card_data)
        static uint8_t act_all[]     = { 0x0a };
        static uint8_t identify[]    = { 0x0c };
        static uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
        static uint8_t act_all[]     = { 0x0a };
        static uint8_t identify[]    = { 0x0c };
        static uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

-       static uint8_t readcheck_cc[]= { 0x88, 0x02 };
+
+
+       static uint8_t readcheck_cc[]= { 0x88, 0x02,};
+

        uint8_t resp[ICLASS_BUFFER_SIZE];
 
        uint8_t read_status = 0;
        uint8_t resp[ICLASS_BUFFER_SIZE];
 
        uint8_t read_status = 0;


@@ -1625,30 +1663,38 @@ uint8_t handshakeIclassTag(uint8_t *card_data)
        if(ReaderReceiveIClass(resp) == 8) {
                //Save CC (e-purse) in response data
                memcpy(card_data+8,resp,8);
        if(ReaderReceiveIClass(resp) == 8) {
                //Save CC (e-purse) in response data
                memcpy(card_data+8,resp,8);

-
-               //Got both
-               read_status = 2;
+               read_status++;

        }
 
        return read_status;
 }
 
        }
 
        return read_status;
 }
 

+

 // Reader iClass Anticollission
 void ReaderIClass(uint8_t arg0) {
 
 // Reader iClass Anticollission
 void ReaderIClass(uint8_t arg0) {
 

-    uint8_t card_data[24]={0};
+       uint8_t card_data[6 * 8]={0};
+       memset(card_data, 0xFF, sizeof(card_data));

     uint8_t last_csn[8]={0};
        
     uint8_t last_csn[8]={0};
        

+       //Read conf block CRC(0x01) => 0xfa 0x22
+       uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY,0x01, 0xfa, 0x22};
+       //Read conf block CRC(0x05) => 0xde  0x64
+       uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY,0x05, 0xde, 0x64};
+
+

     int read_status= 0;
     int read_status= 0;

+       uint8_t result_status = 0;

     bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;
     bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;

-       bool get_cc = arg0 & FLAG_ICLASS_READER_GET_CC;
+       bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;

        set_tracing(TRUE);
     setupIclassReader();
 
        set_tracing(TRUE);
     setupIclassReader();
 

-    size_t datasize = 0;
+       uint16_t tryCnt=0;

     while(!BUTTON_PRESS())
     {
     while(!BUTTON_PRESS())
     {

-
+               if (try_once && tryCnt > 5) break; 
+               tryCnt++;

                if(!tracing) {
                        DbpString("Trace full");
                        break;
                if(!tracing) {
                        DbpString("Trace full");
                        break;


@@ -1658,15 +1704,40 @@ void ReaderIClass(uint8_t arg0) {
                read_status = handshakeIclassTag(card_data);
 
                if(read_status == 0) continue;
                read_status = handshakeIclassTag(card_data);
 
                if(read_status == 0) continue;

-               if(read_status == 1) datasize = 8;
-               if(read_status == 2) datasize = 16;
+               if(read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
+               if(read_status == 2) result_status = FLAG_ICLASS_READER_CSN|FLAG_ICLASS_READER_CC;
+
+               // handshakeIclass returns CSN|CC, but the actual block
+               // layout is CSN|CONFIG|CC, so here we reorder the data,
+               // moving CC forward 8 bytes
+               memcpy(card_data+16,card_data+8, 8);
+               //Read block 1, config
+               if(arg0 & FLAG_ICLASS_READER_CONF)
+               {
+                       if(sendCmdGetResponseWithRetries(readConf, sizeof(readConf),card_data+8, 10, 10))
+                       {
+                               Dbprintf("Failed to dump config block");
+                       }else
+                       {
+                               result_status |= FLAG_ICLASS_READER_CONF;
+                       }
+               }

 
 

-               //Todo, read the public blocks 1,5 aswell:
-               //
-               // 0 : CSN (we already have)
+               //Read block 5, AA
+               if(arg0 & FLAG_ICLASS_READER_AA){
+                       if(sendCmdGetResponseWithRetries(readAA, sizeof(readAA),card_data+(8*4), 10, 10))
+                       {
+//                             Dbprintf("Failed to dump AA block");
+                       }else
+                       {
+                               result_status |= FLAG_ICLASS_READER_AA;
+                       }
+               }
+
+               // 0 : CSN

                // 1 : Configuration
                // 1 : Configuration

-               // 2 : e-purse (we already have)
-               // (3,4 write-only)
+               // 2 : e-purse
+               // (3,4 write-only, kc and kd)

                // 5 Application issuer area
                //
                //Then we can 'ship' back the 8 * 5 bytes of data,
                // 5 Application issuer area
                //
                //Then we can 'ship' back the 8 * 5 bytes of data,


@@ -1676,10 +1747,10 @@ void ReaderIClass(uint8_t arg0) {
                     //Send back to client, but don't bother if we already sent this
                     if(memcmp(last_csn, card_data, 8) != 0)
                {
                     //Send back to client, but don't bother if we already sent this
                     if(memcmp(last_csn, card_data, 8) != 0)
                {

-
-                       if(!get_cc || (get_cc && read_status == 2))
+                       // If caller requires that we get CC, continue until we got it
+                       if( (arg0 & read_status & FLAG_ICLASS_READER_CC) || !(arg0 & FLAG_ICLASS_READER_CC))

                        {
                        {

-                        cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
+                               cmd_send(CMD_ACK,result_status,0,0,card_data,sizeof(card_data));

                                if(abort_after_read) {
                                        LED_A_OFF();
                                        return;
                                if(abort_after_read) {
                                        LED_A_OFF();
                                        return;


@@ -1687,7 +1758,7 @@ void ReaderIClass(uint8_t arg0) {
                     //Save that we already sent this....
                         memcpy(last_csn, card_data, 8);
                        }
                     //Save that we already sent this....
                         memcpy(last_csn, card_data, 8);
                        }

-                       //If 'get_cc' was specified and we didn't get a CC, we'll just keep trying...
+

                }
                LED_B_OFF();
     }
                }
                LED_B_OFF();
     }