]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
committericeman1001 <iceman@iuse.se>
Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h

1  2 
armsrc/Makefile
armsrc/iclass.c
client/Makefile
client/cmddata.c
client/loclass/cipher.c
client/loclass/fileutils.h

diff --combined armsrc/Makefile
index c007065226588372506ebc97434b3667a4c3fab6,be08e56b1a0e7a9ce7f864f0f73f6989e144c41e..be4351d835fea363cd7c94a00f0ee178a4bf83c9
@@@ -10,12 -10,12 +10,12 @@@ APP_INCLUDES = apps.
  
  #remove one of the following defines and comment out the relevant line
  #in the next section to remove that particular feature from compilation  
- APP_CFLAGS    = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -fno-strict-aliasing
+ APP_CFLAGS    = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE -fno-strict-aliasing
  #-DWITH_LCD 
  
  #SRC_LCD = fonts.c LCD.c
  SRC_LF = lfops.c hitag2.c lfsampling.c
- SRC_ISO15693 = iso15693.c iso15693tools.c 
+ SRC_ISO15693 = iso15693.c iso15693tools.c
  SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
  SRC_ISO14443b = iso14443.c
  SRC_CRAPTO1 = crapto1.c crypto1.c des.c aes.c 
@@@ -43,8 -43,9 +43,10 @@@ ARMSRC = fpgaloader.c 
        legic_prng.c \
        iclass.c \
        BigBuf.c \
+       cipher.c \
+       cipherutils.c\
  
 +
  # stdint.h provided locally until GCC 4.5 becomes C99 compliant
  APP_CFLAGS += -I.
  
diff --combined armsrc/iclass.c
index 816cb904108adb8eab227155d63bb78b1abf4f41,a976217d4e70f8e792dbb6a9e43d1cd3ff82fd37..def6cc97828ce1483826700ac5dc90f2816e16e1
@@@ -36,7 -36,7 +36,7 @@@
  //
  //-----------------------------------------------------------------------------
  
 -#include "proxmark3.h"
 +#include "../include/proxmark3.h"
  #include "apps.h"
  #include "util.h"
  #include "string.h"
  // Needed for CRC in emulation mode;
  // same construction as in ISO 14443;
  // different initial value (CRC_ICLASS)
 -#include "iso14443crc.h"
 -#include "iso15693tools.h"
 +#include "../common/iso14443crc.h"
 +#include "../common/iso15693tools.h"
 +//#include "iso15693tools.h"
+ #include "cipher.h"
+ #include "protocols.h"
 +
  static int timeout = 4096;
  
  
@@@ -353,7 -352,7 +354,7 @@@ static struct 
                SUB_SECOND_HALF,
                SUB_BOTH
        }               sub;
 -    uint8_t *output;
 +    uint8_t   *output;
  } Demod;
  
  static RAMFUNC int ManchesterDecoding(int v)
