github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: increased debug output for Em410x

Browse source
This commit is contained in:
iceman1001 2016-10-16 21:50:41 +02:00
commit da1f16d6ef
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/cmddata.c
View file

@ -458,23 +458,36 @@ void printEM410x(uint32_t hi, uint64_t id)
int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
{ {
size_t idx = 0; size_t idx = 0;
size_t BitLen = DemodBufferLen; size_t size = DemodBufferLen;
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
memcpy(BitStream, DemodBuffer, BitLen); memcpy(BitStream, DemodBuffer, size);
if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){ int ans = Em410xDecode(BitStream, &size, &idx, hi, lo);
//set GraphBuffer for clone or sim command if ( ans < 0){
setDemodBuf(BitStream, BitLen, idx);
if (g_debugMode){ if (g_debugMode){
PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
printDemodBuff(); if (ans == -1)
PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
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");
} }
if (verbose){ return 0;
PrintAndLog("EM410x pattern found: ");
printEM410x(*hi, *lo);
}
return 1;
} }
return 0;
//set GraphBuffer for clone or sim command
setDemodBuf(BitStream, size, idx);
if (g_debugMode){
PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
printDemodBuff();
}
if (verbose){
PrintAndLog("EM410x pattern found: ");
printEM410x(*hi, *lo);
}
return 1;
} }
int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

9
common/lfdemod.c
View file

@ -169,13 +169,13 @@ uint8_t preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_
//by marshmellow //by marshmellow
//takes 1s and 0s and searches for EM410x format - output EM ID //takes 1s and 0s and searches for EM410x format - output EM ID
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)
{ {
//no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future //no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future
// otherwise could be a void with no arguments // otherwise could be a void with no arguments
//set defaults //set defaults
uint32_t i = 0; uint32_t i = 0;
if (BitStream[1]>1) return 0; //allow only 1s and 0s if (BitStream[1]>1) return -1; //allow only 1s and 0s
// 111111111 bit pattern represent start of frame // 111111111 bit pattern represent start of frame
// include 0 in front to help get start pos // include 0 in front to help get start pos
@ -186,14 +186,15 @@ uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_
uint8_t FmtLen = 10; uint8_t FmtLen = 10;
*startIdx = 0; *startIdx = 0;
errChk = preambleSearch(BitStream, preamble, sizeof(preamble), size, startIdx); errChk = preambleSearch(BitStream, preamble, sizeof(preamble), size, startIdx);
if (errChk == 0 || *size < 64) return 0; if (errChk == 0 ) return -4;
if (*size < 64) return -3;
if (*size > 64) FmtLen = 22; if (*size > 64) FmtLen = 22;
*startIdx += 1; //get rid of 0 from preamble *startIdx += 1; //get rid of 0 from preamble
idx = *startIdx + 9; idx = *startIdx + 9;
for (i=0; i<FmtLen; i++){ //loop through 10 or 22 sets of 5 bits (50-10p = 40 bits or 88 bits) for (i=0; i<FmtLen; i++){ //loop through 10 or 22 sets of 5 bits (50-10p = 40 bits or 88 bits)
parityBits = bytebits_to_byte(BitStream+(i*5)+idx,5); parityBits = bytebits_to_byte(BitStream+(i*5)+idx,5);
//check even parity - quit if failed //check even parity - quit if failed
if (parityTest(parityBits, 5, 0) == 0) return 0; if (parityTest(parityBits, 5, 0) == 0) return -5;
//set uint64 with ID from BitStream //set uint64 with ID from BitStream
for (uint8_t ii=0; ii<4; ii++){ for (uint8_t ii=0; ii<4; ii++){
*hi = (*hi << 1) | (*lo >> 63); *hi = (*hi << 1) | (*lo >> 63);

2
common/lfdemod.h
View file

@ -45,7 +45,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t
//tag specific //tag specific
int AWIDdemodFSK(uint8_t *dest, size_t *size); 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 FDXBdemodBI(uint8_t *dest, size_t *size);
int gProxII_Demod(uint8_t BitStream[], 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); int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);