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

index 016f0fe288ba5ca051916d5a775fb009594178d2..dcc6cfae97e01209edaaf408514de4835fb2543b 100644 (file)

--- a/client/cmdlf.c

+++ b/client/cmdlf.c

@@ -33,12 +33,14 @@

#include "cmdlfpcf7931.h"// for pcf7931 menu

#include "cmdlfpyramid.h"// for pyramid menu

#include "cmdlfviking.h" // for viking menu

#include "cmdlfpcf7931.h"// for pcf7931 menu

#include "cmdlfpyramid.h"// for pyramid menu

#include "cmdlfviking.h" // for viking menu

+#include "cmdlfcotag.h" // for COTAG menu

+bool g_lf_threshold_set = false;

static int CmdHelp(const char *Cmd);

-int usage_lf_cmdread()

+int usage_lf_cmdread(void)

{

PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");

PrintAndLog("Options: ");

{

PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");

PrintAndLog("Options: ");

@@ -61,7 +63,7 @@ int CmdLFCommandRead(const char *Cmd)

{

static char dummy[3] = {0x20,0x00,0x00};

UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};

{

static char dummy[3] = {0x20,0x00,0x00};

UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};

- bool errors = FALSE;

+ bool errors = false;

//uint8_t divisor = 95; //125khz

uint8_t cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00)

//uint8_t divisor = 95; //125khz

uint8_t cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00)

@@ -430,7 +432,7 @@ int CmdIndalaClone(const char *Cmd)

return 0;

}

return 0;

}

-int usage_lf_read()

+int usage_lf_read(void)

{

PrintAndLog("Usage: lf read");

PrintAndLog("Options: ");

{

PrintAndLog("Usage: lf read");

PrintAndLog("Options: ");

@@ -440,7 +442,7 @@ int usage_lf_read()

PrintAndLog("Use 'lf config' to set parameters.");

return 0;

}

PrintAndLog("Use 'lf config' to set parameters.");

return 0;

}

-int usage_lf_snoop()

+int usage_lf_snoop(void)

{

PrintAndLog("Usage: lf snoop");

PrintAndLog("Options: ");

{

PrintAndLog("Usage: lf snoop");

PrintAndLog("Options: ");

@@ -450,7 +452,7 @@ int usage_lf_snoop()

return 0;

}

return 0;

}

-int usage_lf_config()

+int usage_lf_config(void)

{

PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");

PrintAndLog("Options: ");

{

PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");

PrintAndLog("Options: ");

@@ -482,7 +484,7 @@ int CmdLFSetConfig(const char *Cmd)

uint8_t bps = 0; // Bits per sample

uint8_t decimation = 0; //How many to keep

bool averaging = 1; // Defaults to true

uint8_t bps = 0; // Bits per sample

uint8_t decimation = 0; //How many to keep

bool averaging = 1; // Defaults to true

- bool errors = FALSE;

+ bool errors = false;

int trigger_threshold =-1;//Means no change

uint8_t unsigned_trigg = 0;

int trigger_threshold =-1;//Means no change

uint8_t unsigned_trigg = 0;

@@ -508,7 +510,10 @@ int CmdLFSetConfig(const char *Cmd)

case 't':

errors |= param_getdec(Cmd,cmdp+1,&unsigned_trigg);

cmdp+=2;

case 't':

errors |= param_getdec(Cmd,cmdp+1,&unsigned_trigg);

cmdp+=2;

- if(!errors) trigger_threshold = unsigned_trigg;

+ if(!errors) {

+ trigger_threshold = unsigned_trigg;

+ if (trigger_threshold > 0) g_lf_threshold_set = true;

+ }

break;

case 'b':

errors |= param_getdec(Cmd,cmdp+1,&bps);

break;

case 'b':

errors |= param_getdec(Cmd,cmdp+1,&bps);

@@ -555,7 +560,7 @@ int CmdLFSetConfig(const char *Cmd)

int CmdLFRead(const char *Cmd)

{

int CmdLFRead(const char *Cmd)

{

+ if (offline) return 0;

uint8_t cmdp = 0;

bool arg1 = false;

if (param_getchar(Cmd, cmdp) == 'h')

uint8_t cmdp = 0;

bool arg1 = false;

if (param_getchar(Cmd, cmdp) == 'h')

@@ -567,12 +572,14 @@ int CmdLFRead(const char *Cmd)

UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};

clearCommandBuffer();

SendCommand(&c);

UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};

clearCommandBuffer();

SendCommand(&c);

- //WaitForResponse(CMD_ACK,NULL);

- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {

- PrintAndLog("command execution time out");

- return 1;

+ if (g_lf_threshold_set) {

+ WaitForResponse(CMD_ACK,NULL);

+ } else {

+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {

+ PrintAndLog("command execution time out");

+ return 1;

+ }

}

return 0;

}

return 0;

}

@@ -685,7 +692,7 @@ int usage_lf_simpsk(void)

return 0;

}

return 0;

}

-// by marshmellow - sim ask data given clock, fcHigh, fcLow, invert

+// by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert

// - allow pull data from DemodBuffer

int CmdLFfskSim(const char *Cmd)

{

// - allow pull data from DemodBuffer

int CmdLFfskSim(const char *Cmd)

{

@@ -693,7 +700,7 @@ int CmdLFfskSim(const char *Cmd)

// otherwise will need FChigh, FClow, Clock, and bitstream

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

uint8_t invert=0;

// otherwise will need FChigh, FClow, Clock, and bitstream

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

uint8_t invert=0;

- bool errors = FALSE;

+ bool errors = false;

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

uint8_t data[255] = {0x00};

int dataLen = 0;

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

uint8_t data[255] = {0x00};

int dataLen = 0;

@@ -727,24 +734,24 @@ int CmdLFfskSim(const char *Cmd)

case 'd':

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

if (dataLen==0) {

case 'd':

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

if (dataLen==0) {

- errors=TRUE;

+ errors=true;

} else {

dataLen = hextobinarray((char *)data, hexData);

}

} else {

dataLen = hextobinarray((char *)data, hexData);

}

- if (dataLen==0) errors=TRUE;

+ if (dataLen==0) errors=true;

if (errors) PrintAndLog ("Error getting hex data");

cmdp+=2;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

if (errors) PrintAndLog ("Error getting hex data");

cmdp+=2;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

- errors = TRUE;

+ errors = true;

break;

}

if(errors) break;

}

if(cmdp == 0 && DemodBufferLen == 0)

{

break;

}

if(errors) break;

}

if(cmdp == 0 && DemodBufferLen == 0)

{

- errors = TRUE;// No args

+ errors = true;// No args

}

//Validations

}

//Validations

@@ -795,7 +802,7 @@ int CmdLFaskSim(const char *Cmd)

// 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;

// 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;

+ bool errors = false;

char hexData[32] = {0x00};

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

int dataLen = 0;

char hexData[32] = {0x00};

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

int dataLen = 0;

@@ -833,24 +840,24 @@ int CmdLFaskSim(const char *Cmd)

case 'd':

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

if (dataLen==0) {

case 'd':

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

if (dataLen==0) {

- errors=TRUE;

+ errors=true;

} else {

dataLen = hextobinarray((char *)data, hexData);

}

} else {

dataLen = hextobinarray((char *)data, hexData);

}

- if (dataLen==0) errors=TRUE;

+ 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));

if (errors) PrintAndLog ("Error getting hex data, datalen: %d",dataLen);

cmdp+=2;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

- errors = TRUE;

+ errors = true;

break;

}

if(errors) break;

}

if(cmdp == 0 && DemodBufferLen == 0)

{

break;

}

if(errors) break;

}

if(cmdp == 0 && DemodBufferLen == 0)

{

- errors = TRUE;// No args

+ errors = true;// No args

}

//Validations

}

//Validations

@@ -889,7 +896,7 @@ int CmdLFpskSim(const char *Cmd)

//will need carrier, Clock, and bitstream

uint8_t carrier=0, clk=0;

uint8_t invert=0;

//will need carrier, Clock, and bitstream

uint8_t carrier=0, clk=0;

uint8_t invert=0;

- bool errors = FALSE;

+ bool errors = false;

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

uint8_t data[255] = {0x00};

int dataLen = 0;

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

uint8_t data[255] = {0x00};

int dataLen = 0;

