return i - 1;
}
+void usage_encode(){
+ PrintAndLog("Usage: lf hid encode <format> [<field> <value (decimal)>] {...}");
+ PrintAndLog(" Fields: c: Card number");
+ PrintAndLog(" f: Facility code");
+ PrintAndLog(" i: Issue Level");
+ PrintAndLog(" o: OEM code");
+ PrintAndLog(" example: lf hid encode H10301 f 123 c 4567");
+}
+void PrintProxTagId(hidproxmessage_t *packed){
+ if (packed->top != 0) {
+ PrintAndLog("HID Prox TAG ID: %x%08x%08x",
+ (uint32_t)packed->top, (uint32_t)packed->mid, (uint32_t)packed->bot);
+ } else {
+ PrintAndLog("HID Prox TAG ID: %x%08x",
+ (uint32_t)packed->mid, (uint32_t)packed->bot);
+ }
+}
+bool Encode(/* in */ const char *Cmd, /* out */ hidproxmessage_t *packed){
+ int formatIndex = -1;
+ char format[16];
+ memset(format, 0, sizeof(format));
+ if (!strcmp(Cmd, "help") || !strcmp(Cmd, "h") || !strcmp(Cmd, "list") || !strcmp(Cmd, "?")){
+ usage_encode();
+ return false;
+ } else {
+ param_getstr(Cmd, 0, format, sizeof(format));
+ formatIndex = HIDFindCardFormat(format);
+ if (formatIndex == -1) {
+ printf("Unknown format: %s\r\n", format);
+ return false;
+ }
+ }
+ hidproxcard_t data;
+ memset(&data, 0, sizeof(hidproxcard_t));
+ uint8_t cmdp = 1;
+ while(param_getchar(Cmd, cmdp) != 0x00) {
+ switch(param_getchar(Cmd, cmdp)) {
+ case 'I':
+ case 'i':
+ data.IssueLevel = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ case 'F':
+ case 'f':
+ data.FacilityCode = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ case 'C':
+ case 'c':
+ data.CardNumber = param_get64ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ case 'o':
+ case 'O':
+ data.OEM = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ return false;
+ }
+ }
+ memset(packed, 0, sizeof(hidproxmessage_t));
+ if (!HIDPack(formatIndex, &data, packed))
+ {
+ PrintAndLog("The card data could not be encoded in the selected format.");
+ return false;
+ } else {
+ return true;
+ }
+
+}
+void Write(hidproxmessage_t *packed){
+ UsbCommand c;
+ c.d.asBytes[0] = (packed->top != 0 && ((packed->mid & 0xFFFFFFC0) != 0))
+ ? 1 : 0; // Writing long format?
+ c.cmd = CMD_HID_CLONE_TAG;
+ c.arg[0] = (packed->top & 0x000FFFFF);
+ c.arg[1] = packed->mid;
+ c.arg[2] = packed->bot;
+ SendCommand(&c);
+}
+
+
//by marshmellow (based on existing demod + holiman's refactor)
//HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
//print full HID Prox ID and some bit format details if found
return 0;
}
- if (hi2 != 0)
- PrintAndLog("HID Prox TAG ID: %x%08x%08x",
- (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo
- );
- else
- PrintAndLog("HID Prox TAG ID: %x%08x",
- (unsigned int) hi, (unsigned int) lo
- );
-
hidproxmessage_t packed = initialize_proxmessage_object(hi2, hi, lo);
- bool ret = HIDTryUnpack(&packed, false);
+ PrintProxTagId(&packed);
+ bool ret = HIDTryUnpack(&packed, false);
if (!ret) {
PrintAndLog("Invalid or unsupported tag length.");
}
{
uint32_t hi2 = 0, hi = 0, lo = 0;
hexstring_to_int96(&hi2, &hi, &lo, Cmd);
- if (hi >= 0x40 || hi2 != 0) {
- PrintAndLog("This looks like a long tag ID. Use 'lf simfsk' for long tags. Aborting!");
- return 0;
+ if (hi2 != 0) {
+ PrintAndLog("Emulating tag with ID %x%08x%08x", hi2, hi, lo);
+ } else {
+ PrintAndLog("Emulating tag with ID %x%08x", hi, lo);
}
- PrintAndLog("Emulating tag with ID %x%08x", hi, lo);
PrintAndLog("Press pm3-button to abort simulation");
- UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
+ UsbCommand c = {CMD_HID_SIM_TAG, {hi2, hi, lo}};
SendCommand(&c);
return 0;
}
int CmdHIDClone(const char *Cmd)
{
- unsigned int hi2 = 0, hi = 0, lo = 0;
- UsbCommand c;
- hexstring_to_int96(&hi2, &hi, &lo, Cmd);
-
- if (hi >= 0x40 || hi2 != 0) {
- PrintAndLog("Cloning tag with long ID %x%08x%08x", hi2, hi, lo);
- c.d.asBytes[0] = 1;
- } else {
- PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
- c.d.asBytes[0] = 0;
- }
-
- c.cmd = CMD_HID_CLONE_TAG;
- c.arg[0] = (hi2 & 0x000FFFFF);
- c.arg[1] = hi;
- c.arg[2] = lo;
-
- SendCommand(&c);
+ unsigned int top = 0, mid = 0, bot = 0;
+ hexstring_to_int96(&top, &mid, &bot, Cmd);
+ hidproxmessage_t packed = initialize_proxmessage_object(top, mid, bot);
+ Write(&packed);
return 0;
}
}
int CmdHIDEncode(const char *Cmd) {
if (strlen(Cmd) == 0) {
- PrintAndLog("Usage: lf hid encode <format> <facility code (decimal)> <card number (decimal)> [issue level (decimal)]");
- PrintAndLog(" sample: lf hid encode H10301 123 4567");
+ usage_encode();
return 0;
}
- int formatIndex = -1;
- if (!strcmp(Cmd, "help") || !strcmp(Cmd, "h") || !strcmp(Cmd, "list") || !strcmp(Cmd, "?")){
- HIDListFormats();
- return 0;
- } else {
- char format[16];
- memset(format, 0, sizeof(format));
- param_getstr(Cmd, 0, format, sizeof(format));
- formatIndex = HIDFindCardFormat(format);
- if (formatIndex == -1) {
- HIDListFormats();
- return 0;
- }
- }
-
- hidproxcard_t card;
- memset(&card, 0, sizeof(hidproxcard_t));
- card.FacilityCode = param_get32ex(Cmd, 1, 0, 10);
- card.CardNumber = param_get64ex(Cmd, 2, 0, 10);
- card.IssueLevel = param_get32ex(Cmd, 3, 0, 10);
- card.ParitySupported = true; // Try to encode parity if supported.
-
hidproxmessage_t packed;
memset(&packed, 0, sizeof(hidproxmessage_t));
- if (HIDPack(formatIndex, &card, &packed)){
- if (packed.top != 0) {
- PrintAndLog("HID Prox TAG ID: %x%08x%08x",
- (unsigned int)packed.top, (unsigned int)packed.mid, (unsigned int)packed.bot);
- } else {
- PrintAndLog("HID Prox TAG ID: %x%08x",
- (unsigned int)packed.mid, (unsigned int)packed.bot);
- }
- } else {
- PrintAndLog("The provided data could not be encoded with the selected format.");
- }
+ if (Encode(Cmd, &packed))
+ PrintProxTagId(&packed);
return 0;
}
int CmdHIDWrite(const char *Cmd) {
if (strlen(Cmd) == 0) {
- PrintAndLog("Usage: lf hid write <format> <facility code (decimal)> <card number (decimal)> [issue level (decimal)]");
- PrintAndLog(" sample: lf hid write H10301 123 4567");
- return 0;
- }
-
- int formatIndex = -1;
- if (!strcmp(Cmd, "help") || !strcmp(Cmd, "h") || !strcmp(Cmd, "list") || !strcmp(Cmd, "?")){
- HIDListFormats();
+ usage_encode();
return 0;
- } else {
- char format[16];
- memset(format, 0, sizeof(format));
- param_getstr(Cmd, 0, format, sizeof(format));
- formatIndex = HIDFindCardFormat(format);
- if (formatIndex == -1) {
- HIDListFormats();
- return 0;
- }
}
-
- hidproxcard_t card;
- memset(&card, 0, sizeof(hidproxcard_t));
- card.FacilityCode = param_get32ex(Cmd, 1, 0, 10);
- card.CardNumber = param_get64ex(Cmd, 2, 0, 10);
- card.IssueLevel = param_get32ex(Cmd, 3, 0, 10);
- card.ParitySupported = true; // Try to encode parity if supported.
-
hidproxmessage_t packed;
memset(&packed, 0, sizeof(hidproxmessage_t));
- if (HIDPack(formatIndex, &card, &packed)){
- UsbCommand c;
- if (packed.top != 0) {
- PrintAndLog("HID Prox TAG ID: %x%08x%08x",
- (unsigned int)packed.top, (unsigned int)packed.mid, (unsigned int)packed.bot);
- c.d.asBytes[0] = 1;
- } else {
- PrintAndLog("HID Prox TAG ID: %x%08x",
- (unsigned int)packed.mid, (unsigned int)packed.bot);
- c.d.asBytes[0] = 0;
- }
-
- c.cmd = CMD_HID_CLONE_TAG;
- c.arg[0] = (packed.top & 0x000FFFFF);
- c.arg[1] = packed.mid;
- c.arg[2] = packed.bot;
- SendCommand(&c);
-
- } else {
- PrintAndLog("The provided data could not be encoded with the selected format.");
+ if (Encode(Cmd, &packed)){
+ PrintProxTagId(&packed);
+ Write(&packed);
}
return 0;
}
+int CmdHIDFormats(){
+ HIDListFormats();
+ return 0;
+}
static int CmdHelp(const char *Cmd); // define this now so the below won't error out.
static command_t CommandTable[] =
{
{"sim", CmdHIDSim, 0, "<ID> -- HID tag simulator"},
{"clone", CmdHIDClone, 0, "<ID> -- Clone HID to T55x7 (tag must be in antenna)"},
{"decode", CmdHIDDecode, 1, "<ID> -- Try to decode an HID tag and show its contents"},
- {"encode", CmdHIDEncode, 1, "<format> <fc> <num> -- Encode an HID ID with the specified format, facility code and card number"},
- {"write", CmdHIDWrite, 0, "<format> <fc> <num> -- Encode and write to a T55x7 tag (tag must be in antenna)"},
+ {"encode", CmdHIDEncode, 1, "<format> <fields> -- Encode an HID ID with the specified format and fields"},
+ {"formats", CmdHIDFormats, 1, "List supported card formats"},
+ {"write", CmdHIDWrite, 0, "<format> <fields> -- Encode and write to a T55x7 tag (tag must be in antenna)"},
{NULL, NULL, 0, NULL}
};
if (card->FacilityCode > 0xFF) 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 = 26; // Set number of bits
packed->bot |= (card->CardNumber & 0xFFFF) << 1;
packed->bot |= (card->FacilityCode & 0xFF) << 17;
- if (card->ParitySupported){
- packed->bot |= oddparity32((packed->bot >> 1) & 0xFFF) & 1;
- packed->bot |= (evenparity32((packed->bot >> 13) & 0xFFF) & 1) << 25;
- }
+ packed->bot |= oddparity32((packed->bot >> 1) & 0xFFF) & 1;
+ packed->bot |= (evenparity32((packed->bot >> 13) & 0xFFF) & 1) << 25;
return add_HID_header(packed);
}
bool Unpack_H10301(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
if (packed->Length != 26) return false; // Wrong length? Stop here.
card->CardNumber = (packed->bot >> 1) & 0xFFFF;
card->FacilityCode = (packed->bot >> 17) & 0xFF;
- card->ParitySupported = true;
card->ParityValid =
(oddparity32((packed->bot >> 1) & 0xFFF) == (packed->bot & 1)) &&
((evenparity32((packed->bot >> 13) & 0xFFF) & 1) == ((packed->bot >> 25) & 1));
if (card->FacilityCode > 0x7FF) 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 = 27;
set_nonlinear_field(packed, card->FacilityCode, 10, (uint8_t[]){15, 19, 24, 23, 22, 18, 6, 10, 14, 3, 2});
set_nonlinear_field(packed, card->CardNumber, 16, (uint8_t[]){0, 1, 13, 12, 9, 26, 20, 16, 17, 21, 25, 7, 8, 11, 4, 5});
if (packed->Length != 27) return false; // Wrong length? Stop here.
card->CardNumber = get_nonlinear_field(packed, 16, (uint8_t[]){0, 1, 13, 12, 9, 26, 20, 16, 17, 21, 25, 7, 8, 11, 4, 5});
card->FacilityCode = get_nonlinear_field(packed, 10, (uint8_t[]){15, 19, 24, 23, 22, 18, 6, 10, 14, 3, 2});
- card->ParitySupported = false;
return true;
}
if (card->FacilityCode > 0x0FF) return false; // Can't encode FC.
if (card->CardNumber > 0x7FFF) 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 = 28;
set_linear_field(packed, card->FacilityCode, 4, 8);
set_linear_field(packed, card->CardNumber, 12, 15);
- if (card->ParitySupported){
- set_bit_by_position(packed,
- oddparity32(get_nonlinear_field(packed, 16, (uint8_t[]){4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26}))
- , 2);
- set_bit_by_position(packed,
- evenparity32(get_linear_field(packed, 1, 13))
- , 0);
- set_bit_by_position(packed,
- oddparity32(get_linear_field(packed, 0, 27))
- , 27);
- }
+ set_bit_by_position(packed,
+ oddparity32(get_nonlinear_field(packed, 16, (uint8_t[]){4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26}))
+ , 2);
+ set_bit_by_position(packed,
+ evenparity32(get_linear_field(packed, 1, 13))
+ , 0);
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 0, 27))
+ , 27);
return add_HID_header(packed);
}
bool Unpack_2804W(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
if (packed->Length != 28) return false; // Wrong length? Stop here.
card->FacilityCode = get_linear_field(packed, 4, 8);
card->CardNumber = get_linear_field(packed, 12, 15);
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 13))) &&
(get_bit_by_position(packed, 2) == oddparity32(get_nonlinear_field(packed, 16, (uint8_t[]){4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26}))) &&
if (card->FacilityCode > 0xFFF) 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 = 30;
set_linear_field(packed, card->FacilityCode, 1, 12);
set_linear_field(packed, card->CardNumber, 13, 16);
- if (card->ParitySupported){
- set_bit_by_position(packed,
- evenparity32(get_linear_field(packed, 1, 12))
- , 0);
- set_bit_by_position(packed,
- oddparity32(get_linear_field(packed, 13, 16))
- , 29);
- }
+ set_bit_by_position(packed,
+ evenparity32(get_linear_field(packed, 1, 12))
+ , 0);
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 13, 16))
+ , 29);
return add_HID_header(packed);
}
bool Unpack_ATSW30(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
if (packed->Length != 30) return false; // Wrong length? Stop here.
card->FacilityCode = get_linear_field(packed, 1, 12);
card->CardNumber = get_linear_field(packed, 13, 16);
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 12))) &&
(get_bit_by_position(packed, 29) == oddparity32(get_linear_field(packed, 13, 16)));
if (card->FacilityCode > 0x0F) return false; // Can't encode FC.
if (card->CardNumber > 0x7FFFFF) 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 = 31;
set_linear_field(packed, card->FacilityCode, 1, 4);
set_linear_field(packed, card->CardNumber, 5, 23);
if (packed->Length != 31) return false; // Wrong length? Stop here.
card->FacilityCode = get_linear_field(packed, 1, 4);
card->CardNumber = get_linear_field(packed, 5, 23);
- card->ParitySupported = false;
return true;
}
if (card->FacilityCode > 0x007F) return false; // Can't encode FC.
if (card->CardNumber > 0x00FFFFFF) 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 = 33; // Set number of bits
set_linear_field(packed, card->FacilityCode, 1, 7);
set_linear_field(packed, card->CardNumber, 8, 24);
-
- if (card->ParitySupported){
- set_bit_by_position(packed, evenparity32(get_linear_field(packed, 1, 16)), 0);
- set_bit_by_position(packed, oddparity32(get_linear_field(packed, 16, 16)), 32);
- }
+ set_bit_by_position(packed, evenparity32(get_linear_field(packed, 1, 16)), 0);
+ set_bit_by_position(packed, oddparity32(get_linear_field(packed, 16, 16)), 32);
return add_HID_header(packed);
}
bool Unpack_D10202(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
- if (packed->Length != 33) return false; // Wrong length? Stop here.
-
+ if (packed->Length != 33) return false; // Wrong length? Stop here.
card->CardNumber = get_linear_field(packed, 8, 24);
card->FacilityCode = get_linear_field(packed, 1, 7);
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 16))) &&
(get_bit_by_position(packed, 32) == oddparity32(get_linear_field(packed, 16, 16)));
return true;
}
-
bool Pack_H10306(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
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
packed->bot |= (card->CardNumber & 0xFFFF) << 1;
packed->bot |= (card->FacilityCode & 0x7FFF) << 17;
packed->mid |= (card->FacilityCode & 0x8000) >> 15;
- if (card->ParitySupported){
- packed->mid |= (evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xFFFE0000)) & 1) << 1;
- packed->bot |= ( oddparity32(packed->bot & 0x0001FFFE) & 1);
- }
+ packed->mid |= (evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xFFFE0000)) & 1) << 1;
+ packed->bot |= ( oddparity32(packed->bot & 0x0001FFFE) & 1);
return add_HID_header(packed);
}
bool Unpack_H10306(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 34) return false; // Wrong length? Stop here.
-
card->CardNumber = (packed->bot >> 1) & 0xFFFF;
card->FacilityCode = ((packed->mid & 1) << 15) | ((packed->bot >> 17) & 0xFF);
- card->ParitySupported = true;
card->ParityValid =
((evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xFFFE0000)) & 1) == ((packed->mid >> 1) & 1)) &&
((oddparity32(packed->bot & 0x0001FFFE) & 1) == ((packed->bot & 1)));
return true;
}
-bool Pack_N1002(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
+bool Pack_N10002(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0xFF) 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->CardNumber, 17, 16);
return add_HID_header(packed);
}
-bool Unpack_N1002(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
+bool Unpack_N10002(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 34) return false; // Wrong length? Stop here.
-
card->CardNumber = get_linear_field(packed, 17, 16);
card->FacilityCode = get_linear_field(packed, 9, 8);
- card->ParitySupported = false;
return true;
}
-
bool Pack_C1k35s(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0xFFF) return false; // Can't encode FC.
if (card->CardNumber > 0xFFFFF) 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 = 35; // Set number of bits
packed->bot |= (card->CardNumber & 0x000FFFFF) << 1;
packed->bot |= (card->FacilityCode & 0x000007FF) << 21;
packed->mid |= (card->FacilityCode & 0x00000800) >> 11;
- if (card->ParitySupported){
- packed->mid |= (evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xB6DB6DB6)) & 1) << 1;
- packed->bot |= ( oddparity32((packed->mid & 0x00000003) ^ (packed->bot & 0x6DB6DB6C)) & 1);
- packed->mid |= ( oddparity32((packed->mid & 0x00000003) ^ (packed->bot & 0xFFFFFFFF)) & 1) << 2;
- }
+ packed->mid |= (evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xB6DB6DB6)) & 1) << 1;
+ packed->bot |= ( oddparity32((packed->mid & 0x00000003) ^ (packed->bot & 0x6DB6DB6C)) & 1);
+ packed->mid |= ( oddparity32((packed->mid & 0x00000003) ^ (packed->bot & 0xFFFFFFFF)) & 1) << 2;
return add_HID_header(packed);
}
bool Unpack_C1k35s(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 35) return false; // Wrong length? Stop here.
-
card->CardNumber = (packed->bot >> 1) & 0x000FFFFF;
card->FacilityCode = ((packed->mid & 1) << 11) | ((packed->bot >> 21));
- card->ParitySupported = true;
card->ParityValid =
(evenparity32((packed->mid & 0x00000001) ^ (packed->bot & 0xB6DB6DB6)) == ((packed->mid >> 1) & 1)) &&
( oddparity32((packed->mid & 0x00000003) ^ (packed->bot & 0x6DB6DB6C)) == ((packed->bot >> 0) & 1)) &&
if (card->FacilityCode > 0) return false; // Can't encode FC. (none in this format)
if (card->CardNumber > 99999999) 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 = 36; // Set number of bits
// This card is BCD-encoded rather than binary. Set the 4-bit groups independently.
for (uint32_t idx = 0; idx < 8; idx++){
set_linear_field(packed, (uint64_t)(card->CardNumber / pow(10, 7-idx)) % 10, idx * 4, 4);
}
- if (card->ParitySupported){
- set_bit_by_position(packed, evenparity32(
- get_nonlinear_field(packed, 8, (uint8_t[]){0, 4, 8, 12, 16, 20, 24, 28})
- ), 32);
- set_bit_by_position(packed, oddparity32(
- get_nonlinear_field(packed, 8, (uint8_t[]){1, 5, 9, 13, 17, 21, 25, 29})
- ), 33);
- set_bit_by_position(packed, evenparity32(
- get_nonlinear_field(packed, 8, (uint8_t[]){2, 6, 10, 14, 18, 22, 28, 30})
- ), 34);
- set_bit_by_position(packed, evenparity32(
- get_nonlinear_field(packed, 8, (uint8_t[]){3, 7, 11, 15, 19, 23, 29, 31})
- ), 35);
- }
+ set_bit_by_position(packed, evenparity32(
+ get_nonlinear_field(packed, 8, (uint8_t[]){0, 4, 8, 12, 16, 20, 24, 28})
+ ), 32);
+ set_bit_by_position(packed, oddparity32(
+ get_nonlinear_field(packed, 8, (uint8_t[]){1, 5, 9, 13, 17, 21, 25, 29})
+ ), 33);
+ set_bit_by_position(packed, evenparity32(
+ get_nonlinear_field(packed, 8, (uint8_t[]){2, 6, 10, 14, 18, 22, 28, 30})
+ ), 34);
+ set_bit_by_position(packed, evenparity32(
+ get_nonlinear_field(packed, 8, (uint8_t[]){3, 7, 11, 15, 19, 23, 29, 31})
+ ), 35);
return add_HID_header(packed);
}
bool Unpack_H10320(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
card->CardNumber += val * pow(10, 7-idx);
}
}
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 32) == evenparity32(get_nonlinear_field(packed, 8, (uint8_t[]){0, 4, 8, 12, 16, 20, 24, 28}))) &&
(get_bit_by_position(packed, 33) == oddparity32(get_nonlinear_field(packed, 8, (uint8_t[]){1, 5, 9, 13, 17, 21, 25, 29}))) &&
if (card->FacilityCode > 0xFF) return false; // Can't encode FC.
if (card->IssueLevel > 0x03) return false; // Can't encode IL.
if (card->CardNumber > 0x00FFFFFF) return false; // Can't encode CN.
-
+ if (card->OEM > 0) return false; // Not used in this format
packed->Length = 36; // Set number of bits
set_linear_field(packed, card->FacilityCode, 1, 8);
set_linear_field(packed, card->IssueLevel, 9, 2);
set_linear_field(packed, card->CardNumber, 11, 24);
- if (card->ParitySupported){
- set_bit_by_position(packed,
- oddparity32(get_linear_field(packed, 1, 17))
- , 0);
- set_bit_by_position(packed,
- oddparity32(get_linear_field(packed, 17, 18))
- , 35);
- }
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 1, 17))
+ , 0);
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 17, 18))
+ , 35);
return add_HID_header(packed);
}
bool Unpack_S12906(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 36) return false; // Wrong length? Stop here.
-
card->FacilityCode = get_linear_field(packed, 1, 8);
card->IssueLevel = get_linear_field(packed, 9, 2);
card->CardNumber = get_linear_field(packed, 11, 24);
-
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == oddparity32(get_linear_field(packed, 1, 17))) &&
- (get_bit_by_position(packed, 35) == oddparity32(get_linear_field(packed, 17, 18)));
-
+ (get_bit_by_position(packed, 35) == oddparity32(get_linear_field(packed, 17, 18)));
return true;
}
bool Pack_Sie36(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0x0003FFFF) return false; // Can't encode FC.
- if (card->IssueLevel > 0x00) return false; // Can't encode IL.
if (card->CardNumber > 0x0000FFFF) 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 = 36; // Set number of bits
set_linear_field(packed, card->FacilityCode, 1, 18);
set_linear_field(packed, card->CardNumber, 19, 16);
- if (card->ParitySupported){
- set_bit_by_position(packed,
- oddparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 3, 4, 6, 7, 9, 10, 12, 13, 15, 16, 18, 19, 21, 22, 24, 25, 27, 28, 30, 31, 33, 34}))
- , 0);
- set_bit_by_position(packed,
- evenparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34}))
- , 35);
- }
+ set_bit_by_position(packed,
+ oddparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 3, 4, 6, 7, 9, 10, 12, 13, 15, 16, 18, 19, 21, 22, 24, 25, 27, 28, 30, 31, 33, 34}))
+ , 0);
+ set_bit_by_position(packed,
+ evenparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34}))
+ , 35);
return add_HID_header(packed);
}
bool Unpack_Sie36(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 36) return false; // Wrong length? Stop here.
-
card->FacilityCode = get_linear_field(packed, 1, 18);
card->CardNumber = get_linear_field(packed, 19, 16);
-
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == oddparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 3, 4, 6, 7, 9, 10, 12, 13, 15, 16, 18, 19, 21, 22, 24, 25, 27, 28, 30, 31, 33, 34}))) &&
(get_bit_by_position(packed, 35) == oddparity32(get_nonlinear_field(packed, 23, (uint8_t[]){1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34})));
-
return true;
}
+bool Pack_C15001(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
+ memset(packed, 0, sizeof(hidproxmessage_t));
+ if (card->FacilityCode > 0x000000FF) return false; // Can't encode FC.
+ if (card->CardNumber > 0x0000FFFF) return false; // Can't encode CN.
+ if (card->IssueLevel > 0) return false; // Not used in this format
+ if (card->OEM > 0x000003FF) return false; // Can't encode OEM.
+ packed->Length = 36; // Set number of bits
+ set_linear_field(packed, card->OEM, 1, 10);
+ set_linear_field(packed, card->FacilityCode, 11, 8);
+ set_linear_field(packed, card->CardNumber, 19, 16);
+ set_bit_by_position(packed,
+ evenparity32(get_linear_field(packed, 1, 17))
+ , 0);
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 18, 17))
+ , 35);
+ return add_HID_header(packed);
+}
+bool Unpack_C15001(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
+ memset(card, 0, sizeof(hidproxcard_t));
+ if (packed->Length != 36) return false; // Wrong length? Stop here.
+ card->OEM = get_linear_field(packed, 1, 10);
+ card->FacilityCode = get_linear_field(packed, 11, 8);
+ card->CardNumber = get_linear_field(packed, 19, 16);
+ card->ParityValid =
+ (get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 17))) &&
+ (get_bit_by_position(packed, 35) == oddparity32(get_linear_field(packed, 18, 17)));
+ return true;
+}
bool Pack_H10302(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0) return false; // Can't encode FC. (none in this format)
if (card->CardNumber > 0x00000007FFFFFFFF) 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 = 37; // Set number of bits
set_linear_field(packed, card->CardNumber, 1, 35);
- if (card->ParitySupported){
- set_bit_by_position(packed,
- evenparity32(get_linear_field(packed, 1, 18))
- , 0);
- set_bit_by_position(packed,
- oddparity32(get_linear_field(packed, 18, 18))
- , 36);
- }
+ set_bit_by_position(packed,
+ evenparity32(get_linear_field(packed, 1, 18))
+ , 0);
+ set_bit_by_position(packed,
+ oddparity32(get_linear_field(packed, 18, 18))
+ , 36);
return add_HID_header(packed);
}
bool Unpack_H10302(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 37) return false; // Wrong length? Stop here.
-
card->CardNumber = get_linear_field(packed, 1, 35);
- card->ParitySupported = true;
card->ParityValid =
(get_bit_by_position(packed, 0) == evenparity32(get_linear_field(packed, 1, 18))) &&
(get_bit_by_position(packed, 36) == oddparity32(get_linear_field(packed, 18, 18)));
-
return true;
}
if (card->FacilityCode > 0x0000FFFF) return false; // Can't encode FC.
if (card->CardNumber > 0x0007FFFF) 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 = 37; // Set number of bits
packed->bot |= (card->CardNumber & 0x0007FFFF) << 1;
packed->bot |= (card->FacilityCode & 0x00000FFF) << 20;
packed->mid |= (card->FacilityCode & 0x0000F000) >> 12;
- if (card->ParitySupported){
- packed->mid |= (evenparity32((packed->mid & 0x0000000F) ^ (packed->bot & 0xFFFC0000)) & 1) << 4;
- packed->bot |= ( oddparity32(packed->bot & 0x0007FFFE) & 1);
- }
+ packed->mid |= (evenparity32((packed->mid & 0x0000000F) ^ (packed->bot & 0xFFFC0000)) & 1) << 4;
+ packed->bot |= ( oddparity32(packed->bot & 0x0007FFFE) & 1);
return add_HID_header(packed);
}
bool Unpack_H10304(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 37) return false; // Wrong length? Stop here.
-
card->CardNumber = (packed->bot >> 1) & 0x0007FFFF;
card->FacilityCode = ((packed->mid & 0xF) << 12) | ((packed->bot >> 20));
- card->ParitySupported = true;
card->ParityValid =
(evenparity32((packed->mid & 0x0000000F) ^ (packed->bot & 0xFFFC0000)) == ((packed->mid >> 4) & 1)) &&
(oddparity32( packed->bot & 0x0007FFFE) == (packed->bot & 1));
return true;
}
-
bool Pack_P10001(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0xFFF) 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 = 40; // Set number of bits
set_linear_field(packed, 0xF, 0, 4);
set_linear_field(packed, card->FacilityCode, 4, 12);
set_linear_field(packed, card->CardNumber, 16, 16);
-
- if (card->ParitySupported){
- set_linear_field(packed,
- get_linear_field(packed, 0, 8) ^
- get_linear_field(packed, 8, 8) ^
- get_linear_field(packed, 16, 8) ^
- get_linear_field(packed, 24, 8)
- , 32, 8);
- }
+ set_linear_field(packed,
+ get_linear_field(packed, 0, 8) ^
+ get_linear_field(packed, 8, 8) ^
+ get_linear_field(packed, 16, 8) ^
+ get_linear_field(packed, 24, 8)
+ , 32, 8);
return add_HID_header(packed);
}
bool Unpack_P10001(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 40) return false; // Wrong length? Stop here.
-
card->CardNumber = get_linear_field(packed, 16, 16);
card->FacilityCode = get_linear_field(packed, 4, 12);
- card->ParitySupported = true;
card->ParityValid = (
get_linear_field(packed, 0, 8) ^
get_linear_field(packed, 8, 8) ^
return true;
}
-
bool Pack_C1k48s(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed){
memset(packed, 0, sizeof(hidproxmessage_t));
if (card->FacilityCode > 0x003FFFFF) return false; // Can't encode FC.
if (card->CardNumber > 0x007FFFFF) 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 = 48; // Set number of bits
packed->bot |= (card->CardNumber & 0x007FFFFF) << 1;
packed->bot |= (card->FacilityCode & 0x000000FF) << 24;
packed->mid |= (card->FacilityCode & 0x003FFF00) >> 8;
- if (card->ParitySupported){
- packed->mid |= (evenparity32((packed->mid & 0x00001B6D) ^ (packed->bot & 0xB6DB6DB6)) & 1) << 14;
- packed->bot |= ( oddparity32((packed->mid & 0x000036DB) ^ (packed->bot & 0x6DB6DB6C)) & 1);
- packed->mid |= ( oddparity32((packed->mid & 0x00007FFF) ^ (packed->bot & 0xFFFFFFFF)) & 1) << 15;
- }
+ packed->mid |= (evenparity32((packed->mid & 0x00001B6D) ^ (packed->bot & 0xB6DB6DB6)) & 1) << 14;
+ packed->bot |= ( oddparity32((packed->mid & 0x000036DB) ^ (packed->bot & 0x6DB6DB6C)) & 1);
+ packed->mid |= ( oddparity32((packed->mid & 0x00007FFF) ^ (packed->bot & 0xFFFFFFFF)) & 1) << 15;
return add_HID_header(packed);
}
bool Unpack_C1k48s(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card){
memset(card, 0, sizeof(hidproxcard_t));
if (packed->Length != 48) return false; // Wrong length? Stop here.
-
card->CardNumber = (packed->bot >> 1) & 0x007FFFFF;
card->FacilityCode = ((packed->mid & 0x00003FFF) << 8) | ((packed->bot >> 24));
- card->ParitySupported = true;
card->ParityValid =
(evenparity32((packed->mid & 0x00001B6D) ^ (packed->bot & 0xB6DB6DB6)) == ((packed->mid >> 14) & 1)) &&
( oddparity32((packed->mid & 0x000036DB) ^ (packed->bot & 0x6DB6DB6C)) == ((packed->bot >> 0) & 1)) &&
}
static const hidcardformat_t FormatTable[] = {
- {"H10301", Pack_H10301, Unpack_H10301, "HID H10301 26-bit"}, // imported from old pack/unpack
- {"Tecom27", Pack_Tecom27, Unpack_Tecom27, "Tecom 27-bit"}, // from cardinfo.barkweb.com.au
- {"2804W", Pack_2804W, Unpack_2804W, "2804 Wiegand"}, // from cardinfo.barkweb.com.au
- {"ATSW30", Pack_ATSW30, Unpack_ATSW30, "ATS Wiegand 30-bit"}, // from cardinfo.barkweb.com.au
- {"ADT31", Pack_ADT31, Unpack_ADT31, "HID ADT 31-bit"}, // from cardinfo.barkweb.com.au
- {"D10202", Pack_D10202, Unpack_D10202, "HID D10202 33-bit"}, // from cardinfo.barkweb.com.au
- {"H10306", Pack_H10306, Unpack_H10306, "HID H10306 34-bit"}, // imported from old pack/unpack
- {"N1002", Pack_N1002, Unpack_N1002, "HID N1002 34-bit"}, // from cardinfo.barkweb.com.au
- {"C1k35s", Pack_C1k35s, Unpack_C1k35s, "HID Corporate 1000 35-bit standard layout"}, // imported from old pack/unpack
- {"S12906", Pack_S12906, Unpack_S12906, "HID Simplex 36-bit"}, // from cardinfo.barkweb.com.au
- {"Sie36", Pack_Sie36, Unpack_Sie36, "HID 36-bit Siemens"}, // from cardinfo.barkweb.com.au
- {"H10320", Pack_H10320, Unpack_H10320, "HID H10320 36-bit BCD, Card num only"}, // from Proxmark forums
- {"H10302", Pack_H10302, Unpack_H10302, "HID H10302 37-bit huge, Card num only"}, // from Proxmark forums
- {"H10304", Pack_H10304, Unpack_H10304, "HID H10304 37-bit"}, // imported from old pack/unpack
+ {"H10301", Pack_H10301, Unpack_H10301, "HID H10301 26-bit", {1, 1, 0, 0, 1}}, // imported from old pack/unpack
+ {"Tecom27", Pack_Tecom27, Unpack_Tecom27, "Tecom 27-bit", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"2804W", Pack_2804W, Unpack_2804W, "2804 Wiegand", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"ATSW30", Pack_ATSW30, Unpack_ATSW30, "ATS Wiegand 30-bit", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"ADT31", Pack_ADT31, Unpack_ADT31, "HID ADT 31-bit", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"D10202", Pack_D10202, Unpack_D10202, "HID D10202 33-bit", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"H10306", Pack_H10306, Unpack_H10306, "HID H10306 34-bit", {1, 1, 0, 0, 1}}, // imported from old pack/unpack
+ {"N10002", Pack_N10002, Unpack_N10002, "HID N10002 34-bit", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"C1k35s", Pack_C1k35s, Unpack_C1k35s, "HID Corporate 1000 35-bit standard layout", {1, 1, 0, 0, 1}}, // imported from old pack/unpack
+ {"C15001", Pack_C15001, Unpack_C15001, "HID KeySpan 36-bit", {1, 1, 0, 1, 1}}, // from Proxmark forums
+ {"S12906", Pack_S12906, Unpack_S12906, "HID Simplex 36-bit", {1, 1, 1, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"Sie36", Pack_Sie36, Unpack_Sie36, "HID 36-bit Siemens", {1, 1, 0, 0, 1}}, // from cardinfo.barkweb.com.au
+ {"H10320", Pack_H10320, Unpack_H10320, "HID H10320 36-bit BCD", {1, 0, 0, 0, 1}}, // from Proxmark forums
+ {"H10302", Pack_H10302, Unpack_H10302, "HID H10302 37-bit huge ID", {1, 0, 0, 0, 1}}, // from Proxmark forums
+ {"H10304", Pack_H10304, Unpack_H10304, "HID H10304 37-bit", {1, 1, 0, 0, 1}}, // imported from old pack/unpack
{"P10001", Pack_P10001, Unpack_P10001, "HID P10001 Honeywell 40-bit"}, // from cardinfo.barkweb.com.au
- {"C1k48s", Pack_C1k48s, Unpack_C1k48s, "HID Corporate 1000 48-bit standard layout"}, // imported from old pack/unpack
- {NULL, NULL, NULL, NULL} // Must null terminate array
+ {"C1k48s", Pack_C1k48s, Unpack_C1k48s, "HID Corporate 1000 48-bit standard layout", {1, 1, 0, 0, 1}}, // imported from old pack/unpack
+ {NULL, NULL, NULL, NULL, {0, 0, 0, 0, 0}} // Must null terminate array
};
void HIDListFormats(){
PrintAndLog("------------------------------------------------------------");
while (FormatTable[i].Name)
{
- PrintAndLog("%-10s %s", FormatTable[i].Name, FormatTable[i].Descrp);
+ PrintAndLog("%-10s %-30s", FormatTable[i].Name, FormatTable[i].Descrp);
++i;
}
PrintAndLog("");
return FormatTable[FormatIndex].Pack(card, packed);
}
+void HIDDisplayUnpackedCard(hidproxcard_t* card, const hidcardformat_t format){
+ PrintAndLog(" Format: %s (%s)", format.Name, format.Descrp);
+ if (format.Fields.hasFacilityCode)
+ PrintAndLog("Facility Code: %d",card->FacilityCode);
+ if (format.Fields.hasCardNumber)
+ PrintAndLog(" Card Number: %d",card->CardNumber);
+ if (format.Fields.hasIssueLevel)
+ PrintAndLog(" Issue Level: %d",card->IssueLevel);
+ if (format.Fields.hasOEMCode)
+ PrintAndLog(" OEM Code: %d",card->OEM);
+ if (format.Fields.hasParity)
+ PrintAndLog(" Parity: %s",card->ParityValid ? "Valid" : "Invalid");
+}
+
bool HIDTryUnpack(/* in */hidproxmessage_t* packed, /* in */bool ignoreParity){
if (FormatTable[0].Name == NULL)
return false;
while (FormatTable[i].Name)
{
if (FormatTable[i].Unpack(packed, &card)){
- if (ignoreParity || !card.ParitySupported || card.ParityValid){
+ if (ignoreParity || !FormatTable[i].Fields.hasParity || card.ParityValid){
+ if (!result) PrintAndLog("--------------------------------------------------");
result = true;
- PrintAndLog("%-16s FC: %u, Card: %"PRIu64", IL: %u, Parity %s",
- FormatTable[i].Name,
- card.FacilityCode,
- card.CardNumber,
- card.IssueLevel,
- (card.ParitySupported) ? ((card.ParityValid) ? "valid" : "invalid") : "n/a"
- );
+ HIDDisplayUnpackedCard(&card, FormatTable[i]);
+ PrintAndLog("--------------------------------------------------");
}
}
++i;
projects / proxmark3-svn / commitdiff