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 <hexbytes> u <uidcrc> c <crc type>");
PrintAndLog("Options:");
+ PrintAndLog(" h : this help");
PrintAndLog(" b <hexbytes> : hex bytes");
PrintAndLog(" u <uidcrc> : MCC hexbyte");
PrintAndLog(" c <crc type> : 8|16 bit crc size");
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 <file name>");
+ PrintAndLog("Usage: hf legic load [h] <file name>");
+ PrintAndLog("Options:");
+ PrintAndLog(" h : this help");
+ PrintAndLog(" <filename> : 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 <offset> <num of bytes>");
+ PrintAndLog("Usage: hf legic read [h] <offset> <length> <IV>");
PrintAndLog("Options:");
- PrintAndLog(" <offset> : offset in data array to start download from");
- PrintAndLog(" <num of bytes> : number of bytes to download");
+ PrintAndLog(" h : this help");
+ PrintAndLog(" <offset> : offset in data array to start download from");
+ PrintAndLog(" <length> : number of bytes to download");
+ PrintAndLog(" <IV> : (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] <offset> <length> <IV>");
+ PrintAndLog("Options:");
+ PrintAndLog(" h : this help");
+ PrintAndLog(" <offset> : offset in data array to start writing from");
+ PrintAndLog(" <length> : number of bytes to write");
+ PrintAndLog(" <IV> : (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] <address> <value> <IV>");
+ PrintAndLog("Options:");
+ PrintAndLog(" h : this help");
+ PrintAndLog(" <address> : address to write to");
+ PrintAndLog(" <value> : value to write");
+ PrintAndLog(" <IV> : (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;
}
* by Henryk Ploetz and Karsten Nohl at 26c3
*/
int CmdLegicDecode(const char *Cmd) {
- // Index for the bytearray.
- int i = 0;
- int k = 0, segmentNum;
- int segment_len = 0;
- int segment_flag = 0;
+
+ 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;
- int crc = 0;
- int wrp = 0;
- int wrc = 0;
- uint8_t data_buf[1052]; // receiver buffer, should be 1024..
- char token_type[5];
- int dcf;
+ 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;
fl = 1;
stamp_len = 0x0c - (data_buf[5] >> 4);
} else {
- switch (data_buf[5] & 0x7f) {
- case 0x00 ... 0x2f:
- strncpy(token_type, "IAM",sizeof(token_type));
- fl = (0x2f - (data_buf[5] & 0x7f)) + 1;
- break;
- case 0x30 ... 0x6f:
- strncpy(token_type, "SAM",sizeof(token_type));
- fl = (0x6f - (data_buf[5] & 0x7f)) + 1;
- break;
- case 0x70 ... 0x7f:
- strncpy(token_type, "GAM",sizeof(token_type));
- fl = (0x7f - (data_buf[5] & 0x7f)) + 1;
- break;
- }
+ switch (data_buf[5] & 0x7f) {
+ case 0x00 ... 0x2f:
+ strncpy(token_type, "IAM", sizeof(token_type));
+ fl = (0x2f - (data_buf[5] & 0x7f)) + 1;
+ break;
+ case 0x30 ... 0x6f:
+ strncpy(token_type, "SAM", sizeof(token_type));
+ fl = (0x6f - (data_buf[5] & 0x7f)) + 1;
+ break;
+ case 0x70 ... 0x7f:
+ strncpy(token_type, "GAM", sizeof(token_type));
+ fl = (0x7f - (data_buf[5] & 0x7f)) + 1;
+ break;
+ }
- stamp_len = 0xfc - data_buf[6];
+ stamp_len = 0xfc - data_buf[6];
}
PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
dcf,
- data_buf[5],
- data_buf[6],
- token_type,
- (data_buf[5]&0x80)>>7,
+ data_buf[5],
+ data_buf[6],
+ token_type,
+ (data_buf[5] & 0x80 )>> 7,
stamp_len,
fl
- );
+ );
- } else { // Is IM(-S) type of card...
+ } else { // Is IM(-S) type of card...
if(data_buf[7] == 0x9F && data_buf[8] == 0xFF) {
bIsSegmented = 1;
data_buf[5],
data_buf[6],
token_type,
- (data_buf[5]&0x80)>>7
+ (data_buf[5]&0x80) >> 7
);
}
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_buf[7] & 0x0f,
+ (data_buf[7] & 0x70) >> 4,
+ (data_buf[7] & 0x80) >> 7,
+ data_buf[8]
+ );
}
// Header area is only available on IM-S cards, on master tokens this data is the master token data itself
PrintAndLog("Master token data");
PrintAndLog("%s", sprint_hex(data_buf+8, 14));
} else {
- PrintAndLog("Remaining Header Area");
- PrintAndLog("%s", sprint_hex(data_buf+9, 13));
+ PrintAndLog("Remaining Header Area");
+ PrintAndLog("%s", sprint_hex(data_buf+9, 13));
}
}
}
-
- uint8_t segCrcBytes[8] = {0x00};
+ uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};
uint32_t segCalcCRC = 0;
uint32_t segCRC = 0;
-
// Data card?
if(dcf <= 60000) {
- PrintAndLog("\nADF: User Area");
- PrintAndLog("------------------------------------------------------");
+ PrintAndLog("\nADF: User Area");
+ PrintAndLog("------------------------------------------------------");
if(bIsSegmented) {
// Data start point on segmented cards
- i = 22;
+ i = 22;
// 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;
-
- bool hasWRC = (wrc > 0);
- bool hasWRP = (wrp > wrc);
- int wrp_len = (wrp - wrc);
- int remain_seg_payload_len = (segment_len - wrp - 5);
+ 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;
+
+ bool hasWRC = (wrc > 0);
+ bool hasWRP = (wrp > wrc);
+ int wrp_len = (wrp - wrc);
+ 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
-
- segCalcCRC = CRC8Legic(segCrcBytes, 8);
- segCRC = data_buf[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,
- segment_len,
- segment_flag,
- (segment_flag & 0x4) >> 2,
- (segment_flag & 0x8) >> 3,
- wrp,
- wrc,
- ((data_buf[i+3]^crc) & 0x80) >> 7,
- segCRC,
- ( segCRC == segCalcCRC ) ? "OK" : "fail"
- );
-
- i += 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
+
+ segCalcCRC = CRC8Legic(segCrcBytes, 8);
+ segCRC = data_buf[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,
+ segment_len,
+ segment_flag,
+ (segment_flag & 0x4) >> 2,
+ (segment_flag & 0x8) >> 3,
+ wrp,
+ wrc,
+ ((data_buf[i+3]^crc) & 0x80) >> 7,
+ segCRC,
+ ( segCRC == segCalcCRC ) ? "OK" : "fail"
+ );
+
+ i += 5;
- if ( hasWRC ) {
- PrintAndLog("WRC protected area: (I %d | K %d| WRC %d)", i, k, wrc);
- PrintAndLog("\nrow | data");
- PrintAndLog("-----+------------------------------------------------");
+ if ( hasWRC ) {
+ PrintAndLog("WRC protected area: (I %d | K %d| WRC %d)", i, k, wrc);
+ PrintAndLog("\nrow | data");
+ PrintAndLog("-----+------------------------------------------------");
- for ( k=i; k < (i+wrc); ++k)
- data_buf[k] ^= crc;
+ for ( k=i; k < (i + wrc); ++k)
+ data_buf[k] ^= crc;
- print_hex_break( data_buf+i, wrc, 16);
+ print_hex_break( data_buf+i, wrc, 16);
- i += wrc;
- }
+ i += wrc;
+ }
- if ( hasWRP ) {
- PrintAndLog("Remaining write protected area: (I %d | K %d | WRC %d | WRP %d WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
- PrintAndLog("\nrow | data");
- PrintAndLog("-----+------------------------------------------------");
+ if ( hasWRP ) {
+ PrintAndLog("Remaining write protected area: (I %d | K %d | WRC %d | WRP %d WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
+ PrintAndLog("\nrow | data");
+ PrintAndLog("-----+------------------------------------------------");
for (k=i; k < (i+wrp_len); ++k)
- data_buf[k] ^= crc;
+ data_buf[k] ^= crc;
- print_hex_break( data_buf+i, wrp_len, 16);
+ print_hex_break( data_buf+i, wrp_len, 16);
- i += wrp_len;
+ 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);
- }
+ 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("Remaining segment payload: (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
- PrintAndLog("\nrow | data");
- PrintAndLog("-----+------------------------------------------------");
+ PrintAndLog("Remaining segment payload: (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
+ PrintAndLog("\nrow | data");
+ PrintAndLog("-----+------------------------------------------------");
for ( k=i; k < (i+remain_seg_payload_len); ++k)
- data_buf[k] ^= crc;
+ data_buf[k] ^= crc;
- print_hex_break( data_buf+i, remain_seg_payload_len, 16);
+ print_hex_break( data_buf+i, remain_seg_payload_len, 16);
- i += remain_seg_payload_len;
+ i += remain_seg_payload_len;
- PrintAndLog("-----+------------------------------------------------\n");
+ PrintAndLog("-----+------------------------------------------------\n");
- // end with last segment
- if (segment_flag & 0x8) return 0;
+ // end with last segment
+ if (segment_flag & 0x8) return 0;
- } // end for loop
+ } // end for loop
} else {
// Data start point on unsegmented cards
i = 8;
- wrp = data_buf[7] & 0x0F;
- wrc = (data_buf[7] & 0x07) >> 4;
+ wrp = data_buf[7] & 0x0F;
+ wrc = (data_buf[7] & 0x70) >> 4;
bool hasWRC = (wrc > 0);
bool hasWRP = (wrp > wrc);
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_buf + 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...)
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_buf + i, remain_seg_payload_len, 16);
i += remain_seg_payload_len;
PrintAndLog("-----+------------------------------------------------\n");
}
}
-
return 0;
}
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("OK : %d", isOK);
+ PrintAndLog("use 'hf legic decode' or");
+ PrintAndLog("'data hexsamples %d' to view results", len);
+ }
+ } else {
+ PrintAndLog("command execution time out");
+ return 1;
+ }
+
+ //uint8_t got[12000];
+ //GetFromBigBuf(got,sizeof(got),0);
+ //WaitForResponse(CMD_ACK,NULL);
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 :)
char cmdp = param_getchar(Cmd, 0);
if ( cmdp == 'H' || cmdp == 'h' || cmdp == 0x00) return usage_legic_load();
int requested = 1024;
int offset = 0;
int delivered = 0;
- char filename[FILE_PATH_SIZE];
+ char filename[FILE_PATH_SIZE] = {0x00};
uint8_t got[1024] = {0x00};
+ memset(filename, 0, FILE_PATH_SIZE);
+
sscanf(Cmd, " %s %i %i", filename, &requested, &offset);
/* If no length given save entire legic read buffer */
return 0;
}
-//TODO: write a help text (iceman)
int CmdLegicRfWrite(const char *Cmd) {
- UsbCommand c = {CMD_WRITER_LEGIC_RF};
- 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");
+
+ // 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, "%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 !! #############");
PrintAndLog("# changing the DCF is irreversible #");
PrintAndLog("#####################################");
PrintAndLog("do youe really want to continue? y(es) n(o)");
- scanf(" %c", &answer);
- if (answer == 'y' || answer == 'Y') {
+ if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
SendCommand(&c);
return 0;
}
uint8_t cmdp = 0, uidcrc = 0, type=0;
bool errors = false;
int len = 0;
+ int bg, en;
while(param_getchar(Cmd, cmdp) != 0x00) {
switch(param_getchar(Cmd, cmdp)) {
case 'b':
case 'B':
- data = malloc(len);
+ // peek at length of the input string so we can
+ // figure out how many elements to malloc in "data"
+ bg=en=0;
+ if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+ errors = true;
+ break;
+ }
+ len = (en - bg + 1);
+
+ // check that user entered even number of characters
+ // for hex data string
+ if (len & 1) {
+ errors = true;
+ break;
+ }
+
+ // it's possible for user to accidentally enter "b" parameter
+ // more than once - we have to clean previous malloc
+ if (data) free(data);
+ data = malloc(len >> 1);
if ( data == NULL ) {
PrintAndLog("Can't allocate memory. exiting");
errors = true;
break;
- }
- param_gethex_ex(Cmd, cmdp+1, data, &len);
- // if odd symbols, (hexbyte must be two symbols)
- if ( len & 1 ) errors = true;
+ }
+
+ if (param_gethex(Cmd, cmdp+1, data, len)) {
+ errors = true;
+ break;
+ }
len >>= 1;
cmdp += 2;
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] <iv> -- read bytes from a LEGIC card"},
{"save", CmdLegicSave, 0, "<filename> [<length>] -- Store samples"},
{"load", CmdLegicLoad, 0, "<filename> -- Restore samples"},
{"sim", CmdLegicRfSim, 0, "[phase drift [frame drift [req/resp drift]]] Start tag simulator (use after load or read)"},
- {"write", CmdLegicRfWrite,0, "<offset> <length> -- Write sample buffer (user after load or read)"},
- {"writeRaw",CmdLegicRfRawWrite, 0, "<address> <value> -- Write direct to address"},
+ {"write", CmdLegicRfWrite,0, "<offset> <length> <iv> -- Write sample buffer (user after load or read)"},
+ {"writeraw",CmdLegicRfRawWrite, 0, "<address> <value> <iv> -- Write direct to address"},
{"fill", CmdLegicRfFill, 0, "<offset> <length> <value> -- Fill/Write tag with constant value"},
{"crc8", CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"},
{NULL, NULL, 0, NULL}
projects / proxmark3-svn / blobdiff