mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-19 21:03:48 -07:00
CHG: 'data zerograph' - array out-of-bounds fixed.
CHG: syntax sugar
This commit is contained in:
iceman1001
parent
3acac886bc
commit
c621ae0614
1 changed files with 92 additions and 99 deletions
123
client/cmddata.c
123
client/cmddata.c
|
|
@ -243,13 +243,19 @@ int usage_data_bin2hex(void){
|
|||
PrintAndLog(" This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
|
||||
return 0;
|
||||
}
|
||||
int usage_data_buffclear(void){
|
||||
PrintAndLog("This function clears the bigbuff on deviceside");
|
||||
PrintAndLog("Usage: data buffclear [h]");
|
||||
PrintAndLog("Options:");
|
||||
PrintAndLog(" h This help");
|
||||
return 0;
|
||||
}
|
||||
|
||||
//set the demod buffer with given array of binary (one bit per byte)
|
||||
//by marshmellow
|
||||
void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
|
||||
{
|
||||
if (buff == NULL)
|
||||
return;
|
||||
if (buff == NULL) return;
|
||||
|
||||
if (size >= MAX_DEMOD_BUF_LEN)
|
||||
size = MAX_DEMOD_BUF_LEN;
|
||||
|
|
@ -279,8 +285,6 @@ void printDemodBuff(void)
|
|||
|
||||
char *bin = sprint_bin_break(DemodBuffer, bitLen,16);
|
||||
PrintAndLog("%s",bin);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
int CmdPrintDemodBuff(const char *Cmd)
|
||||
|
|
@ -343,15 +347,10 @@ int CmdPrintDemodBuff(const char *Cmd)
|
|||
//this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
|
||||
int CmdGetBitStream(const char *Cmd)
|
||||
{
|
||||
int i;
|
||||
CmdHpf(Cmd);
|
||||
for (i = 0; i < GraphTraceLen; i++) {
|
||||
if (GraphBuffer[i] >= 1) {
|
||||
GraphBuffer[i] = 1;
|
||||
} else {
|
||||
GraphBuffer[i] = 0;
|
||||
}
|
||||
}
|
||||
for (uint32_t i = 0; i < GraphTraceLen; i++)
|
||||
GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
|
||||
|
||||
RepaintGraphWindow();
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -462,7 +461,6 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
|
|||
int ans = Em410xDecode(BitStream, &size, &idx, hi, lo);
|
||||
if ( ans < 0){
|
||||
if (g_debugMode){
|
||||
|
||||
if (ans == -1)
|
||||
PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
|
||||
else if (ans == -3)
|
||||
|
|
@ -561,18 +559,20 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
|
|||
//output
|
||||
setDemodBuf(BitStream,BitLen,0);
|
||||
if (verbose || g_debugMode){
|
||||
if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
|
||||
if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
|
||||
else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
|
||||
if (errCnt>0)
|
||||
PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
|
||||
if (askType)
|
||||
PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
|
||||
else
|
||||
PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
|
||||
// Now output the bitstream to the scrollback by line of 16 bits
|
||||
printDemodBuff();
|
||||
|
||||
}
|
||||
uint64_t lo = 0;
|
||||
uint32_t hi = 0;
|
||||
if (emSearch){
|
||||
if (emSearch)
|
||||
AskEm410xDecode(true, &hi, &lo);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
|
||||
|
|
@ -587,15 +587,14 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
|
|||
int Cmdaskmandemod(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_am();
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -610,15 +609,17 @@ int Cmdmandecoderaw(const char *Cmd)
|
|||
int invert = 0;
|
||||
int maxErr = 20;
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_manrawdecode();
|
||||
if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') return usage_data_manrawdecode();
|
||||
|
||||
if (DemodBufferLen==0) return 0;
|
||||
|
||||
uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
|
||||
int high = 0, low = 0;
|
||||
for (; i < DemodBufferLen; ++i){
|
||||
if (DemodBuffer[i]>high) high=DemodBuffer[i];
|
||||
else if(DemodBuffer[i]<low) low=DemodBuffer[i];
|
||||
if (DemodBuffer[i] > high)
|
||||
high=DemodBuffer[i];
|
||||
else if(DemodBuffer[i] < low)
|
||||
low=DemodBuffer[i];
|
||||
BitStream[i] = DemodBuffer[i];
|
||||
}
|
||||
if (high>7 || low <0 ){
|
||||
|
|
@ -642,7 +643,6 @@ int Cmdmandecoderaw(const char *Cmd)
|
|||
if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){
|
||||
//need to adjust to set bitstream back to manchester encoded data
|
||||
//setDemodBuf(BitStream, size, idx);
|
||||
|
||||
printEM410x(hi, id);
|
||||
}
|
||||
}
|
||||
|
|
@ -660,8 +660,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
|
|||
size_t size=0;
|
||||
int offset=0, invert=0, maxErr=20, errCnt=0;
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_biphaserawdecode();
|
||||
if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_data_biphaserawdecode();
|
||||
|
||||
sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
|
||||
if (DemodBufferLen==0){
|
||||
|
|
@ -681,13 +680,14 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (errCnt>0){
|
||||
if (errCnt > 0)
|
||||
PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
|
||||
}
|
||||
|
||||
PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
|
||||
PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
|
||||
|
||||
if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod
|
||||
if (offset)
|
||||
setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -734,8 +734,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
|
|||
int Cmdaskbiphdemod(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_ab();
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ab();
|
||||
|
||||
return ASKbiphaseDemod(Cmd, TRUE);
|
||||
}
|
||||
|
|
@ -769,7 +768,8 @@ int CmdG_Prox_II_Demod(const char *Cmd)
|
|||
// remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
|
||||
size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
|
||||
if (bitLen != 72) {
|
||||
if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
|
||||
if (g_debugMode)
|
||||
PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
|
||||
return 0;
|
||||
}
|
||||
// get key and then get all 8 bytes of payload decoded
|
||||
|
|
@ -835,8 +835,7 @@ int CmdVikingDemod(const char *Cmd)
|
|||
int Cmdaskrawdemod(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_ar();
|
||||
if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ar();
|
||||
|
||||
return ASKDemod(Cmd, TRUE, FALSE, 0);
|
||||
}
|
||||
|
|
@ -895,8 +894,7 @@ int CmdAutoCorr(const char *Cmd)
|
|||
sscanf(Cmd, "%i %c", &window, &grph);
|
||||
|
||||
if (window >= GraphTraceLen) {
|
||||
PrintAndLog("window must be smaller than trace (%d samples)",
|
||||
GraphTraceLen);
|
||||
PrintAndLog("window must be smaller than trace (%d samples)", GraphTraceLen);
|
||||
return 0;
|
||||
}
|
||||
if (grph == 'g') updateGrph = TRUE;
|
||||
|
|
@ -913,13 +911,12 @@ int CmdBitsamples(const char *Cmd)
|
|||
|
||||
for (int j = 0; j < sizeof(got); j++) {
|
||||
for (int k = 0; k < 8; k++) {
|
||||
if(got[j] & (1 << (7 - k))) {
|
||||
if(got[j] & (1 << (7 - k)))
|
||||
GraphBuffer[cnt++] = 1;
|
||||
} else {
|
||||
else
|
||||
GraphBuffer[cnt++] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
GraphTraceLen = cnt;
|
||||
RepaintGraphWindow();
|
||||
return 0;
|
||||
|
|
@ -927,6 +924,9 @@ int CmdBitsamples(const char *Cmd)
|
|||
|
||||
int CmdBuffClear(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear();
|
||||
|
||||
UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
|
||||
SendCommand(&c);
|
||||
ClearGraph(true);
|
||||
|
|
@ -953,8 +953,7 @@ int CmdDec(const char *Cmd)
|
|||
int CmdUndec(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_undecimate();
|
||||
if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate();
|
||||
|
||||
uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
|
||||
|
||||
|
|
@ -985,7 +984,11 @@ int CmdGraphShiftZero(const char *Cmd)
|
|||
sscanf(Cmd, "%i", &shift);
|
||||
|
||||
for(int i = 0; i < GraphTraceLen; i++){
|
||||
if ( i+shift >= GraphTraceLen)
|
||||
shiftedVal = GraphBuffer[i];
|
||||
else
|
||||
shiftedVal = GraphBuffer[i] + shift;
|
||||
|
||||
if (shiftedVal > 127)
|
||||
shiftedVal = 127;
|
||||
else if (shiftedVal < -127)
|
||||
|
|
@ -1121,11 +1124,10 @@ int FSKrawDemod(const char *Cmd, bool verbose)
|
|||
|
||||
// Now output the bitstream to the scrollback by line of 16 bits
|
||||
if (verbose || g_debugMode) {
|
||||
PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);
|
||||
PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow);
|
||||
PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
|
||||
printDemodBuff();
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else {
|
||||
if (g_debugMode) PrintAndLog("no FSK data found");
|
||||
|
|
@ -1140,8 +1142,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
|
|||
int CmdFSKrawdemod(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_fs();
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
|
||||
|
||||
return FSKrawDemod(Cmd, TRUE);
|
||||
}
|
||||
|
|
@ -1180,8 +1181,7 @@ int CmdFSKdemodHID(const char *Cmd)
|
|||
return 0;
|
||||
}
|
||||
if (hi2 != 0){ //extra large HID tags
|
||||
PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
|
||||
(unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
|
||||
PrintAndLog("HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
|
||||
}
|
||||
else { //standard HID tags <38 bits
|
||||
uint8_t fmtLen = 0;
|
||||
|
|
@ -1220,9 +1220,7 @@ int CmdFSKdemodHID(const char *Cmd)
|
|||
fc = ((hi&0xF)<<12)|(lo>>20);
|
||||
}
|
||||
}
|
||||
PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
|
||||
(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
|
||||
(unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
|
||||
PrintAndLog("HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo>>1) & 0xFFFF, fmtLen, fc, cardnum);
|
||||
}
|
||||
setDemodBuf(BitStream,BitLen,idx);
|
||||
if (g_debugMode){
|
||||
|
|
@ -1993,8 +1991,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
|
|||
int CmdNRZrawDemod(const char *Cmd)
|
||||
{
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_nr();
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
|
||||
|
||||
return NRZrawDemod(Cmd, TRUE);
|
||||
}
|
||||
|
|
@ -2007,8 +2004,7 @@ int CmdPSK1rawDemod(const char *Cmd)
|
|||
{
|
||||
int ans;
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_p1();
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
|
||||
|
||||
ans = PSKDemod(Cmd, TRUE);
|
||||
//output
|
||||
|
|
@ -2028,8 +2024,7 @@ int CmdPSK2rawDemod(const char *Cmd)
|
|||
{
|
||||
int ans = 0;
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
|
||||
return usage_data_rawdemod_p2();
|
||||
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p2();
|
||||
|
||||
ans = PSKDemod(Cmd, TRUE);
|
||||
if (!ans){
|
||||
|
|
@ -2374,16 +2369,15 @@ int CmdSave(const char *Cmd)
|
|||
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
|
||||
memcpy(filename, Cmd, len);
|
||||
|
||||
|
||||
FILE *f = fopen(filename, "w");
|
||||
if(!f) {
|
||||
PrintAndLog("couldn't open '%s'", filename);
|
||||
return 0;
|
||||
}
|
||||
int i;
|
||||
for (i = 0; i < GraphTraceLen; i++) {
|
||||
|
||||
for (int i = 0; i < GraphTraceLen; i++)
|
||||
fprintf(f, "%d\n", GraphBuffer[i]);
|
||||
}
|
||||
|
||||
if (f) {
|
||||
fclose(f);
|
||||
f = NULL;
|
||||
|
|
@ -2536,7 +2530,6 @@ int Cmdhex2bin(const char *Cmd)
|
|||
}
|
||||
|
||||
int CmdDataIIR(const char *Cmd){
|
||||
|
||||
uint8_t k = param_get8(Cmd,0);
|
||||
//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
|
||||
iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
|
||||
|
|
@ -2555,7 +2548,7 @@ static command_t CommandTable[] =
|
|||
{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
|
||||
{"bin2hex", Cmdbin2hex, 1, "<digits> -- Converts binary to hexadecimal"},
|
||||
{"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"},
|
||||
{"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},
|
||||
{"buffclear", CmdBuffClear, 1, "Clears bigbuff on deviceside. d graph window"},
|
||||
{"dec", CmdDec, 1, "Decimate samples"},
|
||||
{"detectclock", CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
|
||||
{"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue