github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed.

Browse source 
REM: removed some debugstatements
This commit is contained in:
iceman1001 2016-09-01 16:09:31 +02:00
commit 56d0fb8e4d
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/cmddata.c
View file

@ -258,8 +258,7 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
for (; i < size; i++){
DemodBuffer[i]=buff[startIdx++];
}
DemodBufferLen=size;
return;
DemodBufferLen = size;
}
int CmdSetDebugMode(const char *Cmd)
@ -1761,7 +1760,8 @@ int CmdIndalaDecode(const char *Cmd)
PrintAndLog("Error1: %d",ans);
return 0;
}
uint8_t invert=0;
uint8_t invert = 0;
size_t size = DemodBufferLen;
int startIdx = indala26decode(DemodBuffer, &size, &invert);
if (startIdx < 0 || size > 224) {
@ -1800,12 +1800,18 @@ int CmdIndalaDecode(const char *Cmd)
int CmdPSKNexWatch(const char *Cmd)
{
if (!PSKDemod("", false)) return 0;
uint8_t preamble[28] = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
size_t startIdx = 0, size = DemodBufferLen;
// sanity check.
if ( size < sizeof(preamble) + 100) return 0;
bool invert = false;
if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){
// if didn't find preamble try again inverting
if (!PSKDemod("1", false)) return 0;
size = DemodBufferLen;
if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0;
invert = true;
@ -1906,7 +1912,6 @@ int CmdPSK1rawDemod(const char *Cmd)
if (g_debugMode) PrintAndLog("Error demoding: %d",ans);
return 0;
}
PrintAndLog("PSK1 demoded bitstream:");
// Now output the bitstream to the scrollback by line of 16 bits
printDemodBuff();
@ -1917,12 +1922,12 @@ int CmdPSK1rawDemod(const char *Cmd)
// takes same args as cmdpsk1rawdemod
int CmdPSK2rawDemod(const char *Cmd)
{
int ans=0;
int ans = 0;
char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
return usage_data_rawdemod_p2();
ans=PSKDemod(Cmd, TRUE);
ans = PSKDemod(Cmd, TRUE);
if (!ans){
if (g_debugMode) PrintAndLog("Error demoding: %d",ans);
return 0;