@@ -928,24 +935,24 @@ int CmdLFpskSim(const char *Cmd)

case 'd':

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

if (dataLen==0) {

case 'd':

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

if (dataLen==0) {

- errors=TRUE;

+ errors=true;

} else {

dataLen = hextobinarray((char *)data, hexData);

}

} else {

dataLen = hextobinarray((char *)data, hexData);

}

- if (dataLen==0) errors=TRUE;

+ if (dataLen==0) errors=true;

if (errors) PrintAndLog ("Error getting hex data");

cmdp+=2;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

if (errors) PrintAndLog ("Error getting hex data");

cmdp+=2;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

- errors = TRUE;

+ errors = true;

break;

}

if (errors) break;

}

if (cmdp == 0 && DemodBufferLen == 0)

{

break;

}

if (errors) break;

}

if (cmdp == 0 && DemodBufferLen == 0)

{

- errors = TRUE;// No args

+ errors = true;// No args

}

//Validations

}

//Validations

@@ -955,9 +962,9 @@ int CmdLFpskSim(const char *Cmd)

}

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

PrintAndLog("Getting Clocks");

}

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

PrintAndLog("Getting Clocks");

- if (clk==0) clk = GetPskClock("", FALSE, FALSE);

+ if (clk==0) clk = GetPskClock("", false, false);

PrintAndLog("clk: %d",clk);

- if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE);

+ if (!carrier) carrier = GetPskCarrier("", false, false);

PrintAndLog("carrier: %d", carrier);

} else {

setDemodBuf(data, dataLen, 0);

PrintAndLog("carrier: %d", carrier);

} else {

setDemodBuf(data, dataLen, 0);

@@ -1076,10 +1083,31 @@ int CmdVchDemod(const char *Cmd)

return 0;

}

return 0;

}

+//by marshmellow

+int CheckChipType(char cmdp) {

+ uint32_t wordData = 0;

+ //check for em4x05/em4x69 chips first

+ save_restoreGB(1);

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

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

+ save_restoreGB(0);

+ return 1;

+ }

+ //TODO check for t55xx chip...

+ save_restoreGB(0);

+ return 1;

//by marshmellow

int CmdLFfind(const char *Cmd)

