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

FIX: fixed a little bug I introduced from last commit in fskdemod

Browse source 
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
This commit is contained in:
iceman1001 2015-01-04 23:43:07 +01:00
commit f0cf62cd73
3 changed files with 375 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/cmddata.c
View file

@ -220,12 +220,12 @@ int Cmdaskmandemod(const char *Cmd)
PrintAndLog("ASK/Manchester decoded bitstream:"); PrintAndLog("ASK/Manchester decoded bitstream:");
printBitStream(bits, len); printBitStream(bits, len);
uint64_t lo = Em410xDecode(bits, len);
if (lo > 0){ uint64_t tagid = Em410xDecode(bits, len);
SetGraphBuf(bits,len);
PrintAndLog("EM410x pattern found: "); if (tagid > 0){
printEM410x(lo); SetGraphBuf(bits, len);
printEM410x(tagid);
return 1; return 1;
} }
return 0; return 0;

177
client/cmdlf.c
View file

@ -57,7 +57,7 @@ int CmdFlexdemod(const char *Cmd)
} }
} }
#define LONG_WAIT 100 #define LONG_WAIT 100
int start; int start;
for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) { for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
int first = GraphBuffer[start]; int first = GraphBuffer[start];
@ -71,28 +71,24 @@ int CmdFlexdemod(const char *Cmd)
} }
} }
if (start == GraphTraceLen - LONG_WAIT) { if (start == GraphTraceLen - LONG_WAIT) {
PrintAndLog("nothing to wait for"); //PrintAndLog("nothing to wait for");
return 0; return 0;
} }
GraphBuffer[start] = 2; GraphBuffer[start] = 2;
GraphBuffer[start+1] = -2; GraphBuffer[start+1] = -2;
uint8_t bits[64] = {0x00};
uint8_t bits[64]; int bit, sum;
int bit;
i = start; i = start;
for (bit = 0; bit < 64; bit++) { for (bit = 0; bit < 64; bit++) {
int j; sum = 0;
int sum = 0; for (int j = 0; j < 16; j++) {
for (j = 0; j < 16; j++) {
sum += GraphBuffer[i++]; sum += GraphBuffer[i++];
} }
if (sum > 0) {
bits[bit] = 1; bits[bit] = (sum > 0) ? 1 : 0;
} else {
bits[bit] = 0;
}
PrintAndLog("bit %d sum %d", bit, sum); PrintAndLog("bit %d sum %d", bit, sum);
} }
@ -110,15 +106,14 @@ int CmdFlexdemod(const char *Cmd)
} }
} }
// HACK writing back to graphbuffer.
GraphTraceLen = 32*64; GraphTraceLen = 32*64;
i = 0; i = 0;
int phase = 0; int phase = 0;
for (bit = 0; bit < 64; bit++) { for (bit = 0; bit < 64; bit++) {
if (bits[bit] == 0) {
phase = 0; phase = (bits[bit] == 0) ? 0 : 1;
} else {
phase = 1;
}
int j; int j;
for (j = 0; j < 32; j++) { for (j = 0; j < 32; j++) {
GraphBuffer[i++] = phase; GraphBuffer[i++] = phase;
@ -137,12 +132,16 @@ int CmdIndalaDemod(const char *Cmd)
int state = -1; int state = -1;
int count = 0; int count = 0;
int i, j; int i, j;
// worst case with GraphTraceLen=64000 is < 4096 // worst case with GraphTraceLen=64000 is < 4096
// under normal conditions it's < 2048 // under normal conditions it's < 2048
uint8_t rawbits[4096]; uint8_t rawbits[4096];
int rawbit = 0; int rawbit = 0;
int worst = 0, worstPos = 0; int worst = 0, worstPos = 0;
PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32); PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
for (i = 0; i < GraphTraceLen-1; i += 2) { for (i = 0; i < GraphTraceLen-1; i += 2) {
count += 1; count += 1;
if ((GraphBuffer[i] > GraphBuffer[i + 1]) && (state != 1)) { if ((GraphBuffer[i] > GraphBuffer[i + 1]) && (state != 1)) {
@ -171,10 +170,14 @@ int CmdIndalaDemod(const char *Cmd)
count = 0; count = 0;
} }
} }
if (rawbit>0){ if (rawbit>0){
PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32); PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos); PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
} else return 0; } else {
return 0;
}
// Finding the start of a UID // Finding the start of a UID
int uidlen, long_wait; int uidlen, long_wait;
if (strcmp(Cmd, "224") == 0) { if (strcmp(Cmd, "224") == 0) {
@ -184,6 +187,7 @@ int CmdIndalaDemod(const char *Cmd)
uidlen = 64; uidlen = 64;
long_wait = 29; long_wait = 29;
} }
int start; int start;
int first = 0; int first = 0;
for (start = 0; start <= rawbit - uidlen; start++) { for (start = 0; start <= rawbit - uidlen; start++) {
@ -197,8 +201,9 @@ int CmdIndalaDemod(const char *Cmd)
break; break;
} }
} }
if (start == rawbit - uidlen + 1) { if (start == rawbit - uidlen + 1) {
PrintAndLog("nothing to wait for"); //PrintAndLog("nothing to wait for");
return 0; return 0;
} }
@ -210,12 +215,12 @@ int CmdIndalaDemod(const char *Cmd)
} }
// Dumping UID // Dumping UID
uint8_t bits[224]; uint8_t bits[224] = {0x00};
char showbits[225]; char showbits[225] = {0x00};
showbits[uidlen]='\0';
int bit; int bit;
i = start; i = start;
int times = 0; int times = 0;
if (uidlen > rawbit) { if (uidlen > rawbit) {
PrintAndLog("Warning: not enough raw bits to get a full UID"); PrintAndLog("Warning: not enough raw bits to get a full UID");
for (bit = 0; bit < rawbit; bit++) { for (bit = 0; bit < rawbit; bit++) {
@ -237,42 +242,43 @@ int CmdIndalaDemod(const char *Cmd)
//convert UID to HEX //convert UID to HEX
uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7; uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
int idx; int idx;
uid1=0; uid1 = uid2 = 0;
uid2=0;
if (uidlen==64){ if (uidlen == 64){
for( idx=0; idx<64; idx++) { for( idx=0; idx<64; idx++) {
if (showbits[idx] == '0') { if (showbits[idx] == '0') {
uid1=(uid1<<1)|(uid2>>31); uid1 = (uid1<<1) | (uid2>>31);
uid2=(uid2<<1)|0; uid2 = (uid2<<1) | 0;
} else { } else {
uid1=(uid1<<1)|(uid2>>31); uid1 = (uid1<<1) | (uid2>>31);
uid2=(uid2<<1)|1; uid2 = (uid2<<1) | 1;
} }
} }
PrintAndLog("UID=%s (%x%08x)", showbits, uid1, uid2); PrintAndLog("UID=%s (%x%08x)", showbits, uid1, uid2);
} }
else { else {
uid3=0; uid3 = uid4 = uid5 = uid6 = uid7 = 0;
uid4=0;
uid5=0;
uid6=0;
uid7=0;
for( idx=0; idx<224; idx++) { for( idx=0; idx<224; idx++) {
uid1=(uid1<<1)|(uid2>>31); uid1 = (uid1<<1) | (uid2>>31);
uid2=(uid2<<1)|(uid3>>31); uid2 = (uid2<<1) | (uid3>>31);
uid3=(uid3<<1)|(uid4>>31); uid3 = (uid3<<1) | (uid4>>31);
uid4=(uid4<<1)|(uid5>>31); uid4 = (uid4<<1) | (uid5>>31);
uid5=(uid5<<1)|(uid6>>31); uid5 = (uid5<<1) | (uid6>>31);
uid6=(uid6<<1)|(uid7>>31); uid6 = (uid6<<1) | (uid7>>31);
if (showbits[idx] == '0') uid7=(uid7<<1)|0;
else uid7=(uid7<<1)|1; if (showbits[idx] == '0')
uid7 = (uid7<<1) | 0;
else
uid7 = (uid7<<1) | 1;
} }
PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7); PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
} }
// Checking UID against next occurrences // Checking UID against next occurrences
for (; i + uidlen <= rawbit;) {
int failed = 0; int failed = 0;
for (; i + uidlen <= rawbit;) {
failed = 0;
for (bit = 0; bit < uidlen; bit++) { for (bit = 0; bit < uidlen; bit++) {
if (bits[bit] != rawbits[i++]) { if (bits[bit] != rawbits[i++]) {
failed = 1; failed = 1;
@ -284,10 +290,13 @@ int CmdIndalaDemod(const char *Cmd)
} }
times += 1; times += 1;
} }
PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen); PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
// Remodulating for tag cloning // Remodulating for tag cloning
GraphTraceLen = 32*uidlen; // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod)
// since this changes graphbuffer data.
GraphTraceLen = 32 * uidlen;
i = 0; i = 0;
int phase = 0; int phase = 0;
for (bit = 0; bit < uidlen; bit++) { for (bit = 0; bit < uidlen; bit++) {
@ -309,15 +318,10 @@ int CmdIndalaDemod(const char *Cmd)
int CmdIndalaClone(const char *Cmd) int CmdIndalaClone(const char *Cmd)
{ {
unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
UsbCommand c; UsbCommand c;
uid1=0; unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
uid2=0;
uid3=0; uid1 = uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
uid4=0;
uid5=0;
uid6=0;
uid7=0;
int n = 0, i = 0; int n = 0, i = 0;
if (strchr(Cmd,'l') != 0) { if (strchr(Cmd,'l') != 0) {
@ -339,9 +343,7 @@ int CmdIndalaClone(const char *Cmd)
c.d.asDwords[4] = uid5; c.d.asDwords[4] = uid5;
c.d.asDwords[5] = uid6; c.d.asDwords[5] = uid6;
c.d.asDwords[6] = uid7; c.d.asDwords[6] = uid7;
} } else {
else
{
while (sscanf(&Cmd[i++], "%1x", &n ) == 1) { while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
uid1 = (uid1 << 4) | (uid2 >> 28); uid1 = (uid1 << 4) | (uid2 >> 28);
uid2 = (uid2 << 4) | (n & 0xf); uid2 = (uid2 << 4) | (n & 0xf);
@ -359,6 +361,7 @@ int CmdIndalaClone(const char *Cmd)
int CmdLFRead(const char *Cmd) int CmdLFRead(const char *Cmd)
{ {
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K}; UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
// 'h' means higher-low-frequency, 134 kHz // 'h' means higher-low-frequency, 134 kHz
if(*Cmd == 'h') { if(*Cmd == 'h') {
c.arg[0] = 1; c.arg[0] = 1;
@ -373,9 +376,7 @@ int CmdLFRead(const char *Cmd)
SendCommand(&c); SendCommand(&c);
WaitForResponse(CMD_ACK,NULL); WaitForResponse(CMD_ACK,NULL);
// load samples
CmdSamples(""); CmdSamples("");
// show plot
ShowGraphWindow(); ShowGraphWindow();
return 0; return 0;
} }
@ -385,10 +386,8 @@ static void ChkBitstream(const char *str)
int i; int i;
/* convert to bitstream if necessary */ /* convert to bitstream if necessary */
for (i = 0; i < (int)(GraphTraceLen / 2); i++) for (i = 0; i < (int)(GraphTraceLen / 2); i++){
{ if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0)
{
CmdBitstream(str); CmdBitstream(str);
break; break;
} }
@ -398,7 +397,6 @@ static void ChkBitstream(const char *str)
int CmdLFSim(const char *Cmd) int CmdLFSim(const char *Cmd)
{ {
int i,j; int i,j;
static int gap; static int gap;
sscanf(Cmd, "%i", &gap); sscanf(Cmd, "%i", &gap);
@ -417,6 +415,7 @@ int CmdLFSim(const char *Cmd)
WaitForResponse(CMD_ACK,NULL); WaitForResponse(CMD_ACK,NULL);
printf("."); printf(".");
} }
printf("\n"); printf("\n");
PrintAndLog("Starting to simulate"); PrintAndLog("Starting to simulate");
UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}}; UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
@ -426,7 +425,9 @@ int CmdLFSim(const char *Cmd)
int CmdLFSimBidir(const char *Cmd) int CmdLFSimBidir(const char *Cmd)
{ {
/* Set ADC to twice the carrier for a slight supersampling */ // Set ADC to twice the carrier for a slight supersampling
// HACK: not implemented in ARMSRC.
PrintAndLog("Not implemented yet.");
UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}}; UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
SendCommand(&c); SendCommand(&c);
return 0; return 0;
@ -438,23 +439,17 @@ int CmdLFSimManchester(const char *Cmd)
static int clock, gap; static int clock, gap;
static char data[1024], gapstring[8]; static char data[1024], gapstring[8];
/* get settings/bits */
sscanf(Cmd, "%i %s %i", &clock, &data[0], &gap); sscanf(Cmd, "%i %s %i", &clock, &data[0], &gap);
/* clear our graph */
ClearGraph(0); ClearGraph(0);
/* fill it with our bitstream */
for (int i = 0; i < strlen(data) ; ++i) for (int i = 0; i < strlen(data) ; ++i)
AppendGraph(0, clock, data[i]- '0'); AppendGraph(0, clock, data[i]- '0');
/* modulate */
CmdManchesterMod(""); CmdManchesterMod("");
/* show what we've done */
RepaintGraphWindow(); RepaintGraphWindow();
/* simulate */
sprintf(&gapstring[0], "%i", gap); sprintf(&gapstring[0], "%i", gap);
CmdLFSim(gapstring); CmdLFSim(gapstring);
return 0; return 0;
@ -474,24 +469,22 @@ int CmdLFSnoop(const char *Cmd)
c.arg[0] = 1; c.arg[0] = 1;
sscanf(Cmd, "h %"lli, &c.arg[1]); sscanf(Cmd, "h %"lli, &c.arg[1]);
} else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) { } else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) {
PrintAndLog("use 'snoop' or 'snoop {l,h} [trigger threshold]', or 'snoop <divisor> [trigger threshold]'"); PrintAndLog("usage 1: snoop");
PrintAndLog(" 2: snoop {l,h} [trigger threshold]");
PrintAndLog(" 3: snoop <divisor> [trigger threshold]");
return 0; return 0;
} }
SendCommand(&c); SendCommand(&c);
WaitForResponse(CMD_ACK,NULL); WaitForResponse(CMD_ACK,NULL);
size_t BUFF_SIZE = 8000; #define BUFF_SIZE 8000
uint8_t data[BUFF_SIZE]; uint8_t data[BUFF_SIZE] = {0x00};
GetFromBigBuf(data,BUFF_SIZE,0); //3560 -- should be offset.. GetFromBigBuf(data,BUFF_SIZE,0);
WaitForResponseTimeout(CMD_ACK,NULL, 1500); WaitForResponseTimeout(CMD_ACK,NULL, 1500);
for (int j = 0; j < BUFF_SIZE; j++) { SetGraphBuf(data, BUFF_SIZE);
GraphBuffer[j] = ((int)data[j]);
}
GraphTraceLen = BUFF_SIZE;
return 0; return 0;
} }
@ -596,20 +589,26 @@ int CmdLFfind(const char *Cmd)
PrintAndLog("Checking for known tags:"); PrintAndLog("Checking for known tags:");
ans=Cmdaskmandemod(""); ans = Cmdaskmandemod("");
PrintAndLog("ASK_MAN: %s", (ans)?"YES":"NO" ); PrintAndLog("ASK_MAN: %s", (ans) ? "YES":"NO" );
ans=CmdFSKdemodHID(""); ans = CmdFSKdemodHID("");
PrintAndLog("HID: %s", (ans)?"YES":"NO" ); PrintAndLog("HID: %s", (ans) ? "YES":"NO" );
ans=CmdFSKdemodIO(""); ans = CmdFSKdemodIO("");
PrintAndLog("IO prox: %s", (ans)?"YES":"NO" ); PrintAndLog("IO prox: %s", (ans) ? "YES":"NO" );
ans=CmdIndalaDemod(""); ans = CmdIndalaDemod("");
PrintAndLog("Indala (64): %s", (ans)?"YES":"NO" ); PrintAndLog("Indala (64): %s", (ans) ? "YES":"NO" );
ans=CmdIndalaDemod("224"); ans = CmdIndalaDemod("224");
PrintAndLog("Indala (224): %s", (ans)?"YES":"NO" ); PrintAndLog("Indala (224): %s", (ans) ? "YES":"NO" );
// ans = CmdVchDemod("");
// PrintAndLog("VeriChip: %s", (ans) ? "YES":"NO" );
// ans = CmdFlexdemod("");
// PrintAndLog("FlexPass: %s", (ans) ? "YES":"NO" );
if (!ans) if (!ans)
PrintAndLog("No Known Tags Found!\n"); PrintAndLog("No Known Tags Found!\n");

2
common/lfdemod.c
View file

@ -538,8 +538,6 @@ int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t
size = fsk_wave_demod(dest, size, fchigh, fclow); size = fsk_wave_demod(dest, size, fchigh, fclow);
if ( size > 0 ) if ( size > 0 )
size = aggregate_bits(dest, size, rfLen, 192, invert, fchigh, fclow); size = aggregate_bits(dest, size, rfLen, 192, invert, fchigh, fclow);
else
return -1;
return size; return size;
} }