From 71cb7328e3f65b7245ab8d38c6f9351d28f46658 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 25 Feb 2016 17:49:48 +0100 Subject: [PATCH] ADD: added some pyramid commands. //not finished. --- client/Makefile | 3 +- client/cmddata.c | 22 +++-- client/cmdlf.c | 2 + client/cmdlfawid.c | 10 +-- client/cmdlfpyramid.c | 187 ++++++++++++++++++++++++++++++++++++++++++ client/cmdlfpyramid.h | 32 ++++++++ 6 files changed, 238 insertions(+), 18 deletions(-) create mode 100644 client/cmdlfpyramid.c create mode 100644 client/cmdlfpyramid.h diff --git a/client/Makefile b/client/Makefile index afb06c87..eabe0d38 100644 --- a/client/Makefile +++ b/client/Makefile @@ -134,7 +134,8 @@ CMDSRCS = nonce2key/crapto1.c\ prng.c\ radixsort.c\ bucketsort.c\ - cmdlfpresco.c + cmdlfpresco.c\ + cmdlfpyramid.c ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED diff --git a/client/cmddata.c b/client/cmddata.c index 2c12e2bb..9b893328 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1410,7 +1410,7 @@ int CmdFSKdemodPyramid(const char *Cmd) // s = format start bit, o = odd parity of last 7 bits // f = facility code, c = card number // w = wiegand parity, x = extra space for other formats - // p = unknown checksum + // p = CRC8maxim checksum // (26 bit format shown) //get bytes for checksum calc @@ -1457,38 +1457,36 @@ int CmdFSKdemodPyramid(const char *Cmd) // s = format start bit, o = odd parity of last 7 bits // f = facility code, c = card number // w = wiegand parity, x = extra space for other formats - // p = unknown checksum + // p = CRC8-Maxim checksum // (26 bit format shown) //find start bit to get fmtLen int j; - for (j=0; j32){ - //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32); - //code2 = bytebits_to_byte(BitStream+(size-32),32); + if (fmtLen > 32) PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); - } else{ - //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen); + else PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); - } } if (checksum == checkCS) PrintAndLog("Checksum %02x passed", checksum); diff --git a/client/cmdlf.c b/client/cmdlf.c index 8166f525..8363d253 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -32,6 +32,7 @@ #include "lfdemod.h" #include "cmdlfviking.h" #include "cmdlfpresco.h" +#include "cmdlfpyramid.h" static int CmdHelp(const char *Cmd); int usage_lf_cmdread(void) { @@ -1217,6 +1218,7 @@ static command_t CommandTable[] = {"io", CmdLFIO, 1, "{ IOPROX RFIDs... }"}, {"pcf7931", CmdLFPCF7931, 1, "{ PCF7931 RFIDs... }"}, {"presco", CmdLFPresco, 1, "{ Presco RFIDs... }"}, + {"pyramid", CmdLFPyramid, 1, "{ Farepointe/Pyramid RFIDs... }"}, {"ti", CmdLFTI, 1, "{ TI RFIDs... }"}, {"t55xx", CmdLFT55XX, 1, "{ T55xx RFIDs... }"}, {"viking", CmdLFViking, 1, "{ Viking RFIDs... }"}, diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index d98dee4f..6349fec7 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -44,8 +44,8 @@ int usage_lf_awid_sim(void) { PrintAndLog(""); PrintAndLog("Usage: lf awid sim "); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); - PrintAndLog(" : 16-bit value AWID card number"); + PrintAndLog(" : 8-bit value facility code"); + PrintAndLog(" : 16-bit value card number"); PrintAndLog(""); PrintAndLog("Sample : lf awid sim 224 1337"); return 0; @@ -58,8 +58,8 @@ int usage_lf_awid_clone(void) { PrintAndLog(""); PrintAndLog("Usage: lf awid clone "); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); - PrintAndLog(" : 16-bit value AWID card number"); + PrintAndLog(" : 8-bit value facility code"); + PrintAndLog(" : 16-bit value card number"); PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); PrintAndLog(""); PrintAndLog("Sample : lf awid clone 224 1337"); @@ -73,7 +73,7 @@ int usage_lf_awid_brute(void){ PrintAndLog(""); PrintAndLog("Usage: lf awid brute "); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); + PrintAndLog(" : 8-bit value facility code"); PrintAndLog(""); PrintAndLog("Sample : lf awid brute 224"); return 0; diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c new file mode 100644 index 00000000..23c44059 --- /dev/null +++ b/client/cmdlfpyramid.c @@ -0,0 +1,187 @@ +//----------------------------------------------------------------------------- +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// Low frequency Farpoint / Pyramid tag commands +//----------------------------------------------------------------------------- +#include +#include +#include "cmdlfpyramid.h" +static int CmdHelp(const char *Cmd); + +int usage_lf_pyramid_clone(void){ + PrintAndLog("clone a Farepointe/Pyramid tag to a T55x7 tag."); + PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); + PrintAndLog(""); + PrintAndLog("Usage: lf pyramid clone "); + PrintAndLog("Options :"); + PrintAndLog(" : 8-bit value facility code"); + PrintAndLog(" : 16-bit value card number"); + PrintAndLog(""); + PrintAndLog("Sample : lf pyramid clone 123 11223"); + return 0; +} + +int usage_lf_pyramid_sim(void) { + PrintAndLog("Enables simulation of Farepointe/Pyramid card with specified card number."); + PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); + PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); + PrintAndLog(""); + PrintAndLog("Usage: lf pyramid sim "); + PrintAndLog("Options :"); + PrintAndLog(" : 8-bit value facility code"); + PrintAndLog(" : 16-bit value card number"); + PrintAndLog(""); + PrintAndLog("Sample : lf pyramid sim 123 11223"); + return 0; +} + +// calc checksum +int GetWiegandFromPyramid(const char *id, uint32_t *fc, uint32_t *cn) { + return 0; +} + +int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) { + + uint8_t pre[128]; + memset(pre, 0x00, sizeof(pre)); + + // add preamble + pyramidBits[7]=1; + num_to_bytebits(26, 8, pre); + + // get wiegand + uint8_t wiegand[24]; + num_to_bytebits(fc, 8, wiegand); + num_to_bytebits(cn, 16, wiegand+8); + + // add wiegand parity bits + wiegand_add_parity(pre+8, wiegand, 24); + + // add paritybits + addParity(pre, pyramidBits+8, 66, 4, 1); + + // add checksum + // this is wrong. + uint32_t crc = CRC8Maxim(wiegand, 13); + num_to_bytebits(crc, 8, pre+120); + + return 1; +} + +int CmdPyramidRead(const char *Cmd) { + // read lf silently + CmdLFRead("s"); + // get samples silently + getSamples("30000",false); + // demod and output Pyramid ID + return CmdFSKdemodPyramid(""); +} + +int CmdPyramidClone(const char *Cmd) { + + char cmdp = param_getchar(Cmd, 0); + if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone(); + + uint32_t facilitycode=0, cardnumber=0; + uint8_t bits[128]; + uint8_t *bs = bits; + memset(bs,0,sizeof(bits)); + //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks + uint32_t blocks[5] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<> 32),(uint32_t) (rawID & 0xFFFFFFFF)); + + // UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}}; + // num_to_bytebits(rawID, size, c.d.asBytes); + // clearCommandBuffer(); + // SendCommand(&c); + return 0; +} + +static command_t CommandTable[] = { + {"help", CmdHelp, 1, "This help"}, + {"read", CmdPyramidRead, 0, "Attempt to read and extract tag data"}, + {"clone", CmdPyramidClone, 0, " clone pyramid tag"}, + {"sim", CmdPyramidSim, 0, " simulate pyramid tag"}, + {NULL, NULL, 0, NULL} +}; + +int CmdLFPyramid(const char *Cmd) { + clearCommandBuffer(); + CmdsParse(CommandTable, Cmd); + return 0; +} + +int CmdHelp(const char *Cmd) { + CmdsHelp(CommandTable); + return 0; +} diff --git a/client/cmdlfpyramid.h b/client/cmdlfpyramid.h new file mode 100644 index 00000000..75d3fe69 --- /dev/null +++ b/client/cmdlfpyramid.h @@ -0,0 +1,32 @@ +//----------------------------------------------------------------------------- +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// Low frequency T55xx commands +//----------------------------------------------------------------------------- +#ifndef CMDLFPYRAMID_H__ +#define CMDLFPYRAMID_H__ +#include "proxmark3.h" +#include "ui.h" +#include "util.h" +#include "graph.h" +#include "cmdparser.h" +#include "cmddata.h" +#include "cmdmain.h" +#include "cmdlf.h" +#include "protocols.h" // for T55xx config register definitions +#include "lfdemod.h" // parityTest +#include "crc.h" + +int CmdLFPyramid(const char *Cmd); +int CmdPyramidClone(const char *Cmd); +int CmdPyramidSim(const char *Cmd); + +int usage_lf_pyramid_clone(void); +int usage_lf_pyramid_sim(void); + +int GetWiegandFromPyramid(const char *id, uint32_t *sitecode, uint32_t *usercode); +#endif + -- 2.39.5