X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d2d0af8ca61484f1460ea302e6bcc2e1cac71297..aa41c6058a4c5768d524a711af846f43ca7a236c:/client/loclass/cipher.c diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c index b3d87402..463ba9be 100644 --- a/client/loclass/cipher.c +++ b/client/loclass/cipher.c @@ -205,14 +205,14 @@ 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, int length, 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}; @@ -220,10 +220,10 @@ void doMAC(uint8_t *cc_nr_p, int length,uint8_t *div_key_p, uint8_t mac[4]) 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]); + 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; + return; } int testMAC() @@ -237,7 +237,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, 12,div_key, calculated_mac); if(memcmp(calculated_mac, correct_MAC,4) == 0) {