X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2d1885f1d15a55d0c6607ec8ad9cceab8f110480..6c283951062aaad9d0d1ba8670b02895047be438:/client/cmdlfnedap.c?ds=sidebyside diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c index 2aaae5db..9e6a624b 100644 --- a/client/cmdlfnedap.c +++ b/client/cmdlfnedap.c @@ -82,16 +82,11 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) { int CmdLFNedapDemod(const char *Cmd) { //raw ask demod no start bit finding just get binary from wave - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - size_t size = getFromGraphBuf(BitStream); - if (size==0) return 0; - - //get binary from ask wave if (!ASKbiphaseDemod("0 64 0 0", FALSE)) { if (g_debugMode) PrintAndLog("Error NEDAP: ASKbiphaseDemod failed"); return 0; } - size = DemodBufferLen; + size_t size = DemodBufferLen; int idx = NedapDemod(DemodBuffer, &size); if (idx < 0){ if (g_debugMode){ @@ -143,13 +138,13 @@ int CmdLFNedapDemod(const char *Cmd) { uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63); if ( firstParity != DemodBuffer[63] ) { PrintAndLog("1st 64bit parity check failed: %d|%d ", DemodBuffer[63], firstParity); - //return 0; + return 0; } uint8_t secondParity = GetParity( DemodBuffer+64, EVEN, 63); if ( secondParity != DemodBuffer[127] ) { PrintAndLog("2st 64bit parity check failed: %d|%d ", DemodBuffer[127], secondParity); - //return 0; + return 0; } // ok valid card found!