Changes inorder for iclass dump to work correctly

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

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index aefb5df57f0cadb12b6ba2b82720fcdbfd2fdd3b..b3d87402091adbc82ab0c70a416a9f4a1e5e00aa 100644 (file)
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -205,20 +205,25 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
        output(k,initState,&input_32_zeroes,&out);
 }
 
-void doMAC(uint8_t cc_nr[12],uint8_t div_key[8], uint8_t mac[4])
+void doMAC(uint8_t *cc_nr_p, int length,uint8_t *div_key_p, uint8_t mac[4])
 {
-       // Reversed "on-the-wire" data
-       uint8_t cc_nr_r[12]  = {0};
-       reverse_arraycopy(cc_nr, cc_nr_r,12);
-       BitstreamIn bitstream = {cc_nr_r,12 * 8,0};
-       uint8_t dest [8]= {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);
-       return;
+    uint8_t *cc_nr;
+    uint8_t div_key[8];
+    cc_nr=(uint8_t*)malloc(length+1);
+    memcpy(cc_nr,cc_nr_p,length);
+    memcpy(div_key,div_key_p,8);
+    
+    reverse_arraybytes(cc_nr,length);
+    BitstreamIn bitstream = {cc_nr,length * 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);
+    return 1;
 }
 
 int testMAC()
@@ -232,7 +237,7 @@ int testMAC()
        uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
 
        uint8_t calculated_mac[4] = {0};
-       doMAC(cc_nr, div_key, calculated_mac);
+       doMAC(cc_nr, 12, div_key, calculated_mac);
 
        if(memcmp(calculated_mac, correct_MAC,4) == 0)
        {