mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-21 07:46:12 +08:00
improved calc_iclass_mac to work independant of size
This commit is contained in:
parent
a66fca86b9
commit
fe53c0311c
|
@ -308,7 +308,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
|
|||
hash0(crypted_id,div_key);
|
||||
//memcpy(div_key,result,8);
|
||||
PrintAndLog("Div Key: %s",sprint_hex(div_key,8));
|
||||
calc_iclass_mac(CCNR,div_key,MAC);
|
||||
calc_iclass_mac(CCNR,12,div_key,MAC);
|
||||
|
||||
UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}};
|
||||
memcpy(c.d.asBytes, MAC, 4);
|
||||
|
|
|
@ -238,15 +238,16 @@ int testMAC()
|
|||
return 0;
|
||||
}
|
||||
|
||||
int calc_iclass_mac(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t *mac)
|
||||
int calc_iclass_mac(uint8_t *cc_nr_p, int length, uint8_t *div_key_p, uint8_t *mac)
|
||||
{
|
||||
uint8_t cc_nr[12];
|
||||
uint8_t *cc_nr;
|
||||
uint8_t div_key[8];
|
||||
memcpy(cc_nr,cc_nr_p,12);
|
||||
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,sizeof(cc_nr));
|
||||
BitstreamIn bitstream = {cc_nr,sizeof(cc_nr) * 8,0};
|
||||
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);
|
||||
|
@ -255,6 +256,6 @@ int calc_iclass_mac(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t *mac)
|
|||
|
||||
printf("Calculated_MAC\t%02x%02x%02x%02x\n", dest[0],dest[1],dest[2],dest[3]);
|
||||
memcpy(mac,dest,4);
|
||||
|
||||
free(cc_nr);
|
||||
return 1;
|
||||
}
|
|
@ -41,6 +41,6 @@ typedef struct {
|
|||
} State;
|
||||
|
||||
void printarr(char * name, uint8_t* arr, int len);
|
||||
int calc_iclass_mac(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t *mac);
|
||||
int calc_iclass_mac(uint8_t *cc_nr_p, int length, uint8_t *div_key_p, uint8_t *mac);
|
||||
|
||||
#endif // CIPHER_H
|
||||
|
|
Loading…
Reference in a new issue