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

lf hid clone - only print the selected format

Browse source
This commit is contained in:
iceman1001 2021-04-27 19:16:06 +02:00
parent 9873c0e4e2
commit 82e71d7815
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdlfhid.c
View file

@ -416,7 +416,7 @@ static int CmdHIDClone(const char *Cmd) {
if (raw_len == 0) {
PrintAndLogEx(INFO, "Preparing to clone HID tag");
HIDTryUnpack(&packed);
HIDUnpack(format_idx, &packed);
} else {
PrintAndLogEx(INFO, "Preparing to clone HID tag using raw " _YELLOW_("%s"), raw);
}

27
client/src/wiegand_formats.c
View file

@ -505,14 +505,22 @@ static bool Unpack_H10306(wiegand_message_t *packed, wiegand_card_t *card) {
static bool Pack_N10002(wiegand_card_t *card, wiegand_message_t *packed, bool preamble) {
memset(packed, 0, sizeof(wiegand_message_t));
if (card->FacilityCode > 0xFF) return false; // Can't encode FC.
if (card->FacilityCode > 0xFFFF) return false; // Can't encode FC.
if (card->CardNumber > 0xFFFF) return false; // Can't encode CN.
if (card->IssueLevel > 0) return false; // Not used in this format
if (card->OEM > 0) return false; // Not used in this format
packed->Length = 34; // Set number of bits
set_linear_field(packed, card->FacilityCode, 9, 8);
set_linear_field(packed, card->FacilityCode, 1, 16);
set_linear_field(packed, card->CardNumber, 17, 16);
set_bit_by_position(packed,
evenparity32(get_linear_field(packed, 1, 16))
, 0);
set_bit_by_position(packed,
oddparity32(get_linear_field(packed, 17, 16))
, 33);
if (preamble)
return add_HID_header(packed);
return true;
@ -523,8 +531,13 @@ static bool Unpack_N10002(wiegand_message_t *packed, wiegand_card_t *card) {
if (packed->Length != 34) return false; // Wrong length? Stop here.
card->FacilityCode = get_linear_field(packed, 1, 16);
card->CardNumber = get_linear_field(packed, 17, 16);
card->FacilityCode = get_linear_field(packed, 9, 8);
card->ParityValid =
(get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 16))) &&
(get_bit_by_position(packed, 33) == oddparity32(get_linear_field(packed, 17, 16)));
return true;
}
@ -1417,3 +1430,11 @@ bool HIDTryUnpack(wiegand_message_t *packed) {
return ((found_cnt - found_invalid_par) > 0);
}
void HIDUnpack(int idx, wiegand_message_t *packed) {
wiegand_card_t card;
memset(&card, 0, sizeof(wiegand_card_t));
if (FormatTable[idx].Unpack(packed, &card)) {
hid_print_card(&card, FormatTable[idx]);
}
}

1
client/src/wiegand_formats.h
View file

@ -45,6 +45,7 @@ cardformat_t HIDGetCardFormat(int idx);
bool HIDPack(int format_idx, wiegand_card_t *card, wiegand_message_t *packed, bool preamble);
bool HIDTryUnpack(wiegand_message_t *packed);
void HIDPackTryAll(wiegand_card_t *card, bool preamble);
void HIDUnpack(int idx, wiegand_message_t *packed);
void print_wiegand_code(wiegand_message_t *packed);
void print_desc_wiegand(cardformat_t *fmt, wiegand_message_t *packed);
#endif

4
client/src/wiegand_formatutils.c
View file

@ -171,7 +171,9 @@ wiegand_message_t initialize_message_object(uint32_t top, uint32_t mid, uint32_t
}
bool add_HID_header(wiegand_message_t *data) {
if (data->Length > 84 || data->Length == 0) return false; // Invalid value
// Invalid value
if (data->Length > 84 || data->Length == 0)
return false;
if (data->Length >= 64) {
data->Top |= 1 << (data->Length - 64); // leading 1: start bit