git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/client/cmdlf.c b/client/cmdlf.c

index 5b91d2e88e07ccaafe7f52a7ddb7941455d563c0..ef9c3cbbf9353cb60b626165a9925a6da9586813 100644 (file)

--- a/client/cmdlf.c

+++ b/client/cmdlf.c

@@ -45,6 +45,7 @@

#include "cmdlfjablotron.h" //for jablotron menu

#include "cmdlfnoralsy.h"// for noralsy menu

#include "cmdlfsecurakey.h"//for securakey menu

+#include "cmdlfpac.h" // for pac menu

bool g_lf_threshold_set = false;

static int CmdHelp(const char *Cmd);

@@ -92,7 +93,7 @@ int CmdLFCommandRead(const char *Cmd)

cmdp++;

break;

case 'c':

- param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);

+ param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));

cmdp+=2;

break;

case 'd':

@@ -349,7 +350,8 @@ bool lf_read(bool silent, uint32_t samples) {

return false;

}

- getSamples(resp.arg[0], silent);

+ // resp.arg[0] is bits read not bytes read.

+ getSamples(resp.arg[0]/8, silent);

return true;

}

@@ -408,14 +410,13 @@ int CmdLFSim(const char *Cmd)

sscanf(Cmd, "%i", &gap);

- // convert to bitstream if necessary

-

+ // convert to bitstream if necessary

ChkBitstream(Cmd);

//can send only 512 bits at a time (1 byte sent per bit...)

printf("Sending [%d bytes]", GraphTraceLen);

for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {

- UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};

+ UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};