@@@ -658,7 -657,7 +659,7 @@@ void RAMFUNC SnoopIClass(void
        clear_trace();
      iso14a_set_trigger(FALSE);
  
 -      int lastRxCounter;
 +    int lastRxCounter;
      uint8_t *upTo;
      int smpl;
      int maxBehindBy = 0;
                if(ManchesterDecoding(smpl & 0x0F)) {
                        time_stop = (GetCountSspClk()-time_0) << 4;
  
 -                      rsamples = samples - Demod.samples;
 +                  rsamples = samples - Demod.samples;
                    LED_B_ON();
  
                        if(tracing)     {
@@@ -944,7 -943,7 +945,7 @@@ static void CodeIClassTagAnswer(const u
                uint8_t b = cmd[i];
                ToSend[++ToSendMax] = encode4Bits(b & 0xF); //Least significant half
                ToSend[++ToSendMax] = encode4Bits((b >>4) & 0xF);//Most significant half
 -      }
 +                      }
  
        // Send EOF
        ToSend[++ToSendMax] = 0xB8;
@@@ -967,8 -966,11 +968,11 @@@ static void CodeIClassTagSOF(
        // Convert from last byte pos to length
        ToSendMax++;
  }
+ #define MODE_SIM_CSN        0
+ #define MODE_EXIT_AFTER_MAC 1
+ #define MODE_FULLSIM        2
  
- int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived, uint8_t *reader_mac_buf);
+ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf);
  /**
   * @brief SimulateIClass simulates an iClass card.
   * @param arg0 type of simulation
@@@ -990,15 -992,20 +994,20 @@@ void SimulateIClass(uint32_t arg0, uint
        // Enable and clear the trace
        set_tracing(TRUE);
        clear_trace();
+       //Use the emulator memory for SIM
+       uint8_t *emulator = BigBuf_get_EM_addr();
  
-       uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
        if(simType == 0) {
                // Use the CSN from commandline
-               memcpy(csn_crc, datain, 8);
-               doIClassSimulation(csn_crc,0,NULL);
+               memcpy(emulator, datain, 8);
+               doIClassSimulation(MODE_SIM_CSN,NULL);
        }else if(simType == 1)
        {
-               doIClassSimulation(csn_crc,0,NULL);
+               //Default CSN
+               uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
+               // Use the CSN from commandline
+               memcpy(emulator, csn_crc, 8);
+               doIClassSimulation(MODE_SIM_CSN,NULL);
        }
        else if(simType == 2)
        {
                {
                        // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
  
-                       memcpy(csn_crc, datain+(i*8), 8);
-                       if(doIClassSimulation(csn_crc,1,mac_responses+i*8))
+                       memcpy(emulator, datain+(i*8), 8);
+                       if(doIClassSimulation(MODE_EXIT_AFTER_MAC,mac_responses+i*8))
                        {
                                cmd_send(CMD_ACK,CMD_SIMULATE_TAG_ICLASS,i,0,mac_responses,i*8);
                                return; // Button pressed
                }
                cmd_send(CMD_ACK,CMD_SIMULATE_TAG_ICLASS,i,0,mac_responses,i*8);
  
+       }else if(simType == 3){
+               //This is 'full sim' mode, where we use the emulator storage for data.
+               doIClassSimulation(MODE_FULLSIM, NULL);
        }
        else{
                // We may want a mode here where we hardcode the csns to use (from proxclone).
        Dbprintf("Done...");
  
  }
  /**
   * @brief Does the actual simulation
   * @param csn - csn to use
   * @param breakAfterMacReceived if true, returns after reader MAC has been received.
   */
