github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

a couple em4x05 fixes.

Browse source
This commit is contained in:
marshmellow42 2017-02-16 13:57:14 -05:00
parent 59f726c989
commit 2d99d9912c
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/cmdlfem4x.c
View file

@ -514,17 +514,17 @@ int usage_lf_em_read(void) {
} }
//search for given preamble in given BitStream and return success=1 or fail=0 and startIndex //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex
uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx) uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx) {
{
// Sanity check. If preamble length is bigger than bitstream length. // Sanity check. If preamble length is bigger than bitstream length.
if ( size <= pLen ) return 0; if ( size <= pLen ) return 0;
// em only sends preamble once, so look for it once in the first x bits // em only sends preamble once, so look for it once in the first x bits
uint8_t foundCnt = 0; uint8_t foundCnt = 0;
for (int idx = 0; idx < size - pLen; idx++){ for (size_t idx = 0; idx < size - pLen; idx++){
if (memcmp(BitStream+idx, preamble, pLen) == 0){ if (memcmp(BitStream+idx, preamble, pLen) == 0){
//first index found //first index found
foundCnt++; foundCnt++;
if (foundCnt == 1) { if (foundCnt == 1) {
if (g_debugMode) PrintAndLog("DEBUG: preamble found at %u", idx);
*startIdx = idx; *startIdx = idx;
return 1; return 1;
} }
@ -542,6 +542,7 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
DemodBufferLen = 0x00; DemodBufferLen = 0x00;
// skip first two 0 bits as they might have been missed in the demod // skip first two 0 bits as they might have been missed in the demod
uint8_t preamble[6] = {0,0,1,0,1,0}; uint8_t preamble[6] = {0,0,1,0,1,0};
size_t startIdx = 0;
// test for FSK wave (easiest to 99% ID) // test for FSK wave (easiest to 99% ID)
if (GetFskClock("", FALSE, FALSE)) { if (GetFskClock("", FALSE, FALSE)) {
@ -552,11 +553,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
} else { } else {
// set size to 10 to only test first 4 positions for the preamble // set size to 10 to only test first 4 positions for the preamble
size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10; size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
size_t startIdx = 0; startIdx = 0;
if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size); if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx); uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
if ( errChk == 0) { if ( errChk == 0) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx); if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
} else { } else {
@ -577,18 +578,19 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
// more common than biphase // more common than biphase
if (!demodFound) { if (!demodFound) {
DemodBufferLen = 0x00; DemodBufferLen = 0x00;
bool stcheck = false;
// try manchester - NOTE: ST only applies to T55x7 tags. // try manchester - NOTE: ST only applies to T55x7 tags.
ans = ASKDemod_ext("0,0,1", false, false, 1, false); ans = ASKDemod_ext("0,0,1", false, false, 1, &stcheck);
if (!ans) { if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed"); if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
} else { } else {
// set size to 10 to only test first 4 positions for the preamble // set size to 10 to only test first 4 positions for the preamble
size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10; size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
size_t startIdx = 0; startIdx = 0;
if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size); if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx); uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
if ( errChk == 0) { if ( errChk == 0) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx); if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
} else { } else {
@ -608,11 +610,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
} else { } else {
// set size to 10 to only test first 4 positions for the preamble // set size to 10 to only test first 4 positions for the preamble
size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10; size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
size_t startIdx = 0; startIdx = 0;
if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size); if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx); uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
if ( errChk == 0) { if ( errChk == 0) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx); if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
} else { } else {
@ -632,11 +634,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
} else { } else {
// set size to 10 to only test first 4 positions for the preamble // set size to 10 to only test first 4 positions for the preamble
size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10; size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
size_t startIdx = 0; startIdx = 0;
if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size); if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx); uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
if ( errChk == 0) { if ( errChk == 0) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx); if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
} else { } else {
@ -649,7 +651,7 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
if (demodFound && bitsNeeded < DemodBufferLen) { if (demodFound && bitsNeeded < DemodBufferLen) {
if (bitsNeeded > 0) { if (bitsNeeded > 0) {
setDemodBuf(DemodBuffer + ans + sizeof(preamble), bitsNeeded, 0); setDemodBuf(DemodBuffer + startIdx + sizeof(preamble), bitsNeeded, 0);
CmdPrintDemodBuff("x"); CmdPrintDemodBuff("x");
} }
return 1; return 1;
@ -701,7 +703,7 @@ int CmdReadWord(const char *Cmd) {
//attempt demod: //attempt demod:
//need 32 bits from a read word //need 32 bits from a read word
return demodEM4x05resp(32); return demodEM4x05resp(44);
} }
int usage_lf_em_write(void) { int usage_lf_em_write(void) {

5
client/graph.c
View file

@ -14,6 +14,7 @@
#include "ui.h" #include "ui.h"
#include "graph.h" #include "graph.h"
#include "lfdemod.h" #include "lfdemod.h"
#include "cmddata.h" //for g_debugmode
int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphBuffer[MAX_GRAPH_TRACE_LEN];
int GraphTraceLen; int GraphTraceLen;
@ -255,7 +256,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
if (size==0) return 0; if (size==0) return 0;
uint16_t ans = countFC(BitStream, size, 1); uint16_t ans = countFC(BitStream, size, 1);
if (ans==0) { if (ans==0) {
if (verbose) PrintAndLog("DEBUG: No data found"); if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
return 0; return 0;
} }
*fc1 = (ans >> 8) & 0xFF; *fc1 = (ans >> 8) & 0xFF;
@ -263,7 +264,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
*rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
if (*rf1==0) { if (*rf1==0) {
if (verbose) PrintAndLog("DEBUG: Clock detect error"); if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
return 0; return 0;
} }
return 1; return 1;

4
common/lfdemod.c
View file

@ -1375,10 +1375,10 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj)
uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
uint8_t fcLensFnd = 0; uint8_t fcLensFnd = 0;
uint8_t lastFCcnt=0; uint8_t lastFCcnt = 0;
uint8_t fcCounter = 0; uint8_t fcCounter = 0;
size_t i; size_t i;
if (size == 0) return 0; if (size < 180) return 0;
// prime i to first up transition // prime i to first up transition
for (i = 160; i < size-20; i++) for (i = 160; i < size-20; i++)