X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/26778ea7725b871c56b91a5f0d1144d3397320f8..4490a4769074e6b5a91f9da1bee2296ac2b42f5f:/client/cmdhflegic.c diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index f23f7da0..2cfb286e 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -11,11 +11,15 @@ static int CmdHelp(const char *Cmd); +#define SESSION_IV 0x55 +#define MAX_LENGTH 1024 + int usage_legic_calccrc8(void){ PrintAndLog("Calculates the legic crc8/crc16 on the input hexbytes."); PrintAndLog("There must be an even number of hexsymbols as input."); PrintAndLog("Usage: hf legic crc8 [h] b u c "); PrintAndLog("Options:"); + PrintAndLog(" h : this help"); PrintAndLog(" b : hex bytes"); PrintAndLog(" u : MCC hexbyte"); PrintAndLog(" c : 8|16 bit crc size"); @@ -25,35 +29,65 @@ int usage_legic_calccrc8(void){ PrintAndLog(" hf legic crc8 b deadbeef1122 u 9A c 16"); return 0; } - int usage_legic_load(void){ PrintAndLog("It loads datasamples from the file `filename` to device memory"); - PrintAndLog("Usage: hf legic load "); + PrintAndLog("Usage: hf legic load [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : this help"); + PrintAndLog(" : Name of file to load"); PrintAndLog(""); PrintAndLog("Samples:"); PrintAndLog(" hf legic load filename"); return 0; } - int usage_legic_read(void){ PrintAndLog("Read data from a legic tag."); - PrintAndLog("Usage: hf legic read "); + PrintAndLog("Usage: hf legic read [h] "); PrintAndLog("Options:"); - PrintAndLog(" : offset in data array to start download from"); - PrintAndLog(" : number of bytes to download"); + 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(""); PrintAndLog("Samples:"); PrintAndLog(" hf legic read"); + PrintAndLog(" hf legic read 10 4"); return 0; } - int usage_legic_sim(void){ + PrintAndLog("Missing help text."); + return 0; +} +int usage_legic_write(void){ + PrintAndLog(" Write sample buffer to a legic tag. (use after load or read)"); + 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(" : (optional) Initialization vector to use (ODD and 7bits)"); + PrintAndLog(""); + PrintAndLog("Samples:"); + PrintAndLog(" hf legic write"); + PrintAndLog(" hf legic write 10 4"); 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("Options:"); + PrintAndLog(" h : this help"); + PrintAndLog("
: address to write to"); + PrintAndLog(" : value to write"); + PrintAndLog(" : (optional) Initialization vector to use (ODD and 7bits)"); + PrintAndLog(""); + PrintAndLog("Samples:"); + PrintAndLog(" hf legic writeraw"); + PrintAndLog(" hf legic writeraw 10 4"); return 0; } int usage_legic_fill(void){ + PrintAndLog("Missing help text."); return 0; } @@ -67,13 +101,13 @@ 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[1052]; // receiver buffer + uint8_t data_buf[1024]; // receiver buffer char token_type[5] = {0,0,0,0,0}; int dcf = 0; int bIsSegmented = 0; - // download EML memory, where the "legic read" command puts the data. - GetEMLFromBigBuf(data_buf, sizeof(data_buf), 0); + // copy data from proxmark into buffer + GetFromBigBuf(data_buf,sizeof(data_buf),0); if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){ PrintAndLog("Command execute timeout"); return 1; @@ -346,25 +380,59 @@ int CmdLegicDecode(const char *Cmd) { } int CmdLegicRFRead(const char *Cmd) { - + // params: // offset in data // number of bytes. char cmdp = param_getchar(Cmd, 0); if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_read(); - int byte_count = 0, offset = 0; - sscanf(Cmd, "%i %i", &offset, &byte_count); - if(byte_count == 0) byte_count = -1; - if(byte_count + offset > 1024) byte_count = 1024 - offset; + uint32_t offset = 0, len = 0, IV = 1; + sscanf(Cmd, "%x %x %x", &offset, &len, &IV); - UsbCommand c= {CMD_READER_LEGIC_RF, {offset, byte_count, 0}}; + // OUT-OF-BOUNDS check + if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset; + + if ( (IV & 0x7F) != IV ){ + IV &= 0x7F; + PrintAndLog("Truncating IV to 7bits"); + } + if ( (IV & 1) == 0 ){ + IV |= 0x01; // IV must be odd + 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)) { + uint8_t isOK = resp.arg[0] & 0xFF; + uint16_t len = resp.arg[1] & 0x3FF; + if ( isOK ) { + PrintAndLog("use 'hf legic decode'"); + } + uint8_t *data = resp.d.asBytes; + PrintAndLog("\nData |"); + PrintAndLog("-----------------------------"); + PrintAndLog(" %s|\n", sprint_hex(data, len)); + // } + } else { + PrintAndLog("command execution time out"); + return 1; + } return 0; } - int CmdLegicLoad(const char *Cmd) { // iceman: potential bug, where all filepaths or filename which starts with H or h will print the helptext :) @@ -505,28 +573,78 @@ int CmdLegicRfSim(const char *Cmd) { return 0; } -//TODO: write a help text (iceman) int CmdLegicRfWrite(const char *Cmd) { + + // params: + // offset - in tag memory + // length - num of bytes to be written + // IV - initialisation vector + + char cmdp = param_getchar(Cmd, 0); + if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_write(); + + uint32_t offset = 0, len = 0, IV = 0; + UsbCommand c = {CMD_WRITER_LEGIC_RF, {0,0,0}}; - int res = sscanf(Cmd, " 0x%"llx" 0x%"llx, &c.arg[0], &c.arg[1]); - if(res != 2) { - PrintAndLog("Please specify the offset and length as two hex strings"); + 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"); return -1; } + + // OUT-OF-BOUNDS check + if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset; + + if ( (IV & 0x7F) != IV ){ + IV &= 0x7F; + PrintAndLog("Truncating IV to 7bits"); + } + if ( (IV & 1) == 0 ){ + IV |= 0x01; // IV must be odd + 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; + clearCommandBuffer(); SendCommand(&c); return 0; } -//TODO: write a help text (iceman) 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; char answer; + UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {0,0,0} }; - int res = sscanf(Cmd, " 0x%"llx" 0x%"llx, &c.arg[0], &c.arg[1]); - if(res != 2) { - PrintAndLog("Please specify the offset and value as two hex strings"); - return -1; - } + int res = sscanf(Cmd, "%x %x %x", &address, &data, &IV); + if(res < 2) + return usage_legic_rawwrite(); + + // OUT-OF-BOUNDS check + if(address > MAX_LENGTH) + return usage_legic_rawwrite(); + + if ( (IV & 0x7F) != IV ){ + IV &= 0x7F; + PrintAndLog("Truncating IV to 7bits"); + } + if ( (IV & 1) == 0 ){ + 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; if (c.arg[0] == 0x05 || c.arg[0] == 0x06) { PrintAndLog("############# DANGER !! #############"); @@ -570,6 +688,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), 4 ) ; + + 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), 4 ) ; +} + int CmdLegicCalcCrc8(const char *Cmd){ uint8_t *data = NULL; @@ -645,10 +794,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; } @@ -659,14 +811,15 @@ int CmdLegicCalcCrc8(const char *Cmd){ 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)"}, - {"read", CmdLegicRFRead, 0, "[offset][length] -- read bytes from a LEGIC card"}, + {"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)"}, - {"writeRaw",CmdLegicRfRawWrite, 0, "
-- Write direct to address"}, + {"write", CmdLegicRfWrite,0, " -- Write sample buffer (user after load or read)"}, + {"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", CmdLegicCalcCrc8, 1, "Information"}, {NULL, NULL, 0, NULL} };