github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: 'analyse hid' added @holiman 's permute functions to the output to verify

Browse source
This commit is contained in:
iceman1001 2017-01-03 19:32:24 +01:00
commit ea1c1ca6f8
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/cmdanalyse.c
View file

@ -445,6 +445,9 @@ static void generate(uint8_t *data, uint8_t len) {
}
int CmdAnalyseHid(const char *Cmd){
uint8_t key[8] = {0};
uint8_t key_std_format[8] = {0};
uint8_t key_iclass_format[8] = {0};
uint8_t data[16] = {0};
bool isReverse = FALSE;
int len = 0;
@ -457,12 +460,20 @@ int CmdAnalyseHid(const char *Cmd){
param_gethex_ex(Cmd, 1, data, &len);
if ( len%2 ) return usage_analyse_hid();
len >>= 1;
if ( isReverse )
len >>= 1;
memcpy(key, data, 8);
if ( isReverse ) {
generate_rev(data, len);
else
permutekey_rev(key, key_std_format);
printf(" holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
}
else {
generate(data, len);
permutekey(key, key_iclass_format);
printf(" holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
}
return 0;
}