Implemented new optimized version of MAC-calculation for iclass

[proxmark3-svn] / armsrc / iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index a976217d4e70f8e792dbb6a9e43d1cd3ff82fd37..ca6d9a7ec26b1b27cd88cfd2b6f796aa9da2d4fa 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -47,8 +47,9 @@
 // different initial value (CRC_ICLASS)
 #include "iso14443crc.h"
 #include "iso15693tools.h"
-#include "cipher.h"
 #include "protocols.h"
+#include "optimized_cipher.h"
+
 static int timeout = 4096;
 
 
@@ -1085,7 +1086,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        // 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;
 
@@ -1132,8 +1133,10 @@ 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;
 
-       //This is used for responding to READ-block commands
+       //This is used for responding to READ-block commands or other data which is dynamically generated
        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
+       uint8_t *data_generic_trace = BigBuf_malloc(8 * 2 + 2);
 
        // Start from off (no field generated)
        //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -1201,7 +1204,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                                //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 };
+                               uint8_t diversified_key[8] = { 0 };
+
                                //Get the diversified key from emulator memory
                                memcpy(diversified_key, emulator+(8*3),8);
                                uint8_t ccnr[12] = { 0 };
@@ -1210,12 +1214,14 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                                //Put nr there
                                memcpy(ccnr+8, receivedCmd+1,4);
                                //Now, calc MAC
-                               doMAC(ccnr,diversified_key, trace_data);
+                               opt_doMAC(ccnr,diversified_key, data_generic_trace);
+                               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;
+                               //exitLoop = true;
                        }else
                        {       //Not fullsim, we don't respond
                                // We do not know what to answer, so lets keep quiet
@@ -1253,6 +1259,13 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                        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