- int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived, uint8_t *reader_mac_buf)
+ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
  {
+       // free eventually allocated BigBuf memory
+       BigBuf_free_keep_EM();
  
+       uint8_t *csn = BigBuf_get_EM_addr();
+       uint8_t *emulator = csn;
+       uint8_t sof_data[] = { 0x0F} ;
        // CSN followed by two CRC bytes
-       uint8_t response1[] = { 0x0F} ;
-       uint8_t response2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-       uint8_t response3[] = { 0,0,0,0,0,0,0,0,0,0};
-       memcpy(response3,csn,sizeof(response3));
+       uint8_t anticoll_data[10] = { 0 };
+       uint8_t csn_data[10] = { 0 };
+       memcpy(csn_data,csn,sizeof(csn_data));
        Dbprintf("Simulating CSN %02x%02x%02x%02x%02x%02x%02x%02x",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
-       // e-Purse
-       uint8_t response4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
  
        // Construct anticollision-CSN
-       rotateCSN(response3,response2);
+       rotateCSN(csn_data,anticoll_data);
  
        // Compute CRC on both CSNs
-       ComputeCrc14443(CRC_ICLASS, response2, 8, &response2[8], &response2[9]);
-       ComputeCrc14443(CRC_ICLASS, response3, 8, &response3[8], &response3[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]);
+       // e-Purse
+       uint8_t card_challenge_data[8] = { 0x00 };
+       if(simulationMode == MODE_FULLSIM)
+       {
+               //Card challenge, a.k.a e-purse is on block 2
+               memcpy(card_challenge_data,emulator + (8 * 2) , 8);
+       }
  
        int exitLoop = 0;
        // Reader 0a
        int modulated_response_size;
        uint8_t* trace_data = NULL;
        int trace_data_size = 0;
-       //uint8_t sof = 0x0f;
  
-       // free eventually allocated BigBuf memory
-       BigBuf_free();
        // Respond SOF -- takes 1 bytes
-       uint8_t *resp1 = BigBuf_malloc(2);
-       int resp1Len;
+       uint8_t *resp_sof = BigBuf_malloc(2);
+       int resp_sof_Len;
  
        // Anticollision CSN (rotated CSN)
        // 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
-       uint8_t *resp2 = BigBuf_malloc(28);
-       int resp2Len;
+       uint8_t *resp_anticoll = BigBuf_malloc(28);
+       int resp_anticoll_len;
  
        // CSN
        // 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
-       uint8_t *resp3 = BigBuf_malloc(30);
-       int resp3Len;
+       uint8_t *resp_csn = BigBuf_malloc(30);
+       int resp_csn_len;
  
        // e-Purse
        // 18: Takes 2 bytes for SOF/EOF and 8 * 2 = 16 bytes (2 bytes/bit)
-       uint8_t *resp4 = BigBuf_malloc(20);
-       int resp4Len;
+       uint8_t *resp_cc = BigBuf_malloc(20);
+       int resp_cc_len;
  
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
        memset(receivedCmd, 0x44, MAX_FRAME_SIZE);
  
        // First card answer: SOF
        CodeIClassTagSOF();
-       memcpy(resp1, ToSend, ToSendMax); resp1Len = ToSendMax;
+       memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
  
        // Anticollision CSN
-       CodeIClassTagAnswer(response2, sizeof(response2));
-       memcpy(resp2, ToSend, ToSendMax); resp2Len = ToSendMax;
+       CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
+       memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
  
        // CSN
-       CodeIClassTagAnswer(response3, sizeof(response3));
-       memcpy(resp3, ToSend, ToSendMax); resp3Len = ToSendMax;
+       CodeIClassTagAnswer(csn_data, sizeof(csn_data));
+       memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
  
        // e-Purse
-       CodeIClassTagAnswer(response4, sizeof(response4));
-       memcpy(resp4, ToSend, ToSendMax); resp4Len = 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);
  
        // Start from off (no field generated)
        //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                LED_C_ON();
  
                // Okay, look at the command now.
-               if(receivedCmd[0] == 0x0a ) {
+               if(receivedCmd[0] == ICLASS_CMD_ACTALL ) {
                        // Reader in anticollission phase
-                       modulated_response = resp1; modulated_response_size = resp1Len; //order = 1;
-                       trace_data = response1;
-                       trace_data_size = sizeof(response1);
-               } else if(receivedCmd[0] == 0x0c) {
+                       modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1;
+                       trace_data = sof_data;
+                       trace_data_size = sizeof(sof_data);
+               } else if(receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 1) {
                        // Reader asks for anticollission CSN
-                       modulated_response = resp2; modulated_response_size = resp2Len; //order = 2;
-                       trace_data = response2;
-                       trace_data_size = sizeof(response2);
+                       modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2;
+                       trace_data = anticoll_data;
+                       trace_data_size = sizeof(anticoll_data);
                        //DbpString("Reader requests anticollission CSN:");
-               } else if(receivedCmd[0] == 0x81) {
+               } else if(receivedCmd[0] == ICLASS_CMD_SELECT) {
                        // Reader selects anticollission CSN.
                        // Tag sends the corresponding real CSN
-                       modulated_response = resp3; modulated_response_size = resp3Len; //order = 3;
-                       trace_data = response3;
-                       trace_data_size = sizeof(response3);
+                       modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3;
+                       trace_data = csn_data;
+                       trace_data_size = sizeof(csn_data);
                        //DbpString("Reader selects anticollission CSN:");
-               } else if(receivedCmd[0] == 0x88) {
+               } else if(receivedCmd[0] == ICLASS_CMD_READCHECK_KD) {
                        // Read e-purse (88 02)
-                       modulated_response = resp4; modulated_response_size = resp4Len; //order = 4;
-                       trace_data = response4;
-                       trace_data_size = sizeof(response4);
+                       modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
+                       trace_data = card_challenge_data;
+                       trace_data_size = sizeof(card_challenge_data);
                        LED_B_ON();
-               } else if(receivedCmd[0] == 0x05) {
+               } else if(receivedCmd[0] == ICLASS_CMD_CHECK) {
                        // Reader random and reader MAC!!!
-                       // Do not respond
+                       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);
+                               trace_data_size = 4;
+                               CodeIClassTagAnswer(trace_data , trace_data_size);
+                               memcpy(data_response, ToSend, ToSendMax);
+                               modulated_response = data_response;
+                               modulated_response_size = ToSendMax;
+                       }else
+                       {       //Not fullsim, we don't respond
 -                              // We do not know what to answer, so lets keep quiet
 +            // We do not know what to answer, so lets keep quiet
-                       modulated_response = resp1; modulated_response_size = 0; //order = 5;
+                               modulated_response = resp_sof; modulated_response_size = 0;
 -                              trace_data = NULL;
 -                              trace_data_size = 0;
 +                      trace_data = NULL;
 +                      trace_data_size = 0;
-                       if (breakAfterMacReceived){
+                               if (simulationMode == MODE_EXIT_AFTER_MAC){
 -                                      // dbprintf:ing ...
 -                                      Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x"
 -                                                         ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
 -                                      Dbprintf("RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len,
 -                                                      receivedCmd[0], receivedCmd[1], receivedCmd[2],
 -                                                      receivedCmd[3], receivedCmd[4], receivedCmd[5],
 -                                                      receivedCmd[6], receivedCmd[7], receivedCmd[8]);
 -                                      if (reader_mac_buf != NULL)
 -                                      {
 -                                              memcpy(reader_mac_buf,receivedCmd+1,8);
 -                                      }
 -                                      exitLoop = true;
 +                              // dbprintf:ing ...
 +                              Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x"
 +                                                 ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
 +                              Dbprintf("RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len,
 +                                              receivedCmd[0], receivedCmd[1], receivedCmd[2],
 +                                              receivedCmd[3], receivedCmd[4], receivedCmd[5],
 +                                              receivedCmd[6], receivedCmd[7], receivedCmd[8]);
 +                              if (reader_mac_buf != NULL)
 +                              {
 +                                      memcpy(reader_mac_buf,receivedCmd+1,8);
                                }
-               } else if(receivedCmd[0] == 0x00 && len == 1) {
 +                              exitLoop = true;
 +                      }
+                       }
+               } else if(receivedCmd[0] == ICLASS_CMD_HALT && len == 1) {
                        // Reader ends the session
-                       modulated_response = resp1; modulated_response_size = 0; //order = 0;
+                       modulated_response = resp_sof; modulated_response_size = 0; //order = 0;
                        trace_data = NULL;
                        trace_data_size = 0;
-               } else {
+               } 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;
+                       CodeIClassTagAnswer(trace_data , trace_data_size);
+                       memcpy(data_response, ToSend, ToSendMax);
+                       modulated_response = data_response;
+                       modulated_response_size = ToSendMax;
+               }
+               else {
                        //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
                        // Never seen this command before
                        Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
                        receivedCmd[3], receivedCmd[4], receivedCmd[5],
                        receivedCmd[6], receivedCmd[7], receivedCmd[8]);
                        // Do not respond
