CHG: Adding clarity to the command helptext.

[proxmark3-svn] / client / loclass / cipher.c

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 8b1a523d6080b9b52861e3508fd0d5623acf3ec0..6333b4b056642831abcc682b1e2f2e8ea206fc5d 100644 (file)
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -1,5 +1,17 @@
 /*****************************************************************************
 /*****************************************************************************

- * This file is part of iClassCipher. It is a reconstructon of the cipher engine
+ * WARNING
+ *
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
+ * 
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
+ * 
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ *
+ *****************************************************************************
+ *
+ * This file is part of loclass. It is a reconstructon of the cipher engine

  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by
  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by


@@ -18,19 +30,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with IClassCipher.  If not, see <http://www.gnu.org/licenses/>.
+ * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * 

  ****************************************************************************/
 
  ****************************************************************************/
 

+

 #include "cipher.h"
 #include "cipherutils.h"
 #include "cipher.h"
 #include "cipherutils.h"

-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>

-#include <time.h>
+#ifndef ON_DEVICE

 #include "fileutils.h"
 #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
 
 /**
 * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2


@@ -205,27 +221,48 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
        output(k,initState,&input_32_zeroes,&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];
     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);
     
     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;
 }
     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()
 {
        prnlog("[+] Testing MAC calculation...");
 int testMAC()
 {
        prnlog("[+] Testing MAC calculation...");


@@ -237,7 +274,7 @@ int testMAC()
        uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
 
        uint8_t calculated_mac[4] = {0};
        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)
        {
 
        if(memcmp(calculated_mac, correct_MAC,4) == 0)
        {


@@ -253,3 +290,4 @@ int testMAC()
 
        return 0;
 }
 
        return 0;
 }

+#endif