{

//by marshmellow

int CmdLFfind(const char *Cmd)

{

+ uint32_t wordData = 0;

int ans=0;

+ size_t minLength = 1000;

char cmdp = param_getchar(Cmd, 0);

char testRaw = param_getchar(Cmd, 1);

if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {

char cmdp = param_getchar(Cmd, 0);

char testRaw = param_getchar(Cmd, 1);

if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {

@@ -1098,7 +1126,7 @@ int CmdLFfind(const char *Cmd)

if (!offline && (cmdp != '1')){

CmdLFRead("s");

getSamples("30000",false);

if (!offline && (cmdp != '1')){

CmdLFRead("s");

getSamples("30000",false);

- } else if (GraphTraceLen < 1000) {

+ } else if (GraphTraceLen < minLength) {

PrintAndLog("Data in Graphbuffer was too small.");

return 0;

}

PrintAndLog("Data in Graphbuffer was too small.");

return 0;

}

@@ -1108,52 +1136,75 @@ int CmdLFfind(const char *Cmd)

PrintAndLog("False Positives ARE possible\n");

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

PrintAndLog("False Positives ARE possible\n");

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

+ size_t testLen = minLength;

+ // only run if graphbuffer is just noise as it should be for hitag/cotag

+ if (graphJustNoise(GraphBuffer, testLen)) {

+ // only run these tests if we are in online mode

+ if (!offline && (cmdp != '1')) {

+ // test for em4x05 in reader talk first mode.

+ if (EM4x05Block0Test(&wordData)) {

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

+ return 1;

+ }

+ ans=CmdLFHitagReader("26");

+ if (ans==0) {

+ return 1;

+ }

+ ans=CmdCOTAGRead("");

+ if (ans>0){

+ PrintAndLog("\nValid COTAG ID Found!");

+ return 1;

+ }

+ return 0;

+ }

ans=CmdFSKdemodIO("");

if (ans>0) {

PrintAndLog("\nValid IO Prox ID Found!");

ans=CmdFSKdemodIO("");

if (ans>0) {

PrintAndLog("\nValid IO Prox ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdFSKdemodPyramid("");

if (ans>0) {

PrintAndLog("\nValid Pyramid ID Found!");

}

ans=CmdFSKdemodPyramid("");

if (ans>0) {

PrintAndLog("\nValid Pyramid ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdFSKdemodParadox("");

if (ans>0) {

PrintAndLog("\nValid Paradox ID Found!");

}

ans=CmdFSKdemodParadox("");

if (ans>0) {

PrintAndLog("\nValid Paradox ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdFSKdemodAWID("");

if (ans>0) {

PrintAndLog("\nValid AWID ID Found!");

}

ans=CmdFSKdemodAWID("");

if (ans>0) {

PrintAndLog("\nValid AWID ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdFSKdemodHID("");

if (ans>0) {

PrintAndLog("\nValid HID Prox ID Found!");

}

ans=CmdFSKdemodHID("");

if (ans>0) {

PrintAndLog("\nValid HID Prox ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdAskEM410xDemod("");

if (ans>0) {

PrintAndLog("\nValid EM410x ID Found!");

}

ans=CmdAskEM410xDemod("");

if (ans>0) {

PrintAndLog("\nValid EM410x ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdG_Prox_II_Demod("");

if (ans>0) {

PrintAndLog("\nValid G Prox II ID Found!");

}

ans=CmdG_Prox_II_Demod("");

if (ans>0) {

PrintAndLog("\nValid G Prox II ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdFDXBdemodBI("");

if (ans>0) {

PrintAndLog("\nValid FDX-B ID Found!");

}

ans=CmdFDXBdemodBI("");

if (ans>0) {

PrintAndLog("\nValid FDX-B ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=EM4x50Read("", false);

}

ans=EM4x50Read("", false);

@@ -1165,37 +1216,38 @@ int CmdLFfind(const char *Cmd)

ans=CmdVikingDemod("");

if (ans>0) {

PrintAndLog("\nValid Viking ID Found!");

ans=CmdVikingDemod("");

if (ans>0) {

PrintAndLog("\nValid Viking ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdIndalaDecode("");

if (ans>0) {

PrintAndLog("\nValid Indala ID Found!");

}

ans=CmdIndalaDecode("");

if (ans>0) {

PrintAndLog("\nValid Indala ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

ans=CmdPSKNexWatch("");

if (ans>0) {

PrintAndLog("\nValid NexWatch ID Found!");

}

ans=CmdPSKNexWatch("");

if (ans>0) {

PrintAndLog("\nValid NexWatch ID Found!");

- return 1;

+ return CheckChipType(cmdp);

}

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

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

}

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

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

- //test unknown tag formats (raw mode)

+ ans=CheckChipType(cmdp);

+ //test unknown tag formats (raw mode)0

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

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

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

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

- ans=GetFskClock("",FALSE,FALSE);

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

if (ans != 0){ //fsk

- ans=FSKrawDemod("",TRUE);

+ ans=FSKrawDemod("",true);

if (ans>0) {

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

return 1;

}

if (ans>0) {

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

return 1;

}

- bool st = TRUE;

- ans=ASKDemod_ext("0 0 0",TRUE,FALSE,1,&st);

+ bool st = true;

+ ans=ASKDemod_ext("0 0 0",true,false,1,&st);

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'");

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'");

@@ -1217,7 +1269,8 @@ static command_t CommandTable[] =

{

{"help", CmdHelp, 1, "This help"},

{"awid", CmdLFAWID, 1, "{ AWID RFIDs... }"},

{

{"help", CmdHelp, 1, "This help"},

{"awid", CmdLFAWID, 1, "{ AWID RFIDs... }"},

- {"em4x", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},

+ {"cotag", CmdLFCOTAG, 1, "{ COTAG RFIDs... }"},

+ {"em", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},

{"hid", CmdLFHID, 1, "{ HID RFIDs... }"},

{"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"},

{"io", CmdLFIO, 1, "{ ioProx tags... }"},

{"hid", CmdLFHID, 1, "{ HID RFIDs... }"},

{"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"},

{"io", CmdLFIO, 1, "{ ioProx tags... }"},