X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/53d85a8fa1c1b98cb79c40712d1668731bdcaf49..refs/pull/268/head:/client/loclass/cipher.c?ds=sidebyside diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c index d3b1e799..a701da31 100644 --- a/client/loclass/cipher.c +++ b/client/loclass/cipher.c @@ -39,14 +39,14 @@ #include "cipher.h" #include "cipherutils.h" -#include #include #include #include #include -#include +#ifndef ON_DEVICE #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 @@ -221,27 +221,48 @@ 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 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; + uint8_t cc_nr[13] = { 0 }; + uint8_t div_key[8]; + //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,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); + //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() { prnlog("[+] Testing MAC calculation..."); @@ -253,7 +274,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 +290,4 @@ int testMAC() return 0; } +#endif