-                       modulated_response = resp1; modulated_response_size = 0; //order = 0;
+                       modulated_response = resp_sof; modulated_response_size = 0; //order = 0;
                        trace_data = NULL;
                        trace_data_size = 0;
                }
@@@ -1311,17 -1365,17 +1367,17 @@@ static void TransmitIClassCommand(cons
     {
       if(*wait < 10) *wait = 10;
       
 -     for(c = 0; c < *wait;) {
 -       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 -         AT91C_BASE_SSC->SSC_THR = 0x00;              // For exact timing!
 -         c++;
 -       }
 -       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 -         volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
 -         (void)r;
 -       }
 -       WDT_HIT();
 -     }
 +  for(c = 0; c < *wait;) {
 +    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 +      AT91C_BASE_SSC->SSC_THR = 0x00;         // For exact timing!
 +      c++;
 +    }
 +    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 +      volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
 +      (void)r;
 +    }
 +    WDT_HIT();
 +  }
  
     }
  
@@@ -1404,18 -1458,18 +1460,18 @@@ void CodeIClassCommand(const uint8_t * 
  
  void ReaderTransmitIClass(uint8_t* frame, int len)
  {
 -      int wait = 0;
 -      int samples = 0;
 +  int wait = 0;
 +  int samples = 0;
  
 -      // This is tied to other size changes
 -      CodeIClassCommand(frame,len);
 +  // This is tied to other size changes
 +  CodeIClassCommand(frame,len);
  
 -      // Select the card
 -      TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
 -      if(trigger)
 -              LED_A_ON();
 +  // Select the card
 +  TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
 +  if(trigger)
 +      LED_A_ON();
  
 -      // Store reader command in buffer
 +  // Store reader command in buffer
        if (tracing) {
                uint8_t par[MAX_PARITY_SIZE];
                GetParity(frame, len, par);
@@@ -1451,7 -1505,7 +1507,7 @@@ static int GetIClassAnswer(uint8_t *rec
        for(;;) {
                WDT_HIT();
  
 -              if(BUTTON_PRESS()) return FALSE;
 +          if(BUTTON_PRESS()) return FALSE;
  
                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!!
@@@ -1605,20 -1659,31 +1661,31 @@@ void ReaderIClass(uint8_t arg0) 
                if(read_status == 1) datasize = 8;
                if(read_status == 2) datasize = 16;
  
 -              LED_B_ON();
 -              //Send back to client, but don't bother if we already sent this
 -              if(memcmp(last_csn, card_data, 8) != 0)
+               //Todo, read the public blocks 1,5 aswell:
+               //
+               // 0 : CSN (we already have)
+               // 1 : Configuration
+               // 2 : e-purse (we already have)
+               // (3,4 write-only)
+               // 5 Application issuer area
+               //
+               //Then we can 'ship' back the 8 * 5 bytes of data,
+               // with 0xFF:s in block 3 and 4.
 +                    LED_B_ON();
 +                    //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))
                        {
 -                              cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
 +                        cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
                                if(abort_after_read) {
                                        LED_A_OFF();
                                        return;
                                }
 -                              //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...
                }
@@@ -1673,20 -1738,20 +1740,20 @@@ void ReaderIClass_Replay(uint8_t arg0, 
                uint8_t read_status = handshakeIclassTag(card_data);
                if(read_status < 2) continue;
  
 -              //for now replay captured auth (as cc not updated)
 -              memcpy(check+5,MAC,4);
 +                              //for now replay captured auth (as cc not updated)
 +                              memcpy(check+5,MAC,4);
  
                if(sendCmdGetResponseWithRetries(check, sizeof(check),resp, 4, 5))
                {
 -                      Dbprintf("Error: Authentication Fail!");
 +                                Dbprintf("Error: Authentication Fail!");
                        continue;
 -              }
 +                              }
  
                //first get configuration block (block 1)
                crc = block_crc_LUT[1];
 -              read[1]=1;
 -              read[2] = crc >> 8;
 -              read[3] = crc & 0xff;
 +                              read[1]=1;
 +                              read[2] = crc >> 8;
 +                              read[3] = crc & 0xff;
  
                if(sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10))
                {
                        continue;
                }
  
 -              mem=resp[5];
 -              memory.k16= (mem & 0x80);
 -              memory.book= (mem & 0x20);
 -              memory.k2= (mem & 0x8);
 -              memory.lockauth= (mem & 0x2);
 -              memory.keyaccess= (mem & 0x1);
 +                                       mem=resp[5];
 +                                       memory.k16= (mem & 0x80);
 +                                       memory.book= (mem & 0x20);
 +                                       memory.k2= (mem & 0x8);
 +                                       memory.lockauth= (mem & 0x2);
 +                                       memory.keyaccess= (mem & 0x1);
  
                cardsize = memory.k16 ? 255 : 32;
                WDT_HIT();
                memset(card_data,0x0,USB_CMD_DATA_SIZE);
                uint8_t failedRead =0;
                uint32_t stored_data_length =0;
 -              //then loop around remaining blocks
 +                              //then loop around remaining blocks
                for(int block=0; block < cardsize; block++){
  
                        read[1]= block;
                        crc = block_crc_LUT[block];
 -                      read[2] = crc >> 8;
 -                      read[3] = crc & 0xff;
 +                                  read[2] = crc >> 8;
 +                                  read[3] = crc & 0xff;
  
                        if(!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10))
                        {
 -                              Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
 +                                       Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
                                                 block, resp[0], resp[1], resp[2],
 -                                              resp[3], resp[4], resp[5],
 -                                              resp[6], resp[7]);
 +                                        resp[3], resp[4], resp[5],
 +                                        resp[6], resp[7]);
  
                                //Fill up the buffer
                                memcpy(card_data+stored_data_length,resp,8);
@@@ -1784,7 -1849,7 +1851,7 @@@ void IClass_iso14443A_write(uint8_t arg
        uint8_t* resp = (((uint8_t *)BigBuf) + 3560);
  
        // Reset trace buffer
 -    memset(trace, 0x44, RECV_CMD_OFFSET);
 +      memset(trace, 0x44, RECV_CMD_OFFSET);
        traceLen = 0;
  
        // Setup SSC
diff --combined client/Makefile
index 48a18c94b39f8ee7d70691065e812b0693695fc8,20e17d7d5ae47ec8b7949ac60adc44e900c9cc79..43e6860362c20e624f6726f78bb3ec03f2e11a1d
@@@ -12,9 -12,9 +12,9 @@@ CXX=g+
  VPATH = ../common
  OBJDIR = obj
  
 -LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
 +LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lm -lreadline -lpthread -lgdi32
  LDFLAGS = $(COMMON_FLAGS)
 -CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 +CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
  LUAPLATFORM = generic
  ifneq (,$(findstring MINGW,$(platform)))
  CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
@@@ -37,15 -37,6 +37,15 @@@ LDLIBS +=  -ld
  LUAPLATFORM = linux
  endif
  
 +# QT version,  4 or 5
 +qtplatform = $(shell $(MOC) -v)
 +ifneq (, $(findstring moc 5,$(qtplatform)))
 +   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
 +   QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
 +else
 +   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 +   QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 +endif
  
  ifneq ($(QTLDLIBS),)
  QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
@@@ -103,6 -94,7 +103,7 @@@ CMDSRCS =   nonce2key/crapto1.c
                        cmdscript.c\
                        pm3_bitlib.c\
                        aes.c\
+                       protocols.c\
  
  
  COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
@@@ -146,17 -138,6 +147,17 @@@ clean
  tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
  
 +# must be run as root
 +install_kext: Info.plist
 +      mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
 +      cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
 +      chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
 +      chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
 +      chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
 +      rm -rf /System/Library/Caches/com.apple.kext.caches
 +      touch /System/Library/Extensions
 +      @echo "*** You may need to reboot for the kext to take effect."
 +
  lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)
diff --combined client/cmddata.c
index 2c67c29a8eb3f63904bb1093649feebe60855295,7b666c263550094f9e5f42d02dd8fc71dbd9f3fa..cfccc5b34f2d5936966d531df0c2a165cf32f5de
@@@ -32,12 -32,6 +32,12 @@@ static int CmdHelp(const char *Cmd)
  //by marshmellow
  void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
  {
 +      if (buff == NULL) 
 +              return;
 +      
 +      if ( size >= MAX_DEMOD_BUF_LEN)
 +              size = MAX_DEMOD_BUF_LEN;
 +      
        size_t i = 0;
        for (; i < size; i++){
                DemodBuffer[i]=buff[startIdx++];
@@@ -339,11 -333,11 +339,11 @@@ int Cmdaskmandemod(const char *Cmd
      PrintAndLog("     <invert>, 1 for invert output");
      PrintAndLog("     [set maximum allowed errors], default = 100.");
      PrintAndLog("");
-     PrintAndLog("    sample: data askmandemod        = demod an ask/manchester tag from GraphBuffer");
-     PrintAndLog("          : data askmandemod 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
-     PrintAndLog("          : data askmandemod 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
-     PrintAndLog("          : data askmandemod 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
-     PrintAndLog("          : data askmandemod 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+     PrintAndLog("    sample: data rawdemod am        = demod an ask/manchester tag from GraphBuffer");
+     PrintAndLog("          : data rawdemod am 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
+     PrintAndLog("          : data rawdemod am 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
+     PrintAndLog("          : data rawdemod am 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
+     PrintAndLog("          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
  
      return 0;
    }
@@@ -520,13 -514,13 +520,13 @@@ int Cmdaskrawdemod(const char *Cmd
      PrintAndLog("     [set maximum allowed errors], default = 100");
      PrintAndLog("     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
      PrintAndLog("");
-     PrintAndLog("    sample: data askrawdemod          = demod an ask tag from GraphBuffer");
-     PrintAndLog("          : data askrawdemod a        = demod an ask tag from GraphBuffer, amplified");
-     PrintAndLog("          : data askrawdemod 32       = demod an ask tag from GraphBuffer using a clock of RF/32");
-     PrintAndLog("          : data askrawdemod 32 1     = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
-     PrintAndLog("          : data askrawdemod 1        = demod an ask tag from GraphBuffer while inverting data");
-     PrintAndLog("          : data askrawdemod 64 1 0   = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-     PrintAndLog("          : data askrawdemod 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+     PrintAndLog("    sample: data rawdemod ar          = demod an ask tag from GraphBuffer");
+     PrintAndLog("          : data rawdemod ar a        = demod an ask tag from GraphBuffer, amplified");
+     PrintAndLog("          : data rawdemod ar 32       = demod an ask tag from GraphBuffer using a clock of RF/32");
+     PrintAndLog("          : data rawdemod ar 32 1     = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
+     PrintAndLog("          : data rawdemod ar 1        = demod an ask tag from GraphBuffer while inverting data");
+     PrintAndLog("          : data rawdemod ar 64 1 0   = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+     PrintAndLog("          : data rawdemod ar 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
      return 0;
    }
    uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
@@@ -836,13 -830,13 +836,13 @@@ int CmdFSKrawdemod(const char *Cmd
      PrintAndLog("     [fchigh], larger field clock length, omit for autodetect");
      PrintAndLog("     [fclow], small field clock length, omit for autodetect");
      PrintAndLog("");
-     PrintAndLog("    sample: data fskrawdemod           = demod an fsk tag from GraphBuffer using autodetect");
-     PrintAndLog("          : data fskrawdemod 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
-     PrintAndLog("          : data fskrawdemod 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");   
-     PrintAndLog("          : data fskrawdemod 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
-     PrintAndLog("          : data fskrawdemod 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
-     PrintAndLog("          : data fskrawdemod 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
-     PrintAndLog("          : data fskrawdemod 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
+     PrintAndLog("    sample: data rawdemod fs           = demod an fsk tag from GraphBuffer using autodetect");
+     PrintAndLog("          : data rawdemod fs 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
+     PrintAndLog("          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");   
+     PrintAndLog("          : data rawdemod fs 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
+     PrintAndLog("          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
+     PrintAndLog("          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
+     PrintAndLog("          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
      return 0;
    }
    //set options from parameters entered with the command
@@@ -1943,6 -1937,7 +1943,7 @@@ int CmdTuneSamples(const char *Cmd
                PrintAndLog("\n");
                GraphTraceLen = 256;
                ShowGraphWindow();
+               RepaintGraphWindow();
        }
  
        return 0;
@@@ -2385,24 -2380,24 +2386,24 @@@ static command_t CommandTable[] 
    {"help",          CmdHelp,            1, "This help"},
    {"amp",           CmdAmp,             1, "Amplify peaks"},
    //{"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
-   {"askedgedetect", CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave - default = 25"},
-   {"askem410xdemod",CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
+   {"askedgedetect", CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave (default = 25)"},
+   {"askem410xdemod",CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},
    //{"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
    //{"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},
    {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
-   {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in demod buffer (offset = 0|1 bits to shift the decode start)"},
+   {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
    {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
    //{"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
    {"buffclear",     CmdBuffClear,       1, "Clear sample buffer and graph window"},
    {"dec",           CmdDec,             1, "Decimate samples"},
-   {"detectclock",   CmdDetectClockRate, 1, "[modulation] Detect clock rate (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
+   {"detectclock",   CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
    //{"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
-   {"fskawiddemod",  CmdFSKdemodAWID,    1, "Demodulate graph window as an AWID FSK tag using raw"},
+   {"fskawiddemod",  CmdFSKdemodAWID,    1, "Demodulate an AWID FSK tag from GraphBuffer"},
    //{"fskfcdetect",   CmdFSKfcDetect,     1, "Try to detect the Field Clock of an FSK wave"},
-   {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate graph window as a HID FSK tag using raw"},
-   {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate graph window as an IO Prox tag FSK using raw"},
-   {"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate graph window as a Pyramid FSK tag using raw"},
-   {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate graph window as a Paradox FSK tag using raw"},
+   {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate a HID FSK tag from GraphBuffer"},
+   {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate an IO Prox FSK tag from GraphBuffer"},
+   {"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate a Pyramid FSK tag from GraphBuffer"},
+   {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate a Paradox FSK tag from GraphBuffer"},
    //{"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to bin (clock = 50)(invert = 1|0)(rchigh = 10)(rclow=8)"},
    {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
    {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
    {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
    {"rtrim",         CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
    //{"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
-   {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream already in graph buffer"},
+   {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream in DemodBuffer"},
    {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
    {"norm",          CmdNorm,            1, "Normalize max/min to +/-128"},
    //{"nrzdetectclock",CmdDetectNRZClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
    //{"nrzrawdemod",   CmdNRZrawDemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate nrz tags and output binary (args optional)"},
    {"plot",          CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
    //{"pskdetectclock",CmdDetectPSKClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
-   {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Attempt to demodulate psk1 indala tags and output ID binary & hex (args optional)"},
+   {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},
    //{"psk1rawdemod",  CmdPSK1rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk1 tags and output binary (args optional)"},
    //{"psk2rawdemod",  CmdPSK2rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk2 tags and output binary (args optional)"},
-   {"rawdemod",      CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) - Attempt to demodulate the data in the GraphBuffer and output binary"},  
-   {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window"},
+   {"rawdemod",      CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
+   {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
    {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
    {"scale",         CmdScale,           1, "<int> -- Set cursor display scale"},
    {"setdebugmode",  CmdSetDebugMode,    1, "<0|1> -- Turn on or off Debugging Mode for demods"},
diff --combined client/loclass/cipher.c
index 9c1c2cfd4cbd63c09d6c1b6fa7d11049922c9bb1,7c9cc873a019f1ae67c9c84ba8cabd789d4e88bd..7d3950b1aef2711d03211305ad19573096a1b95d
  
  #include "cipher.h"
  #include "cipherutils.h"
- #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <stdbool.h>
  #include <stdint.h>
- #include <time.h>
+ #ifndef ON_DEVICE
  #include "fileutils.h"
- uint8_t keytable[] = { 0,0,0,0,0,0,0,0};
+ #endif
  
  /**
  * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2
@@@ -219,29 -219,29 +219,29 @@@ void MAC(uint8_t* k, BitstreamIn input
        BitstreamIn input_32_zeroes = {zeroes_32,sizeof(zeroes_32)*8,0};
        State initState = suc(k,init(k),&input);
        output(k,initState,&input_32_zeroes,&out);
 -}
 +}      
  
- void doMAC(uint8_t *cc_nr_p, int length, uint8_t *div_key_p, uint8_t mac[4])
+ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
  {
-     uint8_t *cc_nr;
+       uint8_t cc_nr[13] = { 0 };
      uint8_t div_key[8];
-     cc_nr=(uint8_t*)malloc(length+1);
-     memcpy(cc_nr,cc_nr_p,length);
+       //cc_nr=(uint8_t*)malloc(length+1);
+       memcpy(cc_nr,cc_nr_p,12);
      memcpy(div_key,div_key_p,8);
 -
 +    
-       reverse_arraybytes(cc_nr,length);
-       BitstreamIn bitstream = {cc_nr,length * 8,0};
+       reverse_arraybytes(cc_nr,12);
+       BitstreamIn bitstream = {cc_nr,12 * 8,0};
 -    uint8_t dest []= {0,0,0,0,0,0,0,0};
 -    BitstreamOut out = { dest, sizeof(dest)*8, 0 };
 -    MAC(div_key,bitstream, out);
 -    //The output MAC must also be reversed
 -    reverse_arraybytes(dest, sizeof(dest));
 -    memcpy(mac, dest, 4);
 +      uint8_t dest []= {0,0,0,0,0,0,0,0};
 +      BitstreamOut out = { dest, sizeof(dest)*8, 0 };
 +      MAC(div_key,bitstream, out);
 +      //The output MAC must also be reversed
 +      reverse_arraybytes(dest, sizeof(dest));
 +      memcpy(mac,dest,4);
-     //printf("Calculated_MAC\t%02x%02x%02x%02x\n", dest[0],dest[1],dest[2],dest[3]);
-       free(cc_nr);
+       //free(cc_nr);
      return;
  }
+ #ifndef ON_DEVICE
  int testMAC()
  {
        prnlog("[+] Testing MAC calculation...");
        uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
  
        uint8_t calculated_mac[4] = {0};
-     doMAC(cc_nr, 12,div_key, calculated_mac);
+       doMAC(cc_nr,div_key, calculated_mac);
  
        if(memcmp(calculated_mac, correct_MAC,4) == 0)
        {
                prnlog("[+] FAILED: MAC calculation failed:");
                printarr("    Calculated_MAC", calculated_mac, 4);
                printarr("    Correct_MAC   ", correct_MAC, 4);
 -              return 1;
 -      }
 +      return 1;
 +}
  
        return 0;
  }
+ #endif
index cfe65187e1a113c73de4d91321ad90e43c05d74e,10720f76d1e50b903d1acc0469a5d3af14f9bb0e..f18472ab4e73b07f026918c21be2ba07000cb87d
@@@ -38,6 -38,9 +38,9 @@@
  
  #ifndef FILEUTILS_H
  #define FILEUTILS_H
+ #ifndef ON_DEVICE
  /**
   * @brief Utility function to save data to a file. This method takes a preferred name, but if that
   * file already exists, it tries with another name until it finds something suitable.
   * @return 0 for ok, 1 for failz
   */
  int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen);
 +/**
 + * @brief Utility function to save load binary data from a a file. This method takes a filename,
 + * Should only be used for fixed-size binary files
 + * @param fileName the name of the file
 + * @param data a buffer to place data in
 + * @param datalen the length of the data/data.
 + * @return
 + */
  
- int loadFile(const char *fileName, void* data, size_t datalen);
+ int fileExists(const char *filename);
+ #endif //ON_DEVICE
  
  /**
   * Utility function to print to console. This is used consistently within the library instead
@@@ -68,5 -64,4 +72,4 @@@
   * @param fmt
   */
  void prnlog(char *fmt, ...);
- int fileExists(const char *filename);
  #endif // FILEUTILS_H
Impressum, Datenschutz