mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-21 07:46:12 +08:00
CHG: 'analyse hid' added @holiman 's permute functions to the output to verify
This commit is contained in:
parent
0b63a0fe2a
commit
ea1c1ca6f8
|
@ -445,6 +445,9 @@ static void generate(uint8_t *data, uint8_t len) {
|
||||||
}
|
}
|
||||||
int CmdAnalyseHid(const char *Cmd){
|
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};
|
uint8_t data[16] = {0};
|
||||||
bool isReverse = FALSE;
|
bool isReverse = FALSE;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
@ -457,12 +460,20 @@ int CmdAnalyseHid(const char *Cmd){
|
||||||
param_gethex_ex(Cmd, 1, data, &len);
|
param_gethex_ex(Cmd, 1, data, &len);
|
||||||
if ( len%2 ) return usage_analyse_hid();
|
if ( len%2 ) return usage_analyse_hid();
|
||||||
|
|
||||||
len >>= 1;
|
len >>= 1;
|
||||||
|
|
||||||
if ( isReverse )
|
memcpy(key, data, 8);
|
||||||
|
|
||||||
|
if ( isReverse ) {
|
||||||
generate_rev(data, len);
|
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);
|
generate(data, len);
|
||||||
|
permutekey(key, key_iclass_format);
|
||||||
|
printf(" holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "../common/iso15693tools.h"
|
#include "../common/iso15693tools.h"
|
||||||
#include "tea.h"
|
#include "tea.h"
|
||||||
#include "../include/legic_prng.h"
|
#include "../include/legic_prng.h"
|
||||||
|
#include "loclass/elite_crack.h"
|
||||||
|
|
||||||
int usage_analyse_lcr(void);
|
int usage_analyse_lcr(void);
|
||||||
int usage_analyse_checksum(void);
|
int usage_analyse_checksum(void);
|
||||||
|
|
Loading…
Reference in a new issue