X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/181e6db6a95d4d2a8e09bab5fb2cf62d35333447..19693bdc06cca834589aae52fdd4b8475f4aec3a:/client/loclass/cipher.c?ds=sidebyside

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 7c9cc873..6333b4b0 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -219,7 +219,7 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
 	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, uint8_t *div_key_p, uint8_t mac[4])
 {
@@ -229,18 +229,39 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 
 	memcpy(cc_nr,cc_nr_p,12);
     memcpy(div_key,div_key_p,8);
-
+    
 	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);
 	//free(cc_nr);
     return;
 }
+void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4])
+{
+	uint8_t *address_data;
+	uint8_t div_key[8];
+	address_data = (uint8_t*) malloc(address_data_size);
+
+	memcpy(address_data, address_data_p, address_data_size);
+	memcpy(div_key, div_key_p, 8);
+
+	reverse_arraybytes(address_data, address_data_size);
+	BitstreamIn bitstream = {address_data, address_data_size * 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);
+	free(address_data);
+	return;
+}
+
 #ifndef ON_DEVICE
 int testMAC()
 {
@@ -264,8 +285,8 @@ int testMAC()
 		prnlog("[+] FAILED: MAC calculation failed:");
 		printarr("    Calculated_MAC", calculated_mac, 4);
 		printarr("    Correct_MAC   ", correct_MAC, 4);
-		return 1;
-	}
+	return 1;
+}
 
 	return 0;
 }