Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode

client/loclass/cipher.c

@@ -39,14 +39,14 @@
 
 #include "cipher.h"
 #include "cipherutils.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <time.h>
-//#include "fileutils.h"
-uint8_t keytable[] = { 0,0,0,0,0,0,0,0};
+#ifndef ON_DEVICE
+#include "fileutils.h"
+#endif
+
 
 /**
 * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2
@@ -221,27 +221,27 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
 	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);
-    //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...");
@@ -253,7 +253,7 @@ int testMAC()
 	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)
 	{
@@ -269,3 +269,4 @@ int testMAC()
 
 	return 0;
 }
+#endif

client/loclass/cipher.h

@@ -41,7 +41,9 @@
 #define CIPHER_H
 #include <stdint.h>
 
-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]);
+#ifndef ON_DEVICE
 int testMAC();
+#endif
 
 #endif // CIPHER_H

client/loclass/cipherutils.c

@@ -214,7 +214,7 @@ void printarr_human_readable(char * title, uint8_t* arr, int len)
 // Code for testing below
 //-----------------------------
 
-
+#ifndef ON_DEVICE
 int testBitStream()
 {
 	uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
@@ -287,3 +287,4 @@ int testCipherUtils(void)
 	retval |= testReversedBitstream();
 	return retval;
 }
+#endif

client/loclass/cipherutils.h

@@ -59,9 +59,10 @@ bool headBit( BitstreamIn *stream);
 bool tailBit( BitstreamIn *stream);
 void pushBit( BitstreamOut *stream, bool bit);
 int bitsLeft( BitstreamIn *stream);
-
+#ifndef ON_DEVICE
 int testCipherUtils(void);
 int testMAC();
+#endif
 void push6bits( BitstreamOut* stream, uint8_t bits);
 void EncryptDES(bool key[56], bool outBlk[64], bool inBlk[64], int verbose) ;
 void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest);

client/loclass/fileutils.c

@@ -35,6 +35,7 @@
  * 
  * 
  ****************************************************************************/
+#ifndef ON_DEVICE
 
 #include <stdio.h>
 #include <string.h>
@@ -108,3 +109,10 @@ void prnlog(char *fmt, ...)
 	PrintAndLog(buffer);
 
 }
+#else //if we're on ARM
+void prnlog(char *fmt,...)
+{
+	return;
+}
+
+#endif

client/loclass/fileutils.h

@@ -38,6 +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.
@@ -50,6 +53,8 @@
  */
 int saveFile(const char *preferredName, const char *suffix, const 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
@@ -59,5 +64,4 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
  * @param fmt
  */
 void prnlog(char *fmt, ...);
-int fileExists(const char *filename);
 #endif // FILEUTILS_H