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

textual output

Browse source
This commit is contained in:
iceman1001 2018-02-28 08:12:21 +01:00
commit 97c029fc55
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdlf.c
View file

@ -865,7 +865,9 @@ int CmdLFfind(const char *Cmd) {
signal_t *sp = getSignalProperties(); signal_t *sp = getSignalProperties();
if (sp->isnoise) { if (sp->isnoise) {
PrintAndLogEx(NORMAL, "Signal looks just like noise. Looking for Hitag signal now."); PrintAndLogEx(NORMAL, "Signal looks just like noise. Looking for Hitag signal now.");
// 26 === RHT2F_UID_ONLY
if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(NORMAL, "\nValid Hitag Found!"); return 1;} if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(NORMAL, "\nValid Hitag Found!"); return 1;}
if (CmdCOTAGRead("") > 0) { PrintAndLogEx(NORMAL, "\nValid COTAG ID Found!"); return 1;} if (CmdCOTAGRead("") > 0) { PrintAndLogEx(NORMAL, "\nValid COTAG ID Found!"); return 1;}
return 0; return 0;

4
client/cmdlfem4x.c
View file

@ -1141,7 +1141,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
PrintAndLogEx(WARNING, "Command timed out"); PrintAndLogEx(DEBUG, "Command timed out");
return -1; return -1;
} }
if ( !downloadSamplesEM() ) { if ( !downloadSamplesEM() ) {
@ -1150,7 +1150,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000; int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
if (justNoise_int(GraphBuffer, testLen)) { if (justNoise_int(GraphBuffer, testLen)) {
PrintAndLogEx(WARNING, "No tag found"); PrintAndLogEx(DEBUG, "No tag found");
return -1; return -1;
} }
return demodEM4x05resp(word); return demodEM4x05resp(word);

1
client/cmdlfhitag.c
View file

@ -66,6 +66,7 @@ int CmdLFHitagList(const char *Cmd) {
FILE* f = NULL; FILE* f = NULL;
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, Cmd, len); memcpy(filename, Cmd, len);
if (strlen(filename) > 0) { if (strlen(filename) > 0) {