From 07291f87d8c6cfa3a7179776937df9eadc20f04d Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 28 Feb 2016 23:28:38 +0100 Subject: [PATCH] ADD: finished of the "LF GUARD SIM" command. needs testing. --- client/cmdlf.c | 170 ++++++++++++++++++++++---------------------- client/cmdlfguard.c | 38 +++++----- 2 files changed, 102 insertions(+), 106 deletions(-) diff --git a/client/cmdlf.c b/client/cmdlf.c index 0f5d0dc0..09a97205 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -743,94 +743,94 @@ int CmdLFfskSim(const char *Cmd) // - allow pull data from DemodBuffer int CmdLFaskSim(const char *Cmd) { - //autodetect clock from Graphbuffer if using demod buffer + //autodetect clock from Graphbuffer if using demod buffer // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream - uint8_t encoding = 1, separator = 0; - uint8_t clk=0, invert=0; - bool errors = FALSE; - char hexData[32] = {0x00}; - uint8_t data[255]= {0x00}; // store entered hex data - int dataLen = 0; - uint8_t cmdp = 0; - while(param_getchar(Cmd, cmdp) != 0x00) - { - switch(param_getchar(Cmd, cmdp)) - { - case 'h': - return usage_lf_simask(); - case 'i': - invert = 1; - cmdp++; - break; - case 'c': - errors |= param_getdec(Cmd,cmdp+1,&clk); - cmdp+=2; - break; - case 'b': - encoding=2; //biphase - cmdp++; - break; - case 'm': - encoding=1; - cmdp++; - break; - case 'r': - encoding=0; - cmdp++; - break; - case 's': - separator=1; - cmdp++; - break; - case 'd': - dataLen = param_getstr(Cmd, cmdp+1, hexData); - if (dataLen==0) { - errors=TRUE; - } else { - dataLen = hextobinarray((char *)data, hexData); - } - if (dataLen==0) errors=TRUE; - if (errors) PrintAndLog ("Error getting hex data, datalen: %d",dataLen); - cmdp+=2; - break; - default: - PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); - errors = TRUE; - break; - } - if(errors) break; - } - if(cmdp == 0 && DemodBufferLen == 0) - { - errors = TRUE;// No args - } + uint8_t encoding = 1, separator = 0, clk=0, invert=0; + bool errors = FALSE; + char hexData[32] = {0x00}; + uint8_t data[255]= {0x00}; // store entered hex data + int dataLen = 0; + uint8_t cmdp = 0; + + while(param_getchar(Cmd, cmdp) != 0x00) { + switch(param_getchar(Cmd, cmdp)) { + case 'h': return usage_lf_simask(); + case 'i': + invert = 1; + cmdp++; + break; + case 'c': + errors |= param_getdec(Cmd,cmdp+1,&clk); + cmdp+=2; + break; + case 'b': + encoding=2; //biphase + cmdp++; + break; + case 'm': + encoding=1; + cmdp++; + break; + case 'r': + encoding=0; + cmdp++; + break; + case 's': + separator=1; + cmdp++; + break; + case 'd': + dataLen = param_getstr(Cmd, cmdp+1, hexData); + if (dataLen==0) + errors = TRUE; + else + dataLen = hextobinarray((char *)data, hexData); + + if (dataLen==0) errors = TRUE; + if (errors) PrintAndLog ("Error getting hex data, datalen: %d", dataLen); + cmdp+=2; + break; + default: + PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + errors = TRUE; + break; + } + if(errors) break; + } + + if(cmdp == 0 && DemodBufferLen == 0) + errors = TRUE;// No args - //Validations - if(errors) - { - return usage_lf_simask(); - } - if (dataLen == 0){ //using DemodBuffer - if (clk == 0) clk = GetAskClock("0", false, false); - } else { - setDemodBuf(data, dataLen, 0); - } - if (clk == 0) clk = 64; - if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed - uint16_t arg1, arg2; - size_t size=DemodBufferLen; - arg1 = clk << 8 | encoding; - arg2 = invert << 8 | separator; - if (size > USB_CMD_DATA_SIZE) { - PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE); - size = USB_CMD_DATA_SIZE; - } - UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; - PrintAndLog("preparing to sim ask data: %d bits", size); - memcpy(c.d.asBytes, DemodBuffer, size); + //Validations + if(errors) return usage_lf_simask(); + + if (dataLen == 0){ //using DemodBuffer + if (clk == 0) + clk = GetAskClock("0", false, false); + } else { + setDemodBuf(data, dataLen, 0); + } + if (clk == 0) clk = 64; + if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed + + size_t size = DemodBufferLen; + + if (size > USB_CMD_DATA_SIZE) { + PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE); + size = USB_CMD_DATA_SIZE; + } + + PrintAndLog("preparing to sim ask data: %d bits", size); + + uint16_t arg1, arg2; + arg1 = clk << 8 | encoding; + arg2 = invert << 8 | separator; + + UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; + memcpy(c.d.asBytes, DemodBuffer, size); clearCommandBuffer(); - SendCommand(&c); - return 0; + SendCommand(&c); + return 0; } // by marshmellow - sim psk data given carrier, clock, invert diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c index 828bdb68..05975eea 100644 --- a/client/cmdlfguard.c +++ b/client/cmdlfguard.c @@ -91,12 +91,6 @@ int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) { if (g_debugMode) printf(" WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes))); - // NIBBLE_SWAP (works on all data) - // for (i = 0; i < 12; ++i) - // rawbytes[i] = SWAP_NIBBLE( rawbytes[i] ); - - // printf("SWAP | %s\n", sprint_hex(rawbytes, sizeof(rawbytes))); - // XOR (only works on wiegand stuff) for (i = 1; i < 12; ++i) rawbytes[i] ^= xorKey ; @@ -111,7 +105,7 @@ int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) { if (g_debugMode) printf(" Raw | %s\n", sprint_bin(pre, 64) ); // add spacer bit 0 every 4 bits, starting with index 0, - // 12 bytes, 24 nibbles. 24+1 extra bites. 3bytes. Ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand) + // 12 bytes, 24 nibbles. 24+1 extra bites. 3bytes. ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand) addParity(pre, guardBits+6, 64, 5, 3); // preamble @@ -121,10 +115,6 @@ int GetGuardBits(uint32_t fc, uint32_t cn, uint8_t *guardBits) { guardBits[3] = 1; guardBits[4] = 1; guardBits[5] = 0; -/* 6 B -PRE | 0110 1101 0101 1110 0001 1101 1101 0111 1101011011010110110101101101011 -FIN | 111110 0 0110 0 1101 0 0101 0 1110 0 0001 0 1101 0 1101 0 0111 0 110100110011010011001101001100110100110000000000 -*/ if (g_debugMode) printf(" FIN | %s\n", sprint_bin(guardBits, 96) ); return 1; @@ -194,16 +184,11 @@ int CmdGuardSim(const char *Cmd) { if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim(); uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0; + uint8_t clock = 64, encoding = 2, separator = 0, invert = 0; uint8_t bs[96]; - size_t size = sizeof(bs); - memset(bs, 0x00, size); + memset(bs, 0x00, sizeof(bs)); - // Pyramid uses: ASK Biphase, clk: 32, invert: 0 - uint64_t arg1, arg2; - arg1 = (10 << 8) + 8; - arg2 = 32 | 0; - if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_guard_sim(); facilitycode = (fc & 0x000000FF); @@ -215,9 +200,20 @@ int CmdGuardSim(const char *Cmd) { } PrintAndLog("Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber ); - + + // Guard uses: clk: 64, invert: 0, encoding: 2 (ASK Biphase) + uint64_t arg1, arg2; + arg1 = (clock << 8) | encoding; + arg2 = (invert << 8) | separator; + + uint8_t rawbytes[12]; + size_t size = sizeof(rawbytes); + for (uint8_t i=0; i < size; ++i){ + rawbytes[i] = bytebits_to_byte( bs + (i*8), 8); + } + UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; - memcpy(c.d.asBytes, bs, size); + memcpy(c.d.asBytes, rawbytes, size ); clearCommandBuffer(); SendCommand(&c); return 0; @@ -227,7 +223,7 @@ static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"read", CmdGuardRead, 0, "Attempt to read and extract tag data"}, {"clone", CmdGuardClone, 0, " clone Guardall tag"}, -// {"sim", CmdGuardSim, 0, " simulate Guardall tag"}, + {"sim", CmdGuardSim, 0, " simulate Guardall tag"}, {NULL, NULL, 0, NULL} }; -- 2.39.2