X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6923d3f14ff7c6439d708470f4da2edcc3eca854..refs/pull/538/head:/client/cmdlfpresco.c?ds=inline diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c index 20b42bc1..2f4bacfe 100644 --- a/client/cmdlfpresco.c +++ b/client/cmdlfpresco.c @@ -5,20 +5,34 @@ // the license. //----------------------------------------------------------------------------- // Low frequency Presco tag commands +// ASK/Manchester, rf/32, 128 bits (complete) //----------------------------------------------------------------------------- #include #include +#include #include "cmdlfpresco.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 + static int CmdHelp(const char *Cmd); int usage_lf_presco_clone(void){ PrintAndLog("clone a Presco tag to a T55x7 tag."); - PrintAndLog("Usage: lf presco clone "); + PrintAndLog("Usage: lf presco clone d H "); PrintAndLog("Options :"); - PrintAndLog(" : 9 digit presco card number"); - //PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); + PrintAndLog(" d : 9 digit presco card ID"); + PrintAndLog(" H : 8 digit hex card number"); + PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); PrintAndLog(""); - PrintAndLog("Sample : lf presco clone 123456789"); + PrintAndLog("Sample : lf presco clone d 123456789"); return 0; } @@ -27,53 +41,88 @@ int usage_lf_presco_sim(void) { PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); PrintAndLog("Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated."); PrintAndLog(""); - PrintAndLog("Usage: lf presco sim "); + PrintAndLog("Usage: lf presco sim d or H "); PrintAndLog("Options :"); - PrintAndLog(" : 9 digit presco card number"); + PrintAndLog(" d : 9 digit presco card number"); + PrintAndLog(" H : 8 digit hex card number"); PrintAndLog(""); - PrintAndLog("Sample : lf presco sim 123456789"); + PrintAndLog("Sample : lf presco sim d 123456789"); return 0; } -// calc checksum -int GetWiegandFromPresco(const char *id, uint32_t *sitecode, uint32_t *usercode) { - +// convert base 12 ID to sitecode & usercode & 8 bit other unknown code +int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) { + uint8_t val = 0; - for (int index =0; index < strlen(id); ++index) { - - // Get value from number string. - if ( id[index] == '*' ) val = 10; - if ( id[index] == '#') val = 11; - if ( id[index] >= 0x30 && id[index] <= 0x39 ) - val = id[index] - 0x30; - - *sitecode += val; - - // last digit is only added, not multipled. - if ( index < strlen(id)-1 ) - *sitecode *= 12; + bool hex = false, errors = false; + uint8_t cmdp = 0; + char id[11]; + int stringlen = 0; + while(param_getchar(Cmd, cmdp) != 0x00) { + switch(param_getchar(Cmd, cmdp)) { + case 'h': + return -1; + case 'H': + hex = true; + //get hex + *fullcode = param_get32ex(Cmd, cmdp+1, 0, 10); + cmdp+=2; + break; + case 'D': + case 'd': + //param get string int param_getstr(const char *line, int paramnum, char * str) + stringlen = param_getstr(Cmd, cmdp+1, id, sizeof(id)); + if (stringlen < 2) return -1; + cmdp+=2; + break; + case 'Q': + case 'q': + *Q5 = true; + cmdp++; + break; + default: + PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + errors = 1; + break; + } + if(errors) break; } - *usercode = *sitecode % 65536; - *sitecode /= 16777216; - return 0; -} + // No args + if(cmdp == 0) errors = 1; -int GetPrescoBits(uint32_t sitecode, uint32_t usercode, uint8_t *prescoBits) { - uint8_t pre[66]; - memset(pre, 0, sizeof(pre)); - prescoBits[7]=1; - num_to_bytebits(26, 8, pre); + //Validations + if(errors || (stringlen == 0 && !hex) ) return -1; - uint8_t wiegand[24]; - num_to_bytebits(sitecode, 8, wiegand); - num_to_bytebits(usercode, 16, wiegand+8); + if (!hex) { + for (int index =0; index < strlen(id); ++index) { + // Get value from number string. + if ( id[index] == '*' ) val = 10; + if ( id[index] == '#') val = 11; + if ( id[index] >= 0x30 && id[index] <= 0x39 ) + val = id[index] - 0x30; + + *fullcode += val; + + // last digit is only added, not multipled. + if ( index < strlen(id)-1 ) + *fullcode *= 12; + } + } - wiegand_add_parity(pre+8, wiegand, 24); - size_t bitLen = addParity(pre, prescoBits+8, 66, 4, 1); + *usercode = *fullcode & 0x0000FFFF; //% 65566 + *sitecode = (*fullcode >> 24) & 0x000000FF; // /= 16777216; + return 0; +} - if (bitLen != 88) return 0; +// calc not certain - intended to get bitstream for programming / sim +int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) { + num_to_bytebits(0x10D00000, 32, prescoBits); + num_to_bytebits(0x00000000, 32, prescoBits+32); + num_to_bytebits(0x00000000, 32, prescoBits+64); + num_to_bytebits(fullcode , 32, prescoBits+96); return 1; } + //see ASKDemod for what args are accepted int CmdPrescoDemod(const char *Cmd) { if (!ASKDemod(Cmd, false, false, 1)) { @@ -81,7 +130,7 @@ int CmdPrescoDemod(const char *Cmd) { return 0; } size_t size = DemodBufferLen; - //call lfdemod.c demod for Viking + //call lfdemod.c demod for presco int ans = PrescoDemod(DemodBuffer, &size); if (ans < 0) { if (g_debugMode) PrintAndLog("Error Presco_Demod %d", ans); @@ -90,47 +139,48 @@ int CmdPrescoDemod(const char *Cmd) { //got a good demod uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32); uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); - uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32); + uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32); + uint32_t raw4 = bytebits_to_byte(DemodBuffer+ans+96, 32); + uint32_t cardid = raw4; PrintAndLog("Presco Tag Found: Card ID %08X", cardid); - PrintAndLog("Raw: %08X%08X", raw1,raw2); - setDemodBuf(DemodBuffer+ans, 64, 0); - - // uint32_t sitecode = 0, usercode = 0; - // GetWiegandFromPresco(id, &sitecode, &usercode); - // PrintAndLog8("SiteCode %d | UserCode %d", sitecode, usercode); - + PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4); + setDemodBuf(DemodBuffer, 128, ans); + setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock)); + + uint32_t sitecode = 0, usercode = 0, fullcode = 0; + bool Q5=false; + char cmd[12] = {0}; + sprintf(cmd, "H %08X", cardid); + GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5); + PrintAndLog("SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode); + return 1; } //see ASKDemod for what args are accepted int CmdPrescoRead(const char *Cmd) { - // Presco Number: 123456789 --> Sitecode 30 | usercode 8665 + // Presco Number: 123456789 --> Sitecode 30 | usercode 8665 // read lf silently - CmdLFRead("s"); - // get samples silently - getSamples("30000",false); + lf_read(true, 10000); // demod and output Presco ID return CmdPrescoDemod(Cmd); } +// takes base 12 ID converts to hex +// Or takes 8 digit hex ID int CmdPrescoClone(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_presco_clone(); - - uint32_t sitecode=0, usercode=0; - uint8_t bits[96]; - uint8_t *bs = bits; - memset(bs,0,sizeof(bits)); + bool Q5 = false; + uint32_t sitecode=0, usercode=0, fullcode=0; uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4<>1)<=0; i--) { + c.arg[0] = blocks[i]; + c.arg[1] = i; + clearCommandBuffer(); + SendCommand(&c); + if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){ + PrintAndLog("Error occurred, device did not respond during write operation."); + return -1; + } + } + return 0; +} - // id = param_get32ex(Cmd, 0, 0, 16); - // if (id == 0) return usage_lf_presco_sim(); +// takes base 12 ID converts to hex +// Or takes 8 digit hex ID +int CmdPrescoSim(const char *Cmd) { + uint32_t sitecode=0, usercode=0, fullcode=0; + bool Q5=false; + // get wiegand from printed number. + if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim(); - //rawID = getVikingBits(id); + uint8_t clk = 32, encoding = 1, separator = 1, invert = 0; + uint16_t arg1, arg2; + size_t size = 128; + arg1 = clk << 8 | encoding; + arg2 = invert << 8 | separator; - // uint16_t arg1, arg2; - // size_t size = 64; - // arg1 = clk << 8 | encoding; - // arg2 = invert << 8 | separator; + PrintAndLog("Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode); - // PrintAndLog("Simulating - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF)); - - // UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; - // num_to_bytebits(rawID, size, c.d.asBytes); - // clearCommandBuffer(); - // SendCommand(&c); + UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; + GetPrescoBits(fullcode, c.d.asBytes); + clearCommandBuffer(); + SendCommand(&c); return 0; } static command_t CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"read", CmdPrescoRead, 0, "Attempt to read and Extract tag data"}, - {"clone", CmdPrescoClone, 0, "<8 digit ID number> clone presco tag"}, -// {"sim", CmdPrescoSim, 0, "<8 digit ID number> simulate presco tag"}, - {NULL, NULL, 0, NULL} + {"help", CmdHelp, 1, "This help"}, + {"read", CmdPrescoRead, 0, "Attempt to read and Extract tag data"}, + {"clone", CmdPrescoClone, 0, "d <9 digit ID> or h [Q5] clone presco tag"}, + {"sim", CmdPrescoSim, 0, "d <9 digit ID> or h simulate presco tag"}, + {NULL, NULL, 0, NULL} }; int CmdLFPresco(const char *Cmd) {