RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-11 15:00:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: minor fixes to the HID wiegand generation command. Still not complete

Browse source
This commit is contained in:
iceman1001 2016-01-09 17:20:06 +01:00
parent 5cc88edfaf
commit fc893f8e33
1 changed files with 4 additions and 5 deletions

9
client/cmdlfhid.c
View file

@ -30,7 +30,7 @@ int usage_hid_wiegand(){
PrintAndLog(" facilitynum - Facility number"); PrintAndLog(" facilitynum - Facility number");
PrintAndLog(" cardnum - Card number"); PrintAndLog(" cardnum - Card number");
PrintAndLog("Examples:"); PrintAndLog("Examples:");
PrintAndLog(" lf hid wiegand 26 0 304 2001"); PrintAndLog(" lf hid wiegand 26 0 101 2001");
return 0; return 0;
} }
@ -230,8 +230,8 @@ static void calc37H(uint64_t cn, uint32_t *hi, uint32_t *lo){
} }
static void calc40(uint64_t cn, uint32_t *hi, uint32_t *lo){ static void calc40(uint64_t cn, uint32_t *hi, uint32_t *lo){
cn = (cn & 0xFFFFFFFFFF); cn = (cn & 0xFFFFFFFFFF);
*lo = (uint32_t)((cn & 0xFFFFFFFF) << 1 ); *lo = ((cn & 0xFFFFFFFF) << 1 );
*hi = (uint32_t) (cn >> 31); *hi = (cn >> 31);
} }
int CmdHIDWiegand(const char *Cmd) int CmdHIDWiegand(const char *Cmd)
@ -284,13 +284,12 @@ int CmdHIDWiegand(const char *Cmd)
} }
case 40 : { case 40 : {
calc40(cn, &hi, &lo); calc40(cn, &hi, &lo);
PrintAndLog("%x %x", hi, lo);
break; break;
} }
case 44 : { break; } case 44 : { break; }
case 84 : { break; } case 84 : { break; }
} }
PrintAndLog("HID %d bit | FC: %d CN: %d | Wiegand Code: %08X%08X", fmtlen, fc, cn, hi, lo); PrintAndLog("HID %d bit | FC: %d CN: %lld | Wiegand Code: %08X%08X", fmtlen, fc, cn, hi, lo);
return 0; return 0;
} }