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

less false positives with indala. Check ratio of zeros in demod.

Browse source
This commit is contained in:
iceman1001 2022-03-23 23:03:23 +01:00
commit cdf079a0c1
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdlf.c
View file

@ -1518,9 +1518,9 @@ int CmdLFfind(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(FAILED, _RED_("No data found!")); PrintAndLogEx(FAILED, _RED_("No data found!"));
PrintAndLogEx(INFO, "Signal looks like noise. Maybe not an LF tag?"); PrintAndLogEx(HINT, "Maybe not an LF tag?");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
if (! search_cont) { if (search_cont == 0) {
return PM3_ESOFT; return PM3_ESOFT;
} }
} }

19
client/src/cmdlfindala.c
View file

@ -159,6 +159,20 @@ int demodIndalaEx(int clk, int invert, int maxErr, bool verbose) {
//uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF) | (uid2 & 0x7FFFFFFF); //uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF) | (uid2 & 0x7FFFFFFF);
uint64_t foo = uid2 & 0x7FFFFFFF; uint64_t foo = uid2 & 0x7FFFFFFF;
// to reduce false_positives
// let's check the ratio of zeros in the demod buffer.
size_t cnt_zeros = 0;
for (size_t i=0; i< g_DemodBufferLen; i++) {
if (g_DemodBuffer[i] == 0x00)
++cnt_zeros;
}
// if more than 95% zeros in the demodbuffer then assume its wrong
int32_t stats = (int32_t)((cnt_zeros * 100 / g_DemodBufferLen));
if ( stats > 95) {
return PM3_ESOFT;
}
if (g_DemodBufferLen == 64) { if (g_DemodBufferLen == 64) {
PrintAndLogEx(SUCCESS, "Indala (len %zu) Raw: " _GREEN_("%x%08x"), g_DemodBufferLen, uid1, uid2); PrintAndLogEx(SUCCESS, "Indala (len %zu) Raw: " _GREEN_("%x%08x"), g_DemodBufferLen, uid1, uid2);
@ -226,6 +240,11 @@ int demodIndalaEx(int clk, int invert, int maxErr, bool verbose) {
decodeHeden2L(g_DemodBuffer); decodeHeden2L(g_DemodBuffer);
} else { } else {
if (g_DemodBufferLen != 224) {
PrintAndLogEx(INFO, "Odd size, false positive?");
}
uint32_t uid3 = bytebits_to_byte(g_DemodBuffer + 64, 32); uint32_t uid3 = bytebits_to_byte(g_DemodBuffer + 64, 32);
uint32_t uid4 = bytebits_to_byte(g_DemodBuffer + 96, 32); uint32_t uid4 = bytebits_to_byte(g_DemodBuffer + 96, 32);
uint32_t uid5 = bytebits_to_byte(g_DemodBuffer + 128, 32); uint32_t uid5 = bytebits_to_byte(g_DemodBuffer + 128, 32);