X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0387cd3393d87edf07cdd37dc942b6e561ce499a..35cfcfc7a15568ddf9d26999594f52dd9040dcee:/client/loclass/cipher.c?ds=sidebyside diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c index 7c9cc873..a701da31 100644 --- a/client/loclass/cipher.c +++ b/client/loclass/cipher.c @@ -224,23 +224,44 @@ 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 }; - uint8_t div_key[8]; + 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); + 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); + 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; + 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() {