for (j = 0; j < USB_CMD_DATA_SIZE; j++) {

c.d.asBytes[j] = GraphBuffer[i+j];

@@ -490,7 +491,7 @@ int CmdLFfskSim(const char *Cmd)

uint8_t fcHigh=0, fcLow=0, clk=0;

uint8_t invert=0;

bool errors = false;

- char hexData[32] = {0x00}; // store entered hex data

+ char hexData[64] = {0x00}; // store entered hex data

uint8_t data[255] = {0x00};

int dataLen = 0;

uint8_t cmdp = 0;

@@ -521,7 +522,7 @@ int CmdLFfskSim(const char *Cmd)

// cmdp++;

// break;

case 'd':

- dataLen = param_getstr(Cmd, cmdp+1, hexData);

+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

if (dataLen==0) {

errors=true;

} else {

@@ -548,10 +549,10 @@ int CmdLFfskSim(const char *Cmd)

{

return usage_lf_simfsk();

}

-

+ int firstClockEdge = 0;

if (dataLen == 0){ //using DemodBuffer

if (clk==0 || fcHigh==0 || fcLow==0){ //manual settings must set them all

- uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0);

+ uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0, &firstClockEdge);

if (ans==0){

if (!fcHigh) fcHigh=10;

if (!fcLow) fcLow=8;

@@ -592,7 +593,7 @@ int CmdLFaskSim(const char *Cmd)

uint8_t encoding = 1, separator = 0;

uint8_t clk=0, invert=0;

bool errors = false;

- char hexData[32] = {0x00};

+ char hexData[64] = {0x00};

uint8_t data[255]= {0x00}; // store entered hex data

int dataLen = 0;

uint8_t cmdp = 0;

@@ -627,7 +628,7 @@ int CmdLFaskSim(const char *Cmd)

cmdp++;

break;

case 'd':

- dataLen = param_getstr(Cmd, cmdp+1, hexData);

+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

if (dataLen==0) {

errors=true;

} else {

@@ -686,7 +687,7 @@ int CmdLFpskSim(const char *Cmd)

uint8_t carrier=0, clk=0;

uint8_t invert=0;

bool errors = false;

- char hexData[32] = {0x00}; // store entered hex data

+ char hexData[64] = {0x00}; // store entered hex data

uint8_t data[255] = {0x00};

int dataLen = 0;

uint8_t cmdp = 0;

@@ -722,7 +723,7 @@ int CmdLFpskSim(const char *Cmd)

cmdp++;

break;

case 'd':

- dataLen = param_getstr(Cmd, cmdp+1, hexData);

+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

if (dataLen==0) {

errors=true;

} else {

@@ -877,26 +878,27 @@ int CmdVchDemod(const char *Cmd)

int CheckChipType(char cmdp) {

uint32_t wordData = 0;

+ if (offline || cmdp == '1') return 0;

+

+ save_restoreGB(GRAPH_SAVE);

+ save_restoreDB(GRAPH_SAVE);

//check for em4x05/em4x69 chips first

- save_restoreGB(1);

- save_restoreDB(1);

- if ((!offline && (cmdp != '1')) && EM4x05Block0Test(&wordData)) {

+ if (EM4x05Block0Test(&wordData)) {

PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");

- save_restoreGB(0);

- save_restoreDB(0);

+ save_restoreGB(GRAPH_RESTORE);

+ save_restoreDB(GRAPH_RESTORE);

return 1;

}

- //TODO check for t55xx chip...

-

- if ((!offline && (cmdp != '1')) && tryDetectP1(true)) {

+ //check for t55xx chip...

+ if (tryDetectP1(true)) {

PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n");

- save_restoreGB(0);

- save_restoreDB(0);

+ save_restoreGB(GRAPH_RESTORE);

+ save_restoreDB(GRAPH_RESTORE);

return 1;

}

- save_restoreGB(0);

- save_restoreDB(0);

+ save_restoreGB(GRAPH_RESTORE);

+ save_restoreDB(GRAPH_RESTORE);

return 0;

}

@@ -943,7 +945,7 @@ int CmdLFfind(const char *Cmd)

PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");

return 1;

}

- ans=CmdLFHitagReader("26");

+ ans=CmdLFHitagReader("26"); // 26 = RHT2F_UID_ONLY

if (ans==0) {

return 1;

}

@@ -1054,19 +1056,25 @@ int CmdLFfind(const char *Cmd)

return CheckChipType(cmdp);

}

+ ans=CmdPacDemod("");

+ if (ans>0) {

+ PrintAndLog("\nValid PAC/Stanley ID Found!");

+ return CheckChipType(cmdp);

+ }

+

PrintAndLog("\nNo Known Tags Found!\n");

if (testRaw=='u' || testRaw=='U') {

- ans=CheckChipType(cmdp);

+ //ans=CheckChipType(cmdp);

//test unknown tag formats (raw mode)0

PrintAndLog("\nChecking for Unknown tags:\n");

- ans=AutoCorrelate(4000, false, false);

+ ans=AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);

if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);

ans=GetFskClock("",false,false);

if (ans != 0) { //fsk

ans=FSKrawDemod("",true);

if (ans>0) {

PrintAndLog("\nUnknown FSK Modulated Tag Found!");

- return 1;

+ return CheckChipType(cmdp);

}

bool st = true;

@@ -1074,15 +1082,16 @@ int CmdLFfind(const char *Cmd)

if (ans>0) {

PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");

PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdPSK1rawDemod("");

if (ans>0) {

PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");

PrintAndLog("\nCould also be PSK3 - [currently not supported]");

- PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod'");

- return 1;

+ PrintAndLog("\nCould also be NRZ - try 'data rawdemod nr'");

+ return CheckChipType(cmdp);

}

+ ans = CheckChipType(cmdp);

PrintAndLog("\nNo Data Found!\n");

}

return 0;

@@ -1103,6 +1112,7 @@ static command_t CommandTable[] =

{"jablotron", CmdLFJablotron, 1, "{ Jablotron RFIDs... }"},

{"nexwatch", CmdLFNexWatch, 1, "{ NexWatch RFIDs... }"},

{"noralsy", CmdLFNoralsy, 1, "{ Noralsy RFIDs... }"},

+ {"pac", CmdLFPac, 1, "{ PAC/Stanley RFIDs... }"},

{"paradox", CmdLFParadox, 1, "{ Paradox RFIDs... }"},

{"presco", CmdLFPresco, 1, "{ Presco RFIDs... }"},

{"pcf7931", CmdLFPCF7931, 1, "{ PCF7931 CHIPs... }"},