X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/810f53792ea438c1b70eaa1f934db1e5c96220cb..4c36581b96dfb81c85f34a4229d82e51edeaf499:/client/cmdhflegic.c?ds=sidebyside diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index 2d198820..aef6ef0c 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -17,24 +17,42 @@ #include "cmdhflegic.h" #include "cmdmain.h" #include "util.h" +#include "crc.h" static int CmdHelp(const char *Cmd); +int usage_legic_calccrc8(void){ + PrintAndLog("Calculates the legic crc8 on the input hexbytes."); + PrintAndLog("There must be an even number of hexsymbols as input."); + PrintAndLog("Usage: hf legic crc8 "); + PrintAndLog("Options :"); + PrintAndLog(" : hex bytes in a string"); + PrintAndLog(""); + PrintAndLog("Sample : hf legic crc8 deadbeef1122"); + return 0; +} + +int usage_legic_load(void){ + PrintAndLog("It loads datasamples from the file `filename` to device memory"); + PrintAndLog("Usage: hf legic load "); + PrintAndLog(" sample: hf legic load filename"); + return 0; +} + /* * Output BigBuf and deobfuscate LEGIC RF tag data. * This is based on information given in the talk held * by Henryk Ploetz and Karsten Nohl at 26c3 */ -int CmdLegicDecode(const char *Cmd) -{ - int i, j, k, n; +int CmdLegicDecode(const char *Cmd) { + int i, k, n; int segment_len = 0; int segment_flag = 0; int stamp_len = 0; int crc = 0; int wrp = 0; int wrc = 0; - uint8_t data_buf[3076]; // receiver buffer - char out_string[3076]; // just use big buffer - bad practice + uint8_t data_buf[1200]; // receiver buffer + //char out_string[3076]; // just use big buffer - bad practice char token_type[4]; // copy data from proxmark into buffer @@ -42,18 +60,19 @@ int CmdLegicDecode(const char *Cmd) WaitForResponse(CMD_ACK,NULL); // Output CDF System area (9 bytes) plus remaining header area (12 bytes) - + crc = data_buf[4]; + uint32_t calc_crc = CRC8Legic(data_buf, 4); + PrintAndLog("\nCDF: System Area"); - PrintAndLog("MCD: %02x, MSN: %02x %02x %02x, MCC: %02x", + 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] + data_buf[4], + (calc_crc == crc) ? "OK":"Fail" ); - - crc = data_buf[4]; switch (data_buf[5]&0x7f) { case 0x00 ... 0x2f: @@ -93,6 +112,10 @@ int CmdLegicDecode(const char *Cmd) PrintAndLog("\nADF: User Area"); i = 22; + uint8_t segCrcBytes[8] = {0x00}; + uint32_t segCalcCRC = 0; + uint32_t segCRC = 0; + for ( n=0; n<64; n++ ) { segment_len = ((data_buf[i+1]^crc)&0x0f) * 256 + (data_buf[i]^crc); segment_flag = ((data_buf[i+1]^crc)&0xf0)>>4; @@ -100,7 +123,20 @@ int CmdLegicDecode(const char *Cmd) wrp = (data_buf[i+2]^crc); wrc = ((data_buf[i+3]^crc)&0x70)>>4; - PrintAndLog("Segment %02u: raw header=%02x %02x %02x %02x, flag=%01x (valid=%01u, last=%01u), len=%04u, WRP=%02u, WRC=%02u, RD=%01u, CRC=%02x", + /* validate segment-crc */ + segCRC = data_buf[i+4]^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 + segCalcCRC = CRC8Legic(segCrcBytes, 8); + + PrintAndLog("Segment %02u: raw header=%02x %02x %02x %02x, flag=%01x (valid=%01u, last=%01u), len=%04u, WRP=%02u, WRC=%02u, RD=%01u, CRC=%02x (%s)", n, data_buf[i]^crc, data_buf[i+1]^crc, @@ -113,49 +149,50 @@ int CmdLegicDecode(const char *Cmd) wrp, wrc, ((data_buf[i+3]^crc)&0x80)>>7, - (data_buf[i+4]^crc) + segCRC, + ( segCRC == segCalcCRC ) ? "OK" : "fail" ); - i+=5; + i += 5; if ( wrc>0 ) { PrintAndLog("WRC protected area:"); - for ( k=0, j=0; k < wrc && j<(sizeof(out_string)-3); k++, i++, j += 3) { - sprintf(&out_string[j], "%02x", (data_buf[i]^crc)); - out_string[j+2] = ' '; - } - - out_string[j] = '\0'; - - PrintAndLog("%s", out_string); + + for ( k=i; k < wrc; k++) + data_buf[k] ^= crc; + + for ( k=i; k < wrc; k += 8) + PrintAndLog("%s", sprint_hex( data_buf+k, 8) ); + + i += wrc; } if ( wrp>wrc ) { PrintAndLog("Remaining write protected area:"); - for (k=0, j=0; k < (wrp-wrc) && j<(sizeof(out_string)-3); k++, i++, j += 3) { - sprintf(&out_string[j], "%02x", (data_buf[i]^crc)); - out_string[j+2] = ' '; - }; - - out_string[j] = '\0'; - - PrintAndLog("%s", out_string); - if( (wrp-wrc) == 8 ) { - sprintf(out_string, "Card ID: %2X%02X%02X", data_buf[i-4]^crc, data_buf[i-3]^crc, data_buf[i-2]^crc); - PrintAndLog("%s", out_string); + if ( data_buf[k] > 0) { + for (k=i; k < (wrp-wrc); k++) + data_buf[k] ^= crc; } + + for (k=i; k < (wrp-wrc); k++) + PrintAndLog("%s", sprint_hex( data_buf+k, 16) ); + + i += (wrp-wrc); + + if( (wrp-wrc) == 8 ) + PrintAndLog("Card ID: %2X%02X%02X", data_buf[i-4]^crc, data_buf[i-3]^crc, data_buf[i-2]^crc); } PrintAndLog("Remaining segment payload:"); - for ( k=0, j=0; k < (segment_len - wrp - 5) && j<(sizeof(out_string)-3); k++, i++, j += 3) { - sprintf(&out_string[j], "%02x", (data_buf[i]^crc)); - out_string[j+2] = ' '; - }; - - out_string[j] = '\0'; - - PrintAndLog("%s", out_string); + + if ( data_buf[k] > 0 ) { + for ( k=i; k < (segment_len - wrp - 5); k++) + data_buf[k] ^= crc; + } + + for ( k=i; k < (segment_len - wrp - 5); k++) + PrintAndLog("%s", sprint_hex( data_buf+k, 16) ); // end with last segment if (segment_flag & 0x8) return 0; @@ -177,18 +214,13 @@ int CmdLegicRFRead(const char *Cmd) { } int CmdLegicLoad(const char *Cmd) { - char filename[FILE_PATH_SIZE] = {0x00}; - int len = 0; char cmdp = param_getchar(Cmd, 0); - if ( cmdp == 'H' || cmdp == 'h' || cmdp == 0x00) { - PrintAndLog("It loads datasamples from the file `filename` to device memory"); - PrintAndLog("Usage: hf legic load "); - PrintAndLog(" sample: hf legic load filename"); - return 0; - } + if ( cmdp == 'H' || cmdp == 'h' || cmdp == 0x00) return usage_legic_load(); - len = strlen(Cmd); + char filename[FILE_PATH_SIZE] = {0x00}; + int len = strlen(Cmd); + if (len > FILE_PATH_SIZE) { PrintAndLog("Filepath too long (was %s bytes), max allowed is %s ", len, FILE_PATH_SIZE); return 0; @@ -203,28 +235,53 @@ int CmdLegicLoad(const char *Cmd) { char line[80]; int offset = 0; - uint32_t data[8] = {0x00}; - + uint8_t data[USB_CMD_DATA_SIZE] = {0x00}; + int index = 0; + int totalbytes = 0; while ( fgets(line, sizeof(line), f) ) { int res = sscanf(line, "%x %x %x %x %x %x %x %x", - &data[0], &data[1], &data[2], &data[3], - &data[4], &data[5], &data[6], &data[7]); + (unsigned int *)&data[index], + (unsigned int *)&data[index + 1], + (unsigned int *)&data[index + 2], + (unsigned int *)&data[index + 3], + (unsigned int *)&data[index + 4], + (unsigned int *)&data[index + 5], + (unsigned int *)&data[index + 6], + (unsigned int *)&data[index + 7]); if(res != 8) { PrintAndLog("Error: could not read samples"); fclose(f); return -1; } - - UsbCommand c = { CMD_DOWNLOADED_SIM_SAMPLES_125K, {offset, 0, 0}}; - memcpy(c.d.asBytes, data, 8); - clearCommandBuffer(); - SendCommand(&c); - WaitForResponse(CMD_ACK, NULL); - offset += 8; + index += res; + + if ( index == USB_CMD_DATA_SIZE ){ +// PrintAndLog("sent %d | %d | %d", index, offset, totalbytes); + UsbCommand c = { CMD_DOWNLOADED_SIM_SAMPLES_125K, {offset, 0, 0}}; + memcpy(c.d.asBytes, data, sizeof(data)); + clearCommandBuffer(); + SendCommand(&c); + WaitForResponse(CMD_ACK, NULL); + + offset += index; + totalbytes += index; + index = 0; + } } fclose(f); - PrintAndLog("loaded %u samples", offset); + + // left over bytes? + if ( index != 0 ) { + UsbCommand c = { CMD_DOWNLOADED_SIM_SAMPLES_125K, {offset, 0, 0}}; + memcpy(c.d.asBytes, data, 8); + clearCommandBuffer(); + SendCommand(&c); + WaitForResponse(CMD_ACK, NULL); + totalbytes += index; + } + + PrintAndLog("loaded %u samples", totalbytes); return 0; } @@ -263,14 +320,8 @@ int CmdLegicSave(const char *Cmd) { for (int j = 0; j < requested; j += 8) { fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n", - got[j+0], - got[j+1], - got[j+2], - got[j+3], - got[j+4], - got[j+5], - got[j+6], - got[j+7] + got[j+0], got[j+1], got[j+2], got[j+3], + got[j+4], got[j+5], got[j+6], got[j+7] ); delivered += 8; if (delivered >= requested) break; @@ -282,7 +333,7 @@ int CmdLegicSave(const char *Cmd) { } int CmdLegicRfSim(const char *Cmd) { - UsbCommand c= {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}}; + UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}}; sscanf(Cmd, " %"lli" %"lli" %"lli, &c.arg[0], &c.arg[1], &c.arg[2]); clearCommandBuffer(); SendCommand(&c); @@ -325,15 +376,32 @@ int CmdLegicRfFill(const char *Cmd) { return 0; } +int CmdLegicCalcCrc8(const char *Cmd){ + + int len = strlen(Cmd); + if (len & 1 ) return usage_legic_calccrc8(); + + uint8_t *data = malloc(len); + if ( data == NULL ) return 1; + + param_gethex(Cmd, 0, data, len ); + + uint32_t checksum = CRC8Legic(data, len/2); + PrintAndLog("Bytes: %s || CRC8: %X", sprint_hex(data, len/2), checksum ); + free(data); + return 0; +} + 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)"}, - {"reader", CmdLegicRFRead, 0, "[offset [length]] -- read bytes from a LEGIC card"}, - {"save", CmdLegicSave, 0, " [] -- Store samples"}, - {"load", CmdLegicLoad, 0, " -- Restore samples"}, - {"sim", CmdLegicRfSim, 0, "[phase drift [frame drift [req/resp drift]]] Start tag simulator (use after load or read)"}, - {"write", CmdLegicRfWrite,0, " -- Write sample buffer (user after load or read)"}, - {"fill", CmdLegicRfFill, 0, " -- Fill/Write tag with constant value"}, + {"help", CmdHelp, 1, "This help"}, + {"decode", CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"}, + {"read", CmdLegicRFRead, 0, "[offset][length] -- read bytes from a LEGIC card"}, + {"save", CmdLegicSave, 0, " [] -- Store samples"}, + {"load", CmdLegicLoad, 0, " -- Restore samples"}, + {"sim", CmdLegicRfSim, 0, "[phase drift [frame drift [req/resp drift]]] Start tag simulator (use after load or read)"}, + {"write", CmdLegicRfWrite,0, " -- Write sample buffer (user after load or read)"}, + {"fill", CmdLegicRfFill, 0, " -- Fill/Write tag with constant value"}, + {"crc8", CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"}, {NULL, NULL, 0, NULL} };