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

index ca4fcafc1ca91c324d02c78505d5d59dbdcf7db5..394dcbc2286ee5dfc8002899f4dd3555be2ce290 100644 (file)

--- a/client/cmddata.c

+++ b/client/cmddata.c

@@ -58,11 +58,12 @@ int CmdSetDebugMode(const char *Cmd)

}

int usage_data_printdemodbuf(){

}

int usage_data_printdemodbuf(){

- PrintAndLog("Usage: data printdemodbuffer x o <offset>");

+ PrintAndLog("Usage: data printdemodbuffer x o <offset> l <length>");

PrintAndLog("Options: ");

PrintAndLog(" h This help");

PrintAndLog(" x output in hex (omit for binary output)");

PrintAndLog(" o <offset> enter offset in # of bits");

PrintAndLog("Options: ");

PrintAndLog(" h This help");

PrintAndLog(" x output in hex (omit for binary output)");

PrintAndLog(" o <offset> enter offset in # of bits");

+ PrintAndLog(" l <length> enter length to print in # of bits or hex characters respectively");

return 0;

}

return 0;

}

@@ -87,7 +88,8 @@ int CmdPrintDemodBuff(const char *Cmd)

char hex[512]={0x00};

bool hexMode = false;

bool errors = false;

char hex[512]={0x00};

bool hexMode = false;

bool errors = false;

- uint8_t offset = 0;

+ uint32_t offset = 0; //could be size_t but no param_get16...

+ uint32_t length = 512;

char cmdp = 0;

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

{

char cmdp = 0;

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

{

@@ -103,10 +105,16 @@ int CmdPrintDemodBuff(const char *Cmd)

break;

case 'o':

case 'O':

break;

case 'o':

case 'O':

- offset = param_get8(Cmd, cmdp+1);

+ offset = param_get32ex(Cmd, cmdp+1, 0, 10);

if (!offset) errors = true;

cmdp += 2;

break;

if (!offset) errors = true;

cmdp += 2;

break;

+ case 'l':

+ case 'L':

+ length = param_get32ex(Cmd, cmdp+1, 512, 10);

+ if (!length) errors = true;

+ cmdp += 2;

+ break;

default:

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

errors = true;

default:

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

errors = true;

@@ -116,11 +124,12 @@ int CmdPrintDemodBuff(const char *Cmd)

}

//Validations

if(errors) return usage_data_printdemodbuf();

}

//Validations

if(errors) return usage_data_printdemodbuf();

- int numBits = (DemodBufferLen-offset) & 0x7FC; //make sure we don't exceed our string

+ length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;

+ int numBits = (length) & 0x00FFC; //make sure we don't exceed our string

if (hexMode){

char *buf = (char *) (DemodBuffer + offset);

if (hexMode){

char *buf = (char *) (DemodBuffer + offset);

+ numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;

numBits = binarraytohex(hex, buf, numBits);

if (numBits==0) return 0;

PrintAndLog("DemodBuffer: %s",hex);

numBits = binarraytohex(hex, buf, numBits);

if (numBits==0) return 0;

PrintAndLog("DemodBuffer: %s",hex);

@@ -268,7 +277,8 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )

int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

{

int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

{

- if (!ASKDemod(Cmd, FALSE, FALSE, 1)) return 0;

+ bool st = TRUE;

+ if (!ASKDemod_ext(Cmd, FALSE, FALSE, 1, &st)) return 0;

return AskEm410xDecode(verbose, hi, lo);

}

return AskEm410xDecode(verbose, hi, lo);

}

@@ -303,8 +313,7 @@ int CmdAskEM410xDemod(const char *Cmd)

//verbose will print results and demoding messages

//emSearch will auto search for EM410x format in bitstream

//askType switches decode: ask/raw = 0, ask/manchester = 1

//verbose will print results and demoding messages

//emSearch will auto search for EM410x format in bitstream

//askType switches decode: ask/raw = 0, ask/manchester = 1

-int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {

int invert=0;

int clk=0;

int maxErr=100;

int invert=0;

int clk=0;

int maxErr=100;

@@ -313,7 +322,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

char amp = param_getchar(Cmd, 0);

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);

char amp = param_getchar(Cmd, 0);

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);

- if (!maxLen) maxLen = 512*64;

+ if (!maxLen) maxLen = BIGBUF_SIZE;

if (invert != 0 && invert != 1) {

PrintAndLog("Invalid argument: %s", Cmd);

return 0;

if (invert != 0 && invert != 1) {

PrintAndLog("Invalid argument: %s", Cmd);

return 0;

@@ -325,15 +334,22 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

if (amp == 'a' || amp == 'A') askAmp=1;

size_t BitLen = getFromGraphBuf(BitStream);

if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

if (amp == 'a' || amp == 'A') askAmp=1;

size_t BitLen = getFromGraphBuf(BitStream);

if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

- if (BitLen<255) return 0;

- if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;

+ if (BitLen < 255) return 0;

+ if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;

+ int foundclk = 0;

+ bool st = false;

+ if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);

+ if (st) {

+ *stCheck = st;

+ clk = (clk == 0) ? foundclk : clk;

+ if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");

+ }

int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);

