github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-14 09:13:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

iclass Write doMAC_N - rename variables to correct descriptions.

Browse source
This commit is contained in:
marshmellow42 2015-07-28 15:20:19 -04:00
parent bbd19beced
commit e1c6e9e8f1
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/loclass/cipher.c
View file

@ -227,11 +227,11 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
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(cc_nr, cc_nr_p, 12);
memcpy(div_key,div_key_p,8); memcpy(div_key, div_key_p, 8);
reverse_arraybytes(cc_nr,12); reverse_arraybytes(cc_nr,12);
BitstreamIn bitstream = {cc_nr,12 * 8,0}; BitstreamIn bitstream = {cc_nr, 12 * 8, 0};
uint8_t dest []= {0,0,0,0,0,0,0,0}; uint8_t dest []= {0,0,0,0,0,0,0,0};
BitstreamOut out = { dest, sizeof(dest)*8, 0 }; BitstreamOut out = { dest, sizeof(dest)*8, 0 };
MAC(div_key,bitstream, out); MAC(div_key,bitstream, out);
@ -241,24 +241,24 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[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 *address_data;
uint8_t div_key[8]; uint8_t div_key[8];
cc_nr = (uint8_t*) malloc(cc_nr_size); address_data = (uint8_t*) malloc(address_data_size);
memcpy(cc_nr,cc_nr_p,cc_nr_size); memcpy(address_data, address_data_p, address_data_size);
memcpy(div_key,div_key_p,8); memcpy(div_key, div_key_p, 8);
reverse_arraybytes(cc_nr,cc_nr_size); reverse_arraybytes(address_data, address_data_size);
BitstreamIn bitstream = {cc_nr,cc_nr_size * 8,0}; BitstreamIn bitstream = {address_data, address_data_size * 8, 0};
uint8_t dest []= {0,0,0,0,0,0,0,0}; uint8_t dest []= {0,0,0,0,0,0,0,0};
BitstreamOut out = { dest, sizeof(dest)*8, 0 }; BitstreamOut out = { dest, sizeof(dest)*8, 0 };
MAC(div_key,bitstream, out); MAC(div_key, bitstream, out);
//The output MAC must also be reversed //The output MAC must also be reversed
reverse_arraybytes(dest, sizeof(dest)); reverse_arraybytes(dest, sizeof(dest));
memcpy(mac, dest, 4); memcpy(mac, dest, 4);
free(cc_nr); free(address_data);
return; return;
} }

2
client/loclass/cipher.h
View file

@ -42,7 +42,7 @@
#include <stdint.h> #include <stdint.h>
void doMAC(uint8_t *cc_nr_p, 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]);
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]);
#ifndef ON_DEVICE #ifndef ON_DEVICE
int testMAC(); int testMAC();