X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/111c6934d4e5c58883d08210399afe8eaeccc5c3..e1a0ed65ff6698296c245482be4cba4035f8ae14:/client/cmdhflegic.c?ds=sidebyside diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index 31d59005..376ec40f 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -11,7 +11,6 @@ static int CmdHelp(const char *Cmd); -#define SESSION_IV 0x55 #define MAX_LENGTH 1024 int usage_legic_calccrc8(void){ @@ -45,13 +44,14 @@ int usage_legic_read(void){ PrintAndLog("Usage: hf legic read [h] "); PrintAndLog("Options:"); PrintAndLog(" h : this help"); - PrintAndLog(" : offset in data array to start download from"); - PrintAndLog(" : number of bytes to download"); - PrintAndLog(" : (optional) Initialization vector to use (ODD and 7bits)"); + PrintAndLog(" : offset in data array to start download from (hex)"); + PrintAndLog(" : number of bytes to read (hex)"); + PrintAndLog(" : (optional) Initialization vector to use (hex, odd and 7bits)"); PrintAndLog(""); PrintAndLog("Samples:"); - PrintAndLog(" hf legic read"); - PrintAndLog(" hf legic read 10 4"); + PrintAndLog(" hf legic read 0 21 - reads from byte[0] 21 bytes(system header)"); + PrintAndLog(" hf legic read 0 4 55 - reads from byte[0] 4 bytes with IV 0x55"); + PrintAndLog(" hf legic read 0 100 55 - reads 256bytes with IV 0x55"); return 0; } int usage_legic_sim(void){ @@ -63,34 +63,41 @@ int usage_legic_write(void){ PrintAndLog("Usage: hf legic write [h] "); PrintAndLog("Options:"); PrintAndLog(" h : this help"); - PrintAndLog(" : offset in data array to start writing from"); - PrintAndLog(" : number of bytes to write"); + PrintAndLog(" : offset in data array to start writing from (hex)"); + PrintAndLog(" : number of bytes to write (hex)"); PrintAndLog(" : (optional) Initialization vector to use (ODD and 7bits)"); PrintAndLog(""); PrintAndLog("Samples:"); - PrintAndLog(" hf legic write"); - PrintAndLog(" hf legic write 10 4"); + PrintAndLog(" hf legic write 10 4 - writes 0x4 to byte[0x10]"); return 0; } int usage_legic_rawwrite(void){ - PrintAndLog("Write raw data direct to a specific address on legic tag."); - PrintAndLog("Usage: hf legic writeraw [h]
"); + PrintAndLog("Write raw data direct to a specific offset on legic tag."); + PrintAndLog("Usage: hf legic writeraw [h] "); PrintAndLog("Options:"); PrintAndLog(" h : this help"); - PrintAndLog("
: address to write to"); - PrintAndLog(" : value to write"); - PrintAndLog(" : (optional) Initialization vector to use (ODD and 7bits)"); + PrintAndLog(" : offset to write to (hex)"); + PrintAndLog(" : value (hex)"); + PrintAndLog(" : (optional) Initialization vector to use (hex, odd and 7bits)"); PrintAndLog(""); PrintAndLog("Samples:"); - PrintAndLog(" hf legic writeraw"); - PrintAndLog(" hf legic writeraw 10 4"); + PrintAndLog(" hf legic writeraw 10 4 - writes 0x4 to byte[0x10]"); return 0; } int usage_legic_fill(void){ PrintAndLog("Missing help text."); return 0; } - +int usage_legic_info(void){ + PrintAndLog("Read info from a legic tag."); + PrintAndLog("Usage: hf legic info [h]"); + PrintAndLog("Options:"); + PrintAndLog(" h : this help"); + PrintAndLog(""); + PrintAndLog("Samples:"); + PrintAndLog(" hf legic info"); + return 0; +} /* * Output BigBuf and deobfuscate LEGIC RF tag data. * This is based on information given in the talk held @@ -101,86 +108,86 @@ int CmdLegicDecode(const char *Cmd) { int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0; int crc = 0, wrp = 0, wrc = 0; uint8_t stamp_len = 0; - uint8_t data_buf[1024]; // receiver buffer + uint8_t data[1024]; // receiver buffer char token_type[5] = {0,0,0,0,0}; int dcf = 0; int bIsSegmented = 0; - // copy data from proxmark into buffer - GetFromBigBuf(data_buf,sizeof(data_buf),0); + // copy data from device + GetEMLFromBigBuf(data, sizeof(data), 0); if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){ PrintAndLog("Command execute timeout"); return 1; } // Output CDF System area (9 bytes) plus remaining header area (12 bytes) - crc = data_buf[4]; - uint32_t calc_crc = CRC8Legic(data_buf, 4); + crc = data[4]; + uint32_t calc_crc = CRC8Legic(data, 4); PrintAndLog("\nCDF: System Area"); PrintAndLog("------------------------------------------------------"); PrintAndLog("MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s", - data_buf[0], - data_buf[1], - data_buf[2], - data_buf[3], - data_buf[4], - (calc_crc == crc) ? "OK":"Fail" + data[0], + data[1], + data[2], + data[3], + data[4], + (calc_crc == crc) ? "OK":"Fail" ); token_type[0] = 0; - dcf = ((int)data_buf[6] << 8) | (int)data_buf[5]; + dcf = ((int)data[6] << 8) | (int)data[5]; // New unwritten media? if(dcf == 0xFFFF) { PrintAndLog("DCF: %d (%02x %02x), Token Type=NM (New Media)", dcf, - data_buf[5], - data_buf[6] + data[5], + data[6] ); } else if(dcf > 60000) { // Master token? int fl = 0; - if(data_buf[6] == 0xec) { + if(data[6] == 0xec) { strncpy(token_type, "XAM", sizeof(token_type)); fl = 1; - stamp_len = 0x0c - (data_buf[5] >> 4); + stamp_len = 0x0c - (data[5] >> 4); } else { - switch (data_buf[5] & 0x7f) { + switch (data[5] & 0x7f) { case 0x00 ... 0x2f: strncpy(token_type, "IAM", sizeof(token_type)); - fl = (0x2f - (data_buf[5] & 0x7f)) + 1; + fl = (0x2f - (data[5] & 0x7f)) + 1; break; case 0x30 ... 0x6f: strncpy(token_type, "SAM", sizeof(token_type)); - fl = (0x6f - (data_buf[5] & 0x7f)) + 1; + fl = (0x6f - (data[5] & 0x7f)) + 1; break; case 0x70 ... 0x7f: strncpy(token_type, "GAM", sizeof(token_type)); - fl = (0x7f - (data_buf[5] & 0x7f)) + 1; + fl = (0x7f - (data[5] & 0x7f)) + 1; break; } - stamp_len = 0xfc - data_buf[6]; + stamp_len = 0xfc - data[6]; } PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u", dcf, - data_buf[5], - data_buf[6], + data[5], + data[6], token_type, - (data_buf[5] & 0x80 )>> 7, + (data[5] & 0x80 )>> 7, stamp_len, fl ); } else { // Is IM(-S) type of card... - if(data_buf[7] == 0x9F && data_buf[8] == 0xFF) { + if(data[7] == 0x9F && data[8] == 0xFF) { bIsSegmented = 1; strncpy(token_type, "IM-S", sizeof(token_type)); } else { @@ -189,10 +196,10 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)", dcf, - data_buf[5], - data_buf[6], + data[5], + data[6], token_type, - (data_buf[5]&0x80) >> 7 + (data[5]&0x80) >> 7 ); } @@ -201,10 +208,10 @@ int CmdLegicDecode(const char *Cmd) { if(bIsSegmented) { PrintAndLog("WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x", - data_buf[7] & 0x0f, - (data_buf[7] & 0x70) >> 4, - (data_buf[7] & 0x80) >> 7, - data_buf[8] + data[7] & 0x0f, + (data[7] & 0x70) >> 4, + (data[7] & 0x80) >> 7, + data[8] ); } @@ -212,10 +219,10 @@ int CmdLegicDecode(const char *Cmd) { if(bIsSegmented || dcf > 60000) { if(dcf > 60000) { PrintAndLog("Master token data"); - PrintAndLog("%s", sprint_hex(data_buf+8, 14)); + PrintAndLog("%s", sprint_hex(data+8, 14)); } else { PrintAndLog("Remaining Header Area"); - PrintAndLog("%s", sprint_hex(data_buf+9, 13)); + PrintAndLog("%s", sprint_hex(data+9, 13)); } } } @@ -238,10 +245,10 @@ int CmdLegicDecode(const char *Cmd) { // decode segments for (segmentNum=1; segmentNum < 128; segmentNum++ ) { - segment_len = ((data_buf[i+1] ^ crc) & 0x0f) * 256 + (data_buf[i] ^ crc); - segment_flag = ((data_buf[i+1] ^ crc) & 0xf0) >> 4; - wrp = (data_buf[i+2] ^ crc); - wrc = ((data_buf[i+3] ^ crc) & 0x70) >> 4; + segment_len = ((data[i+1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc); + segment_flag = ((data[i+1] ^ crc) & 0xf0) >> 4; + wrp = (data[i+2] ^ crc); + wrc = ((data[i+3] ^ crc) & 0x70) >> 4; bool hasWRC = (wrc > 0); bool hasWRP = (wrp > wrc); @@ -249,31 +256,31 @@ int CmdLegicDecode(const char *Cmd) { int remain_seg_payload_len = (segment_len - wrp - 5); // validate segment-crc - segCrcBytes[0]=data_buf[0]; //uid0 - segCrcBytes[1]=data_buf[1]; //uid1 - segCrcBytes[2]=data_buf[2]; //uid2 - segCrcBytes[3]=data_buf[3]; //uid3 - segCrcBytes[4]=(data_buf[i] ^ crc); //hdr0 - segCrcBytes[5]=(data_buf[i+1] ^ crc); //hdr1 - segCrcBytes[6]=(data_buf[i+2] ^ crc); //hdr2 - segCrcBytes[7]=(data_buf[i+3] ^ crc); //hdr3 + segCrcBytes[0]=data[0]; //uid0 + segCrcBytes[1]=data[1]; //uid1 + segCrcBytes[2]=data[2]; //uid2 + segCrcBytes[3]=data[3]; //uid3 + segCrcBytes[4]=(data[i] ^ crc); //hdr0 + segCrcBytes[5]=(data[i+1] ^ crc); //hdr1 + segCrcBytes[6]=(data[i+2] ^ crc); //hdr2 + segCrcBytes[7]=(data[i+3] ^ crc); //hdr3 segCalcCRC = CRC8Legic(segCrcBytes, 8); - segCRC = data_buf[i+4] ^ crc; + segCRC = data[i+4] ^ crc; PrintAndLog("Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u, Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)", segmentNum, - data_buf[i] ^ crc, - data_buf[i+1] ^ crc, - data_buf[i+2] ^ crc, - data_buf[i+3] ^ crc, + data[i] ^ crc, + data[i+1] ^ crc, + data[i+2] ^ crc, + data[i+3] ^ crc, segment_len, segment_flag, (segment_flag & 0x4) >> 2, (segment_flag & 0x8) >> 3, wrp, wrc, - ((data_buf[i+3]^crc) & 0x80) >> 7, + ((data[i+3]^crc) & 0x80) >> 7, segCRC, ( segCRC == segCalcCRC ) ? "OK" : "fail" ); @@ -286,9 +293,9 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("-----+------------------------------------------------"); for ( k=i; k < (i + wrc); ++k) - data_buf[k] ^= crc; + data[k] ^= crc; - print_hex_break( data_buf+i, wrc, 16); + print_hex_break( data+i, wrc, 16); i += wrc; } @@ -299,15 +306,15 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("-----+------------------------------------------------"); for (k=i; k < (i+wrp_len); ++k) - data_buf[k] ^= crc; + data[k] ^= crc; - print_hex_break( data_buf+i, wrp_len, 16); + print_hex_break( data+i, wrp_len, 16); i += wrp_len; // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...) if( wrp_len == 8 ) - PrintAndLog("Card ID: %2X%02X%02X", data_buf[i-4]^crc, data_buf[i-3]^crc, data_buf[i-2]^crc); + PrintAndLog("Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc); } PrintAndLog("Remaining segment payload: (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len); @@ -315,9 +322,9 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("-----+------------------------------------------------"); for ( k=i; k < (i+remain_seg_payload_len); ++k) - data_buf[k] ^= crc; + data[k] ^= crc; - print_hex_break( data_buf+i, remain_seg_payload_len, 16); + print_hex_break( data+i, remain_seg_payload_len, 16); i += remain_seg_payload_len; @@ -333,8 +340,8 @@ int CmdLegicDecode(const char *Cmd) { // Data start point on unsegmented cards i = 8; - wrp = data_buf[7] & 0x0F; - wrc = (data_buf[7] & 0x70) >> 4; + wrp = data[7] & 0x0F; + wrc = (data[7] & 0x70) >> 4; bool hasWRC = (wrc > 0); bool hasWRP = (wrp > wrc); @@ -344,14 +351,14 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u", wrp, wrc, - (data_buf[7] & 0x80) >> 7 + (data[7] & 0x80) >> 7 ); if ( hasWRC ) { PrintAndLog("WRC protected area: (I %d | WRC %d)", i, wrc); PrintAndLog("\nrow | data"); PrintAndLog("-----+------------------------------------------------"); - print_hex_break( data_buf+i, wrc, 16); + print_hex_break( data+i, wrc, 16); i += wrc; } @@ -359,18 +366,18 @@ int CmdLegicDecode(const char *Cmd) { PrintAndLog("Remaining write protected area: (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len); PrintAndLog("\nrow | data"); PrintAndLog("-----+------------------------------------------------"); - print_hex_break( data_buf + i, wrp_len, 16); + print_hex_break( data + i, wrp_len, 16); i += wrp_len; // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...) if( wrp_len == 8 ) - PrintAndLog("Card ID: %2X%02X%02X", data_buf[i-4], data_buf[i-3], data_buf[i-2]); + PrintAndLog("Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]); } PrintAndLog("Remaining segment payload: (I %d | Remain LEN %d)", i, remain_seg_payload_len); PrintAndLog("\nrow | data"); PrintAndLog("-----+------------------------------------------------"); - print_hex_break( data_buf + i, remain_seg_payload_len, 16); + print_hex_break( data + i, remain_seg_payload_len, 16); i += remain_seg_payload_len; PrintAndLog("-----+------------------------------------------------\n"); @@ -382,8 +389,8 @@ int CmdLegicDecode(const char *Cmd) { int CmdLegicRFRead(const char *Cmd) { // params: - // offset in data - // number of bytes. + // offset in data memory + // number of bytes to read char cmdp = param_getchar(Cmd, 0); if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_read(); @@ -391,38 +398,54 @@ int CmdLegicRFRead(const char *Cmd) { sscanf(Cmd, "%x %x %x", &offset, &len, &IV); // OUT-OF-BOUNDS check - if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset; + if ( len + offset > MAX_LENGTH ) { + len = MAX_LENGTH - offset; + PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len); + } if ( (IV & 0x7F) != IV ){ IV &= 0x7F; PrintAndLog("Truncating IV to 7bits"); } + if ( (IV & 1) == 0 ){ - IV |= 0x01; // IV must be odd + IV |= 0x01; PrintAndLog("LSB of IV must be SET"); } - PrintAndLog("Current IV: 0x%02x", IV); - - // get some prng bytes from - uint8_t temp[12]; - legic_prng_init(IV); - for ( uint8_t j = 0; j < sizeof(temp); ++j) - temp[j] = legic_prng_get_bits(8); - - PrintAndLog("PRNG: %s", sprint_hex(temp, sizeof(temp))); UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}}; clearCommandBuffer(); SendCommand(&c); UsbCommand resp; - if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { + if (WaitForResponseTimeout(CMD_ACK, &resp, 3000)) { uint8_t isOK = resp.arg[0] & 0xFF; - uint16_t len = resp.arg[1] & 0x3FF; - if ( isOK ) { - PrintAndLog("use 'hf legic decode' or"); - PrintAndLog("'data hexsamples %d' to view results", len); + uint16_t readlen = resp.arg[1]; + if ( isOK ) { + + uint8_t *data = malloc(readlen); + if ( !data ){ + PrintAndLog("Cannot allocate memory"); + return 2; + } - } + if ( readlen != len ) + PrintAndLog("Fail, only managed to read 0x%02X bytes", readlen); + + // copy data from device + GetEMLFromBigBuf(data, readlen, 0); + if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)){ + PrintAndLog("Command execute timeout"); + if ( data ) + free(data); + return 1; + } + + PrintAndLog("\nData"); + PrintAndLog("-----------------------------"); + print_hex_break( data, readlen, 32); + } else { + PrintAndLog("failed reading tag"); + } } else { PrintAndLog("command execution time out"); return 1; @@ -582,7 +605,6 @@ int CmdLegicRfWrite(const char *Cmd) { uint32_t offset = 0, len = 0, IV = 0; - UsbCommand c = {CMD_WRITER_LEGIC_RF, {0,0,0}}; int res = sscanf(Cmd, "%x %x %x", &offset, &len, &IV); if(res < 2) { PrintAndLog("Please specify the offset and length as two hex strings and, optionally, the IV also as an hex string"); @@ -590,8 +612,10 @@ int CmdLegicRfWrite(const char *Cmd) { } // OUT-OF-BOUNDS check - if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset; - + if ( len + offset > MAX_LENGTH ) { + len = MAX_LENGTH - offset; + PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len); + } if ( (IV & 0x7F) != IV ){ IV &= 0x7F; PrintAndLog("Truncating IV to 7bits"); @@ -601,14 +625,21 @@ int CmdLegicRfWrite(const char *Cmd) { PrintAndLog("LSB of IV must be SET"); } - PrintAndLog("Current IV: 0x%02x", IV); - - c.arg[0] = offset; - c.arg[1] = len; - c.arg[2] = IV; - + UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}}; clearCommandBuffer(); SendCommand(&c); + UsbCommand resp; + if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { + uint8_t isOK = resp.arg[0] & 0xFF; + if ( isOK ) { + } else { + PrintAndLog("failed writig tag"); + } + } else { + PrintAndLog("command execution time out"); + return 1; + } + return 0; } @@ -617,17 +648,18 @@ int CmdLegicRfRawWrite(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rawwrite(); - uint32_t address = 0, data = 0, IV = 0; + uint32_t offset = 0, data = 0, IV = 0; char answer; - UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {0,0,0} }; - int res = sscanf(Cmd, "%x %x %x", &address, &data, &IV); + int res = sscanf(Cmd, "%x %x %x", &offset, &data, &IV); if(res < 2) return usage_legic_rawwrite(); - + // OUT-OF-BOUNDS check - if(address > MAX_LENGTH) - return usage_legic_rawwrite(); + if ( offset > MAX_LENGTH ) { + PrintAndLog("Out-of-bound, offset"); + return 1; + } if ( (IV & 0x7F) != IV ){ IV &= 0x7F; @@ -637,11 +669,8 @@ int CmdLegicRfRawWrite(const char *Cmd) { IV |= 0x01; // IV must be odd PrintAndLog("LSB of IV must be SET"); } - PrintAndLog("Current IV: 0x%02x", IV); - c.arg[0] = address; - c.arg[1] = data; - c.arg[2] = IV; + UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {offset, data, IV} }; if (c.arg[0] == 0x05 || c.arg[0] == 0x06) { PrintAndLog("############# DANGER !! #############"); @@ -685,6 +714,37 @@ int CmdLegicRfFill(const char *Cmd) { return 0; } +void static calc4(uint8_t *cmd, uint8_t len){ + crc_t crc; + //crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, TRUE, TRUE); + crc_init(&crc, 4, 0x19 >> 1, 0x5, 0); + + crc_clear(&crc); + crc_update(&crc, 1, 1); /* CMD_READ */ + crc_update(&crc, cmd[0], 8); + crc_update(&crc, cmd[1], 8); + printf("crc4 %X\n", reflect(crc_finish(&crc), 4) ) ; + + crc_clear(&crc); + crc_update(&crc, 1, 1); /* CMD_READ */ + crc_update(&crc, cmd[0], 8); + crc_update(&crc, cmd[1], 8); + printf("crc4 %X\n", crc_finish(&crc) ) ; + + printf("---- old ---\n"); + crc_update2(&crc, 1, 1); /* CMD_READ */ + crc_update2(&crc, cmd[0], 8); + crc_update2(&crc, cmd[1], 8); + printf("crc4 %X \n", reflect(crc_finish(&crc), 4) ) ; + + + crc_clear(&crc); + crc_update2(&crc, 1, 1); /* CMD_READ */ + crc_update2(&crc, cmd[0], 8); + crc_update2(&crc, cmd[1], 8); + printf("crc4 %X\n", crc_finish(&crc) ) ; +} + int CmdLegicCalcCrc8(const char *Cmd){ uint8_t *data = NULL; @@ -760,10 +820,13 @@ int CmdLegicCalcCrc8(const char *Cmd){ switch (type){ case 16: - PrintAndLog("LEGIC CRC16: %X", CRC16Legic(data, len, uidcrc)); + PrintAndLog("Legic crc16: %X", CRC16Legic(data, len, uidcrc)); + break; + case 4: + calc4(data, 0); break; default: - PrintAndLog("LEGIC CRC8: %X", CRC8Legic(data, len) ); + PrintAndLog("Legic crc8: %X", CRC8Legic(data, len) ); break; } @@ -771,6 +834,46 @@ int CmdLegicCalcCrc8(const char *Cmd){ return 0; } +int HFLegicInfo(const char *Cmd, bool verbose) { + + char cmdp = param_getchar(Cmd, 0); + if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_info(); + + UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}}; + clearCommandBuffer(); + SendCommand(&c); + UsbCommand resp; + if (!WaitForResponseTimeout(CMD_ACK, &resp, 500)) { + if ( verbose ) PrintAndLog("command execution time out"); + return 1; + } + + uint8_t isOK = resp.arg[0] & 0xFF; + if ( !isOK ) { + if ( verbose ) PrintAndLog("legic card select failed"); + return 1; + } + + legic_card_select_t card; + memcpy(&card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t)); + + PrintAndLog(" UID : %s", sprint_hex(card.uid, sizeof(card.uid))); + switch(card.cardsize) { + case 22: + case 256: + case 1024: + PrintAndLog(" TYPE : MIM%d card (%d bytes)", card.cardsize, card.cardsize); break; + default: { + PrintAndLog("Unknown card format: %d", card.cardsize); + return 1; + } + } + return 0; +} +int CmdLegicInfo(const char *Cmd){ + return HFLegicInfo(Cmd, TRUE); +} + static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"decode", CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"}, @@ -782,6 +885,7 @@ static command_t CommandTable[] = { {"writeraw",CmdLegicRfRawWrite, 0, "
-- Write direct to address"}, {"fill", CmdLegicRfFill, 0, " -- Fill/Write tag with constant value"}, {"crc8", CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"}, + {"info", CmdLegicInfo, 1, "Information"}, {NULL, NULL, 0, NULL} };