if (errCnt<0 || BitLen<16){ //if fatal error (or -1)

if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);

return 0;

}

int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);

if (errCnt<0 || BitLen<16){ //if fatal error (or -1)

if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);

return 0;

}

- if (errCnt>maxErr){

+ if (errCnt > maxErr){

if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);

return 0;

}

if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);

return 0;

}

@@ -356,6 +372,10 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

}

return 1;

}

return 1;

}

+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {

+ bool st = false;

+ return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);

//by marshmellow

//takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'

//by marshmellow

//takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'

@@ -365,7 +385,8 @@ int Cmdaskmandemod(const char *Cmd)

{

char cmdp = param_getchar(Cmd, 0);

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

{

char cmdp = param_getchar(Cmd, 0);

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

- PrintAndLog("Usage: data rawdemod am [clock] <invert> [maxError] [maxLen] [amplify]");

+ PrintAndLog("Usage: data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");

+ PrintAndLog(" ['s'] optional, check for Sequence Terminator");

PrintAndLog(" [set clock as integer] optional, if not set, autodetect");

PrintAndLog(" <invert>, 1 to invert output");

PrintAndLog(" [set maximum allowed errors], default = 100");

PrintAndLog(" [set clock as integer] optional, if not set, autodetect");

PrintAndLog(" <invert>, 1 to invert output");

PrintAndLog(" [set maximum allowed errors], default = 100");

@@ -379,7 +400,13 @@ int Cmdaskmandemod(const char *Cmd)

PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

return 0;

}

PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

return 0;

}

- return ASKDemod(Cmd, TRUE, TRUE, 1);

+ bool st = TRUE;

+ if (Cmd[0]=='s')

+ return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st);

+ else if (Cmd[1] == 's')

+ return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st);

+ else

+ return ASKDemod(Cmd, TRUE, TRUE, 1);

}

//by marshmellow

}

//by marshmellow

@@ -586,7 +613,7 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if ((idx+1) % 5 == 0){

//spacer bit - should be 0

if (DemodBuffer[startIdx+idx] != 0) {

if ((idx+1) % 5 == 0){

//spacer bit - should be 0

if (DemodBuffer[startIdx+idx] != 0) {

- if (g_debugMode) PrintAndLog("Error spacer not 0: %d, pos: %d",DemodBuffer[startIdx+idx],startIdx+idx);

+ if (g_debugMode) PrintAndLog("Error spacer not 0: %u, pos: %u", (unsigned int)DemodBuffer[startIdx+idx],(unsigned int)(startIdx+idx));

return 0;

}

continue;

return 0;

}

continue;

@@ -594,21 +621,21 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if (keyCnt<8){ //lsb first

xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);

keyCnt++;

if (keyCnt<8){ //lsb first

xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);

keyCnt++;

- if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", xorKey);

+ if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", (unsigned int)xorKey);

continue;

}

//lsb first

ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);

bitCnt++;

if (bitCnt % 8 == 0){

continue;

}

//lsb first

ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);

bitCnt++;

if (bitCnt % 8 == 0){

- if (g_debugMode) PrintAndLog("byte %d: %02x",ByteCnt,ByteStream[ByteCnt]);

+ if (g_debugMode) PrintAndLog("byte %u: %02x", (unsigned int)ByteCnt, ByteStream[ByteCnt]);

bitCnt=0;

ByteCnt++;

}

for (uint8_t i = 0; i < ByteCnt; i++){

ByteStream[i] ^= xorKey; //xor

bitCnt=0;

ByteCnt++;

}

for (uint8_t i = 0; i < ByteCnt; i++){

ByteStream[i] ^= xorKey; //xor

- if (g_debugMode) PrintAndLog("byte %d after xor: %02x", i, ByteStream[i]);

+ if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)i, ByteStream[i]);

}

//now ByteStream contains 64 bytes of decrypted raw tag data

}

//now ByteStream contains 64 bytes of decrypted raw tag data

@@ -622,13 +649,13 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if (fmtLen==36){

FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);

Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);

if (fmtLen==36){

FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);

Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);

- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);

+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d", fmtLen, FC, Card);

} else if(fmtLen==26){

FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);

Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);

} else if(fmtLen==26){

FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);

Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);

- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);

+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",(unsigned int)fmtLen,FC,Card);

} else {

- PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",fmtLen);

+ PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);

}

PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);

setDemodBuf(DemodBuffer+ans, 96, 0);

}

PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);

setDemodBuf(DemodBuffer+ans, 96, 0);

@@ -655,7 +682,7 @@ int CmdVikingDemod(const char *Cmd)

uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);

uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);

uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);

uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);

uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);

uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);

- PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);

+ PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum);

PrintAndLog("Raw: %08X%08X", raw1,raw2);

setDemodBuf(DemodBuffer+ans, 64, 0);

return 1;

PrintAndLog("Raw: %08X%08X", raw1,raw2);

setDemodBuf(DemodBuffer+ans, 64, 0);

