From ffa306de6159930672f8aabcd16a27b81c2a2f5d Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 26 Aug 2016 17:19:27 +0200 Subject: [PATCH] CHG: starting to add the legic changes.. *work in progress* --- client/cmdhflegic.c | 127 ++++++++++++++++++++++++++++++++++---------- client/cmdhw.c | 1 - 2 files changed, 100 insertions(+), 28 deletions(-) diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index f23f7da0..be9018f6 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"); 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"); + 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"); + 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; } @@ -346,25 +380,28 @@ 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 = 0; + 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; + + IV &= 0x7F; + PrintAndLog("Current IV: 0x%02x", IV); + + UsbCommand c= {CMD_READER_LEGIC_RF, {offset, len, IV}}; clearCommandBuffer(); SendCommand(&c); 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 +542,64 @@ 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 = SESSION_IV; + 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; + + + IV &= 0x7F; + 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 = SESSION_IV; 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(); + + IV &= 0x7F; + 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 !! #############"); @@ -659,12 +732,12 @@ 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"}, {NULL, NULL, 0, NULL} diff --git a/client/cmdhw.c b/client/cmdhw.c index b561c7d4..66a35bbe 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -443,7 +443,6 @@ int CmdStatus(const char *Cmd) return 0; } - int CmdPing(const char *Cmd) { clearCommandBuffer(); -- 2.39.2