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

index 4dd08008f92b893358e206c5e894ff4989554ad1..6dd96ab0289d21099359e1e0b49c63848457044d 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,18 +124,17 @@ 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);

} else {

numBits = binarraytohex(hex, buf, numBits);

if (numBits==0) return 0;

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

} else {

- //setDemodBuf(DemodBuffer, DemodBufferLen-offset, offset);

- char *bin = sprint_bin_break(DemodBuffer+offset,numBits,16);

- PrintAndLog("DemodBuffer:\n%s",bin);

+ PrintAndLog("DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset,numBits,16));

}

return 1;

}

return 1;

}

@@ -315,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;

@@ -656,7 +663,7 @@ int CmdVikingDemod(const char *Cmd)

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

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

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

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

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

setDemodBuf(DemodBuffer+ans, 64, 0);

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

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

setDemodBuf(DemodBuffer+ans, 64, 0);

@@ -936,55 +943,52 @@ 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){

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

rfLen = 0;

}

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

if (rfLen==1){

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

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){

- fcs = countFC(BitStream, BitLen, 1);

- if (fcs==0){

- fchigh=10;

- fclow=8;

- }else{

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

- fclow = fcs & 0xFF;

+ uint8_t fc1=0, fc2=0, rf1=0;

+ if (!fchigh || !fclow) {

+ uint8_t ans = fskClocks(&fc1, &fc2, &rf1, false);

+ if (ans == 0) {

+ if (g_debugMode) PrintAndLog("\nError: cannot detect valid fsk field clocks");

+ return 0; // can't detect field clock

}

+ fchigh = fc1;

+ fclow = fc2;

+ if (rfLen == 0) rfLen = rf1;

}

//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:%hu, invert:%hu, fchigh:%hu, fclow:%hu", rfLen, invert, fchigh, 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;

@@ -1481,6 +1485,17 @@ int CmdFSKdemodPyramid(const char *Cmd)

// NATIONAL CODE, ICAR database

// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf

// FLAG (animal/non-animal)

// NATIONAL CODE, ICAR database

// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf

// FLAG (animal/non-animal)

+/*

+38 IDbits

+10 country code

+1 extra app bit

+14 reserved bits

+1 animal bit

+16 ccitt CRC chksum over 64bit ID CODE.

+24 appli bits.

+-- sample: 985121004515220 [ 37FF65B88EF94 ]

+*/

int CmdFDXBdemodBI(const char *Cmd){

int invert = 1;

int CmdFDXBdemodBI(const char *Cmd){

int invert = 1;

@@ -1580,6 +1595,9 @@ int PSKDemod(const char *Cmd, bool verbose)

//invalid carrier

return 0;

}

//invalid carrier

return 0;

}

+ if (g_debugMode){

+ PrintAndLog("Carrier: rf/%d",carrier);

+ }

int errCnt=0;

errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);

if (errCnt > maxErr){

int errCnt=0;

errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);

if (errCnt > maxErr){

@@ -1621,7 +1639,7 @@ int CmdIndalaDecode(const char *Cmd)

uint8_t invert=0;

size_t size = DemodBufferLen;

size_t startIdx = indala26decode(DemodBuffer, &size, &invert);

uint8_t invert=0;

size_t size = DemodBufferLen;

size_t startIdx = indala26decode(DemodBuffer, &size, &invert);

- if (startIdx < 1) {

+ if (startIdx < 1 || size > 224) {

if (g_debugMode==1)

PrintAndLog("Error2: %d",ans);

return -1;

if (g_debugMode==1)

PrintAndLog("Error2: %d",ans);

return -1;

@@ -1637,7 +1655,7 @@ int CmdIndalaDecode(const char *Cmd)

uid1=bytebits_to_byte(DemodBuffer,32);

uid2=bytebits_to_byte(DemodBuffer+32,32);

if (DemodBufferLen==64) {

uid1=bytebits_to_byte(DemodBuffer,32);

uid2=bytebits_to_byte(DemodBuffer+32,32);

if (DemodBufferLen==64) {

- PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin(DemodBuffer,DemodBufferLen), uid1, uid2);

+ PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2);

} else {

uid3=bytebits_to_byte(DemodBuffer+64,32);

uid4=bytebits_to_byte(DemodBuffer+96,32);

} else {

uid3=bytebits_to_byte(DemodBuffer+64,32);

uid4=bytebits_to_byte(DemodBuffer+96,32);

@@ -1645,7 +1663,7 @@ int CmdIndalaDecode(const char *Cmd)

uid6=bytebits_to_byte(DemodBuffer+160,32);

uid7=bytebits_to_byte(DemodBuffer+192,32);

PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)",

uid6=bytebits_to_byte(DemodBuffer+160,32);

uid7=bytebits_to_byte(DemodBuffer+192,32);

PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)",

- sprint_bin(DemodBuffer,DemodBufferLen), uid1, uid2, uid3, uid4, uid5, uid6, uid7);

+ sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7);

}

if (g_debugMode){

PrintAndLog("DEBUG: printing demodbuffer:");

}

if (g_debugMode){

PrintAndLog("DEBUG: printing demodbuffer:");

@@ -1961,10 +1979,7 @@ int getSamples(const char *Cmd, bool silent)

int n = strtol(Cmd, NULL, 0);

- if (n == 0)

- n = sizeof(got);

- if (n > sizeof(got))

+ if (n == 0 || n > sizeof(got))

n = sizeof(got);

PrintAndLog("Reading %d bytes from device memory\n", n);

n = sizeof(got);

PrintAndLog("Reading %d bytes from device memory\n", n);

@@ -2374,14 +2389,14 @@ 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"},

{"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},

{"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"},

{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},

{"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"},

{"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},

{"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"},

{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},

- {"setdebugmode", CmdSetDebugMode, 1, "<0|1> -- Turn on or off Debugging Mode for demods"},

+ {"setdebugmode", CmdSetDebugMode, 1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},

{"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},

{"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},

{"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"},

{"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},

{"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},

{"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"},