return 1;

@@ -910,19 +937,21 @@ int CmdDetectClockRate(const char *Cmd)

char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

{

char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

{

- char *fskType;

+ static char fType[8];

+ memset(fType, 0x00, 8);

+ char *fskType = fType;

if (fchigh==10 && fclow==8){

if (invert) //fsk2a

if (fchigh==10 && fclow==8){

if (invert) //fsk2a

- fskType = "FSK2a";

+ memcpy(fskType, "FSK2a", 5);

else //fsk2

- fskType = "FSK2";

+ memcpy(fskType, "FSK2", 4);

} else if (fchigh == 8 && fclow == 5) {

if (invert)

} else if (fchigh == 8 && fclow == 5) {

if (invert)

- fskType = "FSK1";

+ memcpy(fskType, "FSK1", 4);

else

- fskType = "FSK1a";

+ memcpy(fskType, "FSK1a", 5);

} else {

- fskType = "FSK??";

+ memcpy(fskType, "FSK??", 5);

}

return fskType;

}

return fskType;

}

@@ -934,55 +963,53 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

int FSKrawDemod(const char *Cmd, bool verbose)

{

//raw fsk demod no manchester decoding no start bit finding just get binary from wave

int FSKrawDemod(const char *Cmd, bool verbose)

{

//raw fsk demod no manchester decoding no start bit finding just get binary from wave

+ uint8_t rfLen, invert, fchigh, fclow;

//set defaults

- int rfLen = 0;

- int invert = 0;

- int fchigh = 0;

- int fclow = 0;

//set options from parameters entered with the command

- sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);

+ rfLen = param_get8(Cmd, 0);

+ invert = param_get8(Cmd, 1);

+ fchigh = param_get8(Cmd, 2);

+ fclow = param_get8(Cmd, 3);

if (strlen(Cmd)>0 && strlen(Cmd)<=2) {

- if (rfLen==1){

+ if (rfLen==1) {

invert = 1; //if invert option only is used

rfLen = 0;

invert = 1; //if invert option only is used

rfLen = 0;

- }

+ }

}

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

//get field clock lengths

uint16_t fcs=0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

//get field clock lengths

uint16_t fcs=0;

- if (fchigh==0 || fclow == 0){

+ if (!fchigh || !fclow) {

fcs = countFC(BitStream, BitLen, 1);

- if (fcs==0){

- fchigh=10;

- fclow=8;

- }else{

- fchigh = (fcs >> 8) & 0xFF;

- fclow = fcs & 0xFF;

+ if (!fcs) {

+ fchigh = 10;

+ fclow = 8;

+ } else {

+ fchigh = (fcs >> 8) & 0x00FF;

+ fclow = fcs & 0x00FF;

}

//get bit clock length

}

//get bit clock length

- if (rfLen==0){

+ if (!rfLen) {

rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);

- if (rfLen == 0) rfLen = 50;

+ if (!rfLen) rfLen = 50;

}

- int size = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);

- if (size>0){

+ int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);

+ if (size > 0) {

setDemodBuf(BitStream,size,0);

// Now output the bitstream to the scrollback by line of 16 bits

if (verbose || g_debugMode) {

setDemodBuf(BitStream,size,0);

// Now output the bitstream to the scrollback by line of 16 bits

if (verbose || g_debugMode) {

- PrintAndLog("\nUsing Clock:%d, invert:%d, fchigh:%d, fclow:%d", rfLen, invert, fchigh, fclow);

+ PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);

PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));

printDemodBuff();

}

return 1;

PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));

printDemodBuff();

}

return 1;

- } else{

+ } else {

if (g_debugMode) PrintAndLog("no FSK data found");

}

return 0;

if (g_debugMode) PrintAndLog("no FSK data found");

}

return 0;

@@ -2021,10 +2048,20 @@ int CmdSamples(const char *Cmd)

int CmdTuneSamples(const char *Cmd)

{

int CmdTuneSamples(const char *Cmd)

{

- int timeout = 0;

+ int timeout = 0, arg = FLAG_TUNE_ALL;

+ if(*Cmd == 'l') {

+ arg = FLAG_TUNE_LF;

+ } else if (*Cmd == 'h') {

+ arg = FLAG_TUNE_HF;

+ } else if (*Cmd != '\0') {

+ PrintAndLog("use 'tune' or 'tune l' or 'tune h'");

+ return 0;

+ }

printf("\nMeasuring antenna characteristics, please wait...");

- UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING};

+ UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {arg, 0, 0}};

SendCommand(&c);

UsbCommand resp;

SendCommand(&c);

UsbCommand resp;

@@ -2383,7 +2420,7 @@ static command_t CommandTable[] =

{"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},

{"norm", CmdNorm, 1, "Normalize max/min to +/-128"},

{"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"},

{"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},

{"norm", CmdNorm, 1, "Normalize max/min to +/-128"},

{"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"},

- {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> -- print the data in the DemodBuffer - 'x' for hex output"},

+ {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},

{"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},

{"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},

{"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},

{"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},

{"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},

{"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},