RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 0b63a0fe2a
commit ea1c1ca6f8
2 changed files with 16 additions and 4 deletions
Show stats 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;
}

1
client/cmdanalyse.h
View file

@ -21,6 +21,7 @@
#include "../common/iso15693tools.h"
#include "tea.h"
#include "../include/legic_prng.h"
#include "loclass/elite_crack.h"
int usage_analyse_lcr(void);
int usage_analyse_checksum(void);