dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new coverity scan complains..

Browse Source 
fix 'lf hitag'  bit comparisions wrong
fix 'standalone mode'  logically dead code
This commit is contained in:
iceman1001
2017-07-07 15:45:40 +02:00
parent 4406f4ee2a
commit 8bc17414fd
6 changed files with 150 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/cmdhf.c
View File

@@ -879,11 +879,6 @@ int CmdHFSearch(const char *Cmd){
PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
return ans;
}
ans = HF14BReader(false); //CmdHF14BReader("s");
if (ans) {
PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
return ans;
}
ans = HF15Reader("", false);
if (ans) {
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
@@ -899,6 +894,12 @@ int CmdHFSearch(const char *Cmd){
PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
return 1;
}
// 14b and iclass is the longest test (put last)
ans = HF14BReader(false); //CmdHF14BReader("s");
if (ans) {
PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
return ans;
}
ans = HFiClassReader("", false, false);
if (ans) {
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");

2
client/cmdhf14a.c
View File

@@ -719,7 +719,7 @@ static void waitCmd(uint8_t iSelect) {
UsbCommand resp;
uint16_t len = 0;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0] & 0xffff);
PrintAndLog("received %i octets", len);
if(!len)

5
client/default_keys.dic
View File

@@ -451,4 +451,7 @@ E241E8AFCBAF,
#
# Data from forum post
123F8888F322,
050908080008,
050908080008,
#
# Data from hoist
4f9f59c9c875,