]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/loclass/cipher.c
hardnested: reduce disk space for tables (by > 700MBytes) and other minor changes
[proxmark3-svn] / client / loclass / cipher.c
index 2aae093debc9150d99ab0a5c8fe2c7c36864b080..a701da31934164630e4df7f80605149a449c3dbd 100644 (file)
@@ -224,42 +224,42 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
        uint8_t cc_nr[13] = { 0 };
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
        uint8_t cc_nr[13] = { 0 };
-    uint8_t div_key[8];
+       uint8_t div_key[8];
        //cc_nr=(uint8_t*)malloc(length+1);
 
        //cc_nr=(uint8_t*)malloc(length+1);
 
-       memcpy(cc_nr,cc_nr_p,12);
-    memcpy(div_key,div_key_p,8);
+       memcpy(cc_nr, cc_nr_p, 12);
+       memcpy(div_key, div_key_p, 8);
 
        reverse_arraybytes(cc_nr,12);
 
        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);
+       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);
        //free(cc_nr);
        //free(cc_nr);
-    return;
+       return;
 }
 }
-void doMAC_N(uint8_t *cc_nr_p,uint8_t cc_nr_size, uint8_t *div_key_p, uint8_t mac[4])
+void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4])
 {
 {
-    uint8_t *cc_nr;
-    uint8_t div_key[8];
-    cc_nr = (uint8_t*) malloc(cc_nr_size);
-    
-    memcpy(cc_nr,cc_nr_p,cc_nr_size);
-    memcpy(div_key,div_key_p,8);
-    
-    reverse_arraybytes(cc_nr,cc_nr_size);
-    BitstreamIn bitstream = {cc_nr,cc_nr_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(cc_nr);
-    return;
+       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
 }
 
 #ifndef ON_DEVICE
Impressum, Datenschutz