RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: lf search - em410x demod was a bit greedy.

Browse source
This commit is contained in:
iceman1001 2017-02-28 14:47:25 +01:00
parent 026ac759a5
commit a8fd088d8b
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/cmddata.c
View file

@ -364,7 +364,7 @@ int CmdGetBitStream(const char *Cmd)
//print 64 bit EM410x ID in multiple formats
void printEM410x(uint32_t hi, uint64_t id)
{
//if (!id && !hi) return;
if (!id && !hi) return;
PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
@ -471,11 +471,11 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
if (g_debugMode){
if (ans == -1)
PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
else if (ans == -2)
PrintAndLog("DEBUG: Error - Em410x preamble not found");
else if (ans == -3)
PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
else if (ans == -4)
PrintAndLog("DEBUG: Error - Em410x preamble not found");
else if (ans == -5)
PrintAndLog("DEBUG: Error - Em410x parity failed");
}
return 0;

11
common/lfdemod.c
View file

@ -203,10 +203,10 @@ size_t findModStart(uint8_t dest[], size_t size, uint8_t threshold_value, uint8_
//by marshmellow
//takes 1s and 0s and searches for EM410x format - output EM ID
// actually, no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future
uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo)
int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo)
{
// sanity check
if (BitStream[1] > 1) return 0;
if (BitStream[1] > 1) return -1;
uint8_t fmtlen;
*startIdx = 0;
@ -215,8 +215,8 @@ uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_
// include 0 in front to help get start pos
uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
if (!preambleSearch(BitStream, preamble, sizeof(preamble), size, startIdx))
return 0;
if (*size < 64) return 0;
return -2;
if (*size < 64) return -3;
fmtlen = (*size == 110) ? 22 : 10;
@ -236,8 +236,7 @@ uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_
*lo = ((uint64_t)(bytebits_to_byte(BitStream + 24, 32)) << 32) | (bytebits_to_byte(BitStream + 24 + 32, 32));
break;
}
default: return 0;
default: return -4;
}
return 1;
}

2
common/lfdemod.h
View file

@ -50,7 +50,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t
//tag specific
int AWIDdemodFSK(uint8_t *dest, size_t *size);
uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo);
int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo);
int FDXBdemodBI(uint8_t *dest, size_t *size);
int gProxII_Demod(uint8_t BitStream[], size_t *size);
int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);