dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove spurious spaces & tabs at end of lines

Browse Source
This commit is contained in:
Philippe Teuwen
2019-03-09 08:59:13 +01:00
parent edc19f202a
commit 60f292b18e
249 changed files with 8481 additions and 8481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
client/cmdlfio.c
View File

@@ -34,7 +34,7 @@ int usage_lf_io_sim(void) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Usage: lf io sim [h] <version> <facility-code> <card-number>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h : This help");
PrintAndLogEx(NORMAL, " h : This help");
PrintAndLogEx(NORMAL, " <version> : 8bit version");
PrintAndLogEx(NORMAL, " <facility-code> : 8bit value facility code");
PrintAndLogEx(NORMAL, " <card number> : 16bit value card number");
@@ -50,7 +50,7 @@ int usage_lf_io_clone(void) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Usage: lf io clone [h] <version> <facility-code> <card-number> [Q5]");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h : This help");
PrintAndLogEx(NORMAL, " h : This help");
PrintAndLogEx(NORMAL, " <version> : 8bit version");
PrintAndLogEx(NORMAL, " <facility-code> : 8bit value facility code");
PrintAndLogEx(NORMAL, " <card number> : 16bit value card number");
@@ -88,18 +88,18 @@ int CmdIOProxDemod(const char *Cmd) {
if (size < 65) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
return 0;
}
//get binary from fsk wave
}
//get binary from fsk wave
int waveIdx = 0;
idx = detectIOProx(bits, &size, &waveIdx);
if (idx < 0) {
if (g_debugMode) {
if (idx == -1) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");
} else if (idx == -2) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox just noise detected");
} else if (idx == -3) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");
} else if (idx == -4) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox preamble not found");
} else if (idx == -5) {
@@ -114,15 +114,15 @@ int CmdIOProxDemod(const char *Cmd) {
}
setDemodBuf(bits, size, idx);
setClockGrid(64, waveIdx + (idx*64));
if (idx == 0) {
if (g_debugMode) {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
}
}
return retval;
}
//Index map
//0 10 20 30 40 50 60
//| | | | | | |
@@ -131,7 +131,7 @@ int CmdIOProxDemod(const char *Cmd) {
//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
//
//XSF(version)facility:codeone+codetwo (raw)
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
@@ -139,7 +139,7 @@ int CmdIOProxDemod(const char *Cmd) {
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
uint32_t code = bytebits_to_byte(bits+idx,32);
uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
uint8_t version = bytebits_to_byte(bits+idx+27,8); //14,4
@@ -156,13 +156,13 @@ int CmdIOProxDemod(const char *Cmd) {
char crcStr[30];
memset(crcStr, 0x00, sizeof(crcStr) );
if (crc == calccrc) {
snprintf(crcStr, 3, "ok");
retval = 1;
} else {
PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
retval = 0;
}
@@ -172,7 +172,7 @@ int CmdIOProxDemod(const char *Cmd) {
if (g_debugMode){
PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
printDemodBuff();
}
}
return retval;
}
@@ -184,7 +184,7 @@ int CmdIOProxDemod(const char *Cmd) {
//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
//XSF(version)facility:codeone+codetwo (raw)
int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
#define SEPARATOR 1
#define SEPARATOR 1
uint8_t pos=0;
// the return bits, preamble 0000 0000 0
uint8_t pre[64];
@@ -192,31 +192,31 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
// skip 9 zeros as preamble
pos = 9;
// another fixed byte 11110000 = 0xF0
num_to_bytebits(0xF0, 8, pre+pos);
pos += 8;
pre[pos] = SEPARATOR;
pos++;
pos++;
// add facilitycode
num_to_bytebits(fc, 8, pre+pos);
pos += 8;
pre[pos] = SEPARATOR;
pos++;
// add version
num_to_bytebits(version, 8, pre+pos);
pos += 8;
pre[pos] = SEPARATOR;
pos++;
// cardnumber high byte
num_to_bytebits( ((cn & 0xFF00)>>8), 8, pre+pos);
pos += 8;
pre[pos] = SEPARATOR;
pos++;
// cardnumber low byte
num_to_bytebits( (cn & 0xFF), 8, pre+pos);
pos += 8;
@@ -227,18 +227,18 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
uint16_t crc = 0;
for (uint8_t i=1; i<6; ++i)
crc += bytebits_to_byte(pre+9*i, 8);
crc &= 0xFF;
crc = 0xff - crc;
num_to_bytebits(crc, 8, pre+pos);
pos += 8;
// Final two ONES
pre[pos] = SEPARATOR;
pre[++pos] = SEPARATOR;
memcpy(bits, pre, sizeof(pre));
PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
return 1;
}
@@ -249,30 +249,30 @@ int CmdIOProxSim(const char *Cmd) {
uint8_t bits[64];
size_t size = sizeof(bits);
memset(bits, 0x00, size);
char cmdp = tolower(param_getchar(Cmd, 0));
if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
version = param_get8(Cmd, 0);
fc = param_get8(Cmd, 1);
cn = param_get32ex(Cmd, 2, 0, 10);
if ( !version | !fc || !cn) return usage_lf_io_sim();
if ((cn & 0xFFFF) != cn) {
cn &= 0xFFFF;
PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
}
// clock 64, FSK2a fcHIGH 10 | fcLOW 8
uint8_t clk = 64, invert = 1, high = 10, low = 8;
uint16_t arg1, arg2;
uint16_t arg1, arg2;
arg1 = high << 8 | low;
arg2 = invert << 8 | clk;
PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
if ( !getIOProxBits(version, fc, cn, bits)) {
PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
return 1;
@@ -281,7 +281,7 @@ int CmdIOProxSim(const char *Cmd) {
// arg1 --- fcHigh<<8 + fcLow
// arg2 --- Invert and clk setting
// size --- 64 bits == 8 bytes
UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
memcpy(c.d.asBytes, bits, size);
clearCommandBuffer();
SendCommand(&c);
@@ -289,13 +289,13 @@ int CmdIOProxSim(const char *Cmd) {
}
int CmdIOProxClone(const char *Cmd) {
uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
uint16_t cn = 0;
uint8_t version = 0, fc = 0;
uint8_t bits[64];
memset(bits,0,sizeof(bits));
char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
@@ -304,17 +304,17 @@ int CmdIOProxClone(const char *Cmd) {
cn = param_get32ex(Cmd, 2, 0, 10);
if ( !version | !fc || !cn) return usage_lf_io_clone();
if ((cn & 0xFFFF) != cn) {
cn &= 0xFFFF;
PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
}
if ( !getIOProxBits(version, fc, cn, bits)) {
PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
return 1;
}
if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
@@ -323,7 +323,7 @@ int CmdIOProxClone(const char *Cmd) {
PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
print_blocks(blocks, 3);
//UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1],blocks[2],0}};
clearCommandBuffer();
@@ -343,7 +343,7 @@ static command_t CommandTable[] = {
int CmdLFIO(const char *Cmd){
clearCommandBuffer();
CmdsParse(CommandTable, Cmd);
return 0;
return 0;
}
int CmdHelp(const char *Cmd) {