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

CHG: temporary disable hitag2_uid detection. Loop times out sometimes.

Browse source
This commit is contained in:
iceman1001 2017-01-31 22:38:02 +01:00
commit bdf387c7ef
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdlf.c
View file

@ -556,7 +556,7 @@ int CmdLFRead(const char *Cmd) {
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}}; UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { if ( !WaitForResponseTimeout(CMD_ACK, NULL ,2500) ) {
PrintAndLog("command execution time out"); PrintAndLog("command execution time out");
return 1; return 1;
} }
@ -1011,7 +1011,7 @@ int CmdLFfind(const char *Cmd) {
if (!offline && (cmdp != '1')){ if (!offline && (cmdp != '1')){
CmdLFRead("s"); CmdLFRead("s");
getSamples("30000", TRUE); getSamples("30000", false);
} else if (GraphTraceLen < 1000) { } else if (GraphTraceLen < 1000) {
PrintAndLog("Data in Graphbuffer was too small."); PrintAndLog("Data in Graphbuffer was too small.");
return 0; return 0;
@ -1119,12 +1119,14 @@ int CmdLFfind(const char *Cmd) {
} }
// TIdemod? // TIdemod?
/*
if (!offline && (cmdp != '1')){ if (!offline && (cmdp != '1')){
ans=CmdLFHitagReader("26"); ans=CmdLFHitagReader("26");
if (ans==0) { if (ans==0) {
return 1; return 1;
} }
} }
*/
PrintAndLog("\nNo Known Tags Found!\n"); PrintAndLog("\nNo Known Tags Found!\n");
if (testRaw=='u' || testRaw=='U'){ if (testRaw=='u' || testRaw=='U'){

5
client/cmdlfcotag.c
View file

@ -19,11 +19,10 @@ int CmdCOTAGRead(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) { if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
//PrintAndLog("command execution time out"); PrintAndLog("command execution time out");
return 1; return 1;
} }
getSamples("", true); getSamples("20000", true);
//return CmdFSKdemodAWID(Cmd);
return 0; return 0;
} }

30
client/cmdlfhitag.c
View file

@ -195,9 +195,9 @@ int CmdLFHitagSim(const char *Cmd) {
int CmdLFHitagReader(const char *Cmd) { int CmdLFHitagReader(const char *Cmd) {
UsbCommand c = {CMD_READER_HITAG};//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}}; UsbCommand c = {CMD_READER_HITAG, {0,0,0} };//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
hitag_data* htd = (hitag_data*)c.d.asBytes; hitag_data* htd = (hitag_data*)c.d.asBytes;
hitag_function htf = param_get32ex(Cmd,0,0,10); hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
switch (htf) { switch (htf) {
case 01: { //RHTSF_CHALLENGE case 01: { //RHTSF_CHALLENGE
@ -249,7 +249,7 @@ int CmdLFHitagReader(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
WaitForResponse(CMD_ACK,&resp); WaitForResponse(CMD_ACK, &resp);
// Check the return status, stored in the first argument // Check the return status, stored in the first argument
if (resp.arg[0] == false) return 1; if (resp.arg[0] == false) return 1;
@ -259,19 +259,19 @@ int CmdLFHitagReader(const char *Cmd) {
if (htf == RHT2F_UID_ONLY){ if (htf == RHT2F_UID_ONLY){
PrintAndLog("Valid Hitag2 tag found - UID: %08x",id); PrintAndLog("Valid Hitag2 tag found - UID: %08x",id);
} else { } else {
char filename[FILE_PATH_SIZE]; char filename[FILE_PATH_SIZE];
FILE* f = NULL; FILE* f = NULL;
sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff)); sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff));
f = fopen(filename,"wb"); f = fopen(filename,"wb");
if (!f) { if (!f) {
PrintAndLog("Error: Could not open file [%s]",filename); PrintAndLog("Error: Could not open file [%s]",filename);
return 1; return 1;
} }
// Write the 48 tag memory bytes to file and finalize // Write the 48 tag memory bytes to file and finalize
fwrite(resp.d.asBytes, 1, 48, f); fwrite(resp.d.asBytes, 1, 48, f);
fclose(f); fclose(f);
PrintAndLog("Succesfully saved tag memory to [%s]",filename); PrintAndLog("Succesfully saved tag memory to [%s]",filename);
} }
return 0; return 0;
} }