X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/56d0fb8e4d4f4a963928de36a12c519a09673bd1..a0a61c91ccefed75187e810cca0e3bcb319ecdcf:/client/cmddata.c?ds=sidebyside diff --git a/client/cmddata.c b/client/cmddata.c index 378fb78f..1e7947ff 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -26,8 +26,8 @@ #include "loclass/cipherutils.h" // for decimating samples in getsamples uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; -uint8_t g_debugMode=0; -size_t DemodBufferLen=0; +uint8_t g_debugMode = 0; +size_t DemodBufferLen = 0; static int CmdHelp(const char *Cmd); int usage_data_printdemodbuf(void){ @@ -253,19 +253,17 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx) if ( size >= MAX_DEMOD_BUF_LEN) size = MAX_DEMOD_BUF_LEN; - - size_t i = 0; - for (; i < size; i++){ + + for (size_t i = 0; i < size; i++) DemodBuffer[i]=buff[startIdx++]; - } + DemodBufferLen = size; } -int CmdSetDebugMode(const char *Cmd) -{ - int demod=0; +int CmdSetDebugMode(const char *Cmd) { + int demod = 0; sscanf(Cmd, "%i", &demod); - g_debugMode=(uint8_t)demod; + g_debugMode = (uint8_t)demod; return 1; } @@ -458,23 +456,36 @@ void printEM410x(uint32_t hi, uint64_t id) int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) { size_t idx = 0; - size_t BitLen = DemodBufferLen; + size_t size = DemodBufferLen; uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - memcpy(BitStream, DemodBuffer, BitLen); - if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){ - //set GraphBuffer for clone or sim command - setDemodBuf(BitStream, BitLen, idx); + memcpy(BitStream, DemodBuffer, size); + int ans = Em410xDecode(BitStream, &size, &idx, hi, lo); + if ( ans < 0){ if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); - printDemodBuff(); - } - if (verbose){ - PrintAndLog("EM410x pattern found: "); - printEM410x(*hi, *lo); + + 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"); } - return 1; + return 0; } - return 0; + + //set GraphBuffer for clone or sim command + setDemodBuf(BitStream, size, idx); + if (g_debugMode){ + PrintAndLog("DEBUG: Em410x 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) @@ -704,11 +715,11 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) //attempt to Biphase decode BitStream errCnt = BiphaseRawDecode(BitStream, &size, offset, invert); if (errCnt < 0){ - if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); + if (g_debugMode || verbose) PrintAndLog("DEBUG: Error BiphaseRawDecode: %d", errCnt); return 0; } if (errCnt > maxErr) { - if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt); + if (g_debugMode || verbose) PrintAndLog("DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt); return 0; } //success set DemodBuffer and return @@ -737,14 +748,14 @@ int Cmdaskbiphdemod(const char *Cmd) int CmdG_Prox_II_Demod(const char *Cmd) { if (!ASKbiphaseDemod(Cmd, FALSE)){ - if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try"); + if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII ASKbiphaseDemod failed 1st try"); return 0; } size_t size = DemodBufferLen; //call lfdemod.c demod for gProxII int ans = gProxII_Demod(DemodBuffer, &size); if (ans < 0){ - if (g_debugMode) PrintAndLog("Error gProxII_Demod"); + if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII demod"); return 0; } //got a good demod of 96 bits @@ -758,14 +769,14 @@ int CmdG_Prox_II_Demod(const char *Cmd) // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72)) size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run if (bitLen != 72) { - if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx); + if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx); return 0; } // get key and then get all 8 bytes of payload decoded xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8); for (size_t idx = 0; idx < 8; idx++) { ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey; - if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]); + if (g_debugMode) PrintAndLog("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]); } //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data // @@ -799,14 +810,14 @@ int CmdG_Prox_II_Demod(const char *Cmd) int CmdVikingDemod(const char *Cmd) { if (!ASKDemod(Cmd, false, false, 1)) { - if (g_debugMode) PrintAndLog("ASKDemod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Viking ASKDemod failed"); return 0; } size_t size = DemodBufferLen; //call lfdemod.c demod for Viking int ans = VikingDemod_AM(DemodBuffer, &size); if (ans < 0) { - if (g_debugMode) PrintAndLog("Error Viking_Demod %d %s", ans, (ans == -5)?"[chksum error]":""); + if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":""); return 0; } //got a good demod @@ -969,17 +980,17 @@ int CmdUndec(const char *Cmd) //shift graph zero up or down based on input + or - int CmdGraphShiftZero(const char *Cmd) { - int shift=0; + int shift = 0, shiftedVal = 0; //set options from parameters entered with the command sscanf(Cmd, "%i", &shift); - int shiftedVal=0; + for(int i = 0; i127) - shiftedVal=127; - else if (shiftedVal<-127) - shiftedVal=-127; - GraphBuffer[i]= shiftedVal; + if (shiftedVal > 127) + shiftedVal = 127; + else if (shiftedVal < -127) + shiftedVal = -127; + GraphBuffer[i] = shiftedVal; } CmdNorm(""); return 0; @@ -1151,21 +1162,21 @@ int CmdFSKdemodHID(const char *Cmd) if (idx<0){ if (g_debugMode){ if (idx==-1){ - PrintAndLog("DEBUG: Just Noise Detected"); + PrintAndLog("DEBUG: Error - HID just noise detected"); } else if (idx == -2) { - PrintAndLog("DEBUG: Error demoding fsk"); + PrintAndLog("DEBUG: Error - HID problem during FSK demod"); } else if (idx == -3) { - PrintAndLog("DEBUG: Preamble not found"); + PrintAndLog("DEBUG: Error - HID preamble not found"); } else if (idx == -4) { - PrintAndLog("DEBUG: Error in Manchester data, SIZE: %d", BitLen); + PrintAndLog("DEBUG: Error - HID error in Manchester data, SIZE: %d", BitLen); } else { - PrintAndLog("DEBUG: Error demoding fsk %d", idx); + PrintAndLog("DEBUG: Error - HID error demoding fsk %d", idx); } } return 0; } if (hi2==0 && hi==0 && lo==0) { - if (g_debugMode) PrintAndLog("DEBUG: Error - no values found"); + if (g_debugMode) PrintAndLog("DEBUG: Error - HID no values found"); return 0; } if (hi2 != 0){ //extra large HID tags @@ -1215,7 +1226,7 @@ int CmdFSKdemodHID(const char *Cmd) } setDemodBuf(BitStream,BitLen,idx); if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); + PrintAndLog("DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); printDemodBuff(); } return 1; @@ -1237,21 +1248,21 @@ int CmdFSKdemodParadox(const char *Cmd) if (idx<0){ if (g_debugMode){ if (idx==-1){ - PrintAndLog("DEBUG: Just Noise Detected"); + PrintAndLog("DEBUG: Error - Paradox just noise detected"); } else if (idx == -2) { - PrintAndLog("DEBUG: Error demoding fsk"); + PrintAndLog("DEBUG: Error - Paradox error demoding fsk"); } else if (idx == -3) { - PrintAndLog("DEBUG: Preamble not found"); + PrintAndLog("DEBUG: Error - Paradox preamble not found"); } else if (idx == -4) { - PrintAndLog("DEBUG: Error in Manchester data"); + PrintAndLog("DEBUG: Error - Paradox error in Manchester data"); } else { - PrintAndLog("DEBUG: Error demoding fsk %d", idx); + PrintAndLog("DEBUG: Error - Paradox error demoding fsk %d", idx); } } return 0; } if (hi2==0 && hi==0 && lo==0){ - if (g_debugMode) PrintAndLog("DEBUG: Error - no value found"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Paradox no value found"); return 0; } uint32_t fc = ((hi & 0x3)<<6) | (lo>>26); @@ -1264,7 +1275,7 @@ int CmdFSKdemodParadox(const char *Cmd) hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo); setDemodBuf(BitStream,BitLen,idx); if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen); + PrintAndLog("DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen); printDemodBuff(); } return 1; @@ -1275,42 +1286,46 @@ int CmdFSKdemodParadox(const char *Cmd) //print ioprox ID and some format details int CmdFSKdemodIO(const char *Cmd) { - int idx=0; + int retval = 0; + int idx = 0; + char crcStr[20]; + memset(crcStr, 0x00, sizeof(crcStr) ); + //something in graphbuffer? if (GraphTraceLen < 65) { - if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer"); - return 0; + if (g_debugMode)PrintAndLog("DEBUG: Error - IO prox not enough samples in GraphBuffer"); + return retval; } uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - size_t BitLen = getFromGraphBuf(BitStream); - if (BitLen==0) return 0; + size_t bitlen = getFromGraphBuf(BitStream); + if (bitlen == 0) return retval; //get binary from fsk wave - idx = IOdemodFSK(BitStream,BitLen); + idx = IOdemodFSK(BitStream, bitlen); if (idx<0){ if (g_debugMode){ if (idx==-1){ - PrintAndLog("DEBUG: Just Noise Detected"); + PrintAndLog("DEBUG: Error - IO prox just noise detected"); } else if (idx == -2) { - PrintAndLog("DEBUG: not enough samples"); + PrintAndLog("DEBUG: Error - IO prox not enough samples"); } else if (idx == -3) { - PrintAndLog("DEBUG: error during fskdemod"); + PrintAndLog("DEBUG: Error - IO prox error during fskdemod"); } else if (idx == -4) { - PrintAndLog("DEBUG: Preamble not found"); + PrintAndLog("DEBUG: Error - IO prox preamble not found"); } else if (idx == -5) { - PrintAndLog("DEBUG: Separator bits not found"); + PrintAndLog("DEBUG: Error - IO prox separator bits not found"); } else { - PrintAndLog("DEBUG: Error demoding fsk %d", idx); + PrintAndLog("DEBUG: Error - IO prox error demoding fsk %d", idx); } } - return 0; + return retval; } if (idx==0){ if (g_debugMode){ - PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen); - if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16)); + PrintAndLog("DEBUG: Error - IO prox data not found - FSK Bits: %d", bitlen); + if (bitlen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16)); } - return 0; + return retval; } //Index map //0 10 20 30 40 50 60 @@ -1321,18 +1336,21 @@ int CmdFSKdemodIO(const char *Cmd) // //XSF(version)facility:codeone+codetwo (raw) //Handle the data - if (idx+64>BitLen) { - if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen); - return 0; + if (idx + 64 > bitlen) { + if (g_debugMode) PrintAndLog("DEBUG: Error - IO prox not enough bits found - bitlen: %d", bitlen); + return retval; } - PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx], BitStream[idx+1], BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]); - PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]); - PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]); - PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]); - PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]); - PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]); - PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]); - + + if (g_debugMode) { + PrintAndLog("%d%d%d%d%d%d%d%d %d", BitStream[idx], BitStream[idx+1], BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]); + PrintAndLog("%d%d%d%d%d%d%d%d %d", BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]); + PrintAndLog("%d%d%d%d%d%d%d%d %d facility", BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]); + PrintAndLog("%d%d%d%d%d%d%d%d %d version", BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]); + PrintAndLog("%d%d%d%d%d%d%d%d %d code1", BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]); + PrintAndLog("%d%d%d%d%d%d%d%d %d code2", BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]); + PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum", BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]); + } + uint32_t code = bytebits_to_byte(BitStream+idx,32); uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32); uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4 @@ -1341,21 +1359,29 @@ int CmdFSKdemodIO(const char *Cmd) uint8_t crc = bytebits_to_byte(BitStream+idx+54,8); uint16_t calccrc = 0; - for (uint8_t i=1; i<6; ++i){ - calccrc += bytebits_to_byte(BitStream+idx+9*i,8); + for (uint8_t i = 1; i < 6; ++i){ + calccrc += bytebits_to_byte(BitStream + idx + 9 * i ,8); } calccrc &= 0xff; calccrc = 0xff - calccrc; - char *crcStr = (crc == calccrc) ? "crc ok": "!crc"; + if (crc == calccrc) { + snprintf(crcStr, 3, "ok"); + retval = 1; + } else { + if (g_debugMode) PrintAndLog("DEBUG: Error - IO prox crc failed"); + + snprintf(crcStr, 20, "failed 0x%02X != 0x%02X", crc, calccrc); + retval = 0; + } - PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr); + PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]",version,facilitycode,number,code,code2, crcStr); setDemodBuf(BitStream,64,idx); if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64); + PrintAndLog("DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, 64); printDemodBuff(); - } - return 1; + } + return retval; } //by marshmellow @@ -1372,17 +1398,17 @@ int CmdFSKdemodAWID(const char *Cmd) if (idx<=0){ if (g_debugMode){ if (idx == -1) - PrintAndLog("DEBUG: Error - not enough samples"); + PrintAndLog("DEBUG: Error - AWID not enough samples"); else if (idx == -2) - PrintAndLog("DEBUG: Error - only noise found"); + PrintAndLog("DEBUG: Error - AWID only noise found"); else if (idx == -3) - PrintAndLog("DEBUG: Error - problem during FSK demod"); + PrintAndLog("DEBUG: Error - AWID problem during FSK demod"); else if (idx == -4) PrintAndLog("DEBUG: Error - AWID preamble not found"); else if (idx == -5) - PrintAndLog("DEBUG: Error - Size not correct: %d", size); + PrintAndLog("DEBUG: Error - AWID size not correct: %d", size); else - PrintAndLog("DEBUG: Error %d",idx); + PrintAndLog("DEBUG: Error - AWID error %d",idx); } return 0; } @@ -1408,7 +1434,7 @@ int CmdFSKdemodAWID(const char *Cmd) size = removeParity(BitStream, idx+8, 4, 1, 88); if (size != 66){ - if (g_debugMode) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format"); + if (g_debugMode) PrintAndLog("DEBUG: Error - AWID at parity check-tag size does not match AWID format"); return 0; } // ok valid card found! @@ -1434,6 +1460,7 @@ int CmdFSKdemodAWID(const char *Cmd) uint32_t code1 = 0; uint32_t code2 = 0; uint8_t fmtLen = bytebits_to_byte(BitStream, 8); + switch(fmtLen) { case 26: fc = bytebits_to_byte(BitStream + 9, 8); @@ -1441,6 +1468,22 @@ int CmdFSKdemodAWID(const char *Cmd) code1 = bytebits_to_byte(BitStream + 8,fmtLen); PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); break; + case 34: + fc = bytebits_to_byte(BitStream + 9, 8); + cardnum = bytebits_to_byte(BitStream + 17, 24); + code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) ); + code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32); + PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); + break; + case 37: + fc = bytebits_to_byte(BitStream + 9, 13); + cardnum = bytebits_to_byte(BitStream + 22, 18); + code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) ); + code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32); + PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); + break; + // case 40: + // break; case 50: fc = bytebits_to_byte(BitStream + 9, 16); cardnum = bytebits_to_byte(BitStream + 25, 32); @@ -1463,7 +1506,7 @@ int CmdFSKdemodAWID(const char *Cmd) } if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d Printing Demod Buffer:", idx, 96); + PrintAndLog("DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, 96); printDemodBuff(); } return 1; @@ -1484,17 +1527,17 @@ int CmdFSKdemodPyramid(const char *Cmd) if (idx < 0){ if (g_debugMode){ if (idx == -5) - PrintAndLog("DEBUG: Error - not enough samples"); + PrintAndLog("DEBUG: Error - Pyramid: not enough samples"); else if (idx == -1) - PrintAndLog("DEBUG: Error - only noise found"); + PrintAndLog("DEBUG: Error - Pyramid: only noise found"); else if (idx == -2) - PrintAndLog("DEBUG: Error - problem during FSK demod"); + PrintAndLog("DEBUG: Error - Pyramid: problem during FSK demod"); else if (idx == -3) - PrintAndLog("DEBUG: Error - Size not correct: %d", size); + PrintAndLog("DEBUG: Error - Pyramid: size not correct: %d", size); else if (idx == -4) - PrintAndLog("DEBUG: Error - Pyramid preamble not found"); + PrintAndLog("DEBUG: Error - Pyramid: preamble not found"); else - PrintAndLog("DEBUG: Error - idx: %d",idx); + PrintAndLog("DEBUG: Error - Pyramid: idx: %d",idx); } return 0; } @@ -1527,19 +1570,23 @@ int CmdFSKdemodPyramid(const char *Cmd) } //check checksum calc //checksum calc thanks to ICEMAN!! - uint32_t checkCS = CRC8Maxim(csBuff,13); + uint32_t checkCS = CRC8Maxim(csBuff, 13); //get raw ID before removing parities - uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32); - uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32); - uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32); - uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32); - setDemodBuf(BitStream,128,idx); + uint32_t rawLo = bytebits_to_byte(BitStream+idx+96, 32); + uint32_t rawHi = bytebits_to_byte(BitStream+idx+64, 32); + uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32, 32); + uint32_t rawHi3 = bytebits_to_byte(BitStream+idx, 32); + setDemodBuf(BitStream, 128, idx); size = removeParity(BitStream, idx+8, 8, 1, 120); if (size != 105){ - if (g_debugMode) - PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3); + if (g_debugMode) { + if ( size == 0) + PrintAndLog("DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3); + else + PrintAndLog("DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3); + } return 0; } @@ -1597,7 +1644,7 @@ int CmdFSKdemodPyramid(const char *Cmd) PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS); if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128); + PrintAndLog("DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128); printDemodBuff(); } return 1; @@ -1631,23 +1678,23 @@ int CmdFDXBdemodBI(const char *Cmd){ errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); if ( errCnt < 0 || errCnt > maxErr ) { - if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); + if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk); return 0; } errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1); if (errCnt < 0 || errCnt > maxErr ) { - if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); + if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt); return 0; } int preambleIndex = FDXBdemodBI(BitStream, &size); if (preambleIndex < 0){ - if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex); + if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB preamble not found :: %d",preambleIndex); return 0; } if (size != 128) { - if (g_debugMode) PrintAndLog("Error incorrect data length found"); + if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB incorrect data length found"); return 0; } @@ -1656,15 +1703,10 @@ int CmdFDXBdemodBI(const char *Cmd){ // remove marker bits (1's every 9th digit after preamble) (pType = 2) size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117); if ( size != 104 ) { - if (g_debugMode) PrintAndLog("Error removeParity:: %d", size); + if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB error removeParity:: %d", size); return 0; } - if (g_debugMode) { - char *bin = sprint_bin_break(BitStream,size,16); - PrintAndLog("DEBUG BinStream:\n%s",bin); - } PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:"); - if (g_debugMode) PrintAndLog("Start marker %d; Size %d", preambleIndex, size); //got a good demod uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32); @@ -1685,12 +1727,17 @@ int CmdFDXBdemodBI(const char *Cmd){ PrintAndLog("Animal ID: %04u-%012llu", countryCode, NationalCode); PrintAndLog("National Code: %012llu", NationalCode); PrintAndLog("CountryCode: %04u", countryCode); - PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False"); - PrintAndLog("reserved Code: %u", reservedCode); - PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False"); + + PrintAndLog("Reserved/RFU: %u", reservedCode); + PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False"); + PrintAndLog("Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended); PrintAndLog("CRC: 0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed"); - PrintAndLog("Extended: 0x%X\n", extended); - + + if (g_debugMode) { + PrintAndLog("Start marker %d; Size %d", preambleIndex, size); + char *bin = sprint_bin_break(BitStream,size,16); + PrintAndLog("DEBUG BinStream:\n%s",bin); + } return 1; } @@ -1756,8 +1803,7 @@ int CmdIndalaDecode(const char *Cmd) } if (!ans){ - if (g_debugMode) - PrintAndLog("Error1: %d",ans); + if (g_debugMode) PrintAndLog("DEBUG: Error - Indala can't demod signal: %d",ans); return 0; } @@ -1765,33 +1811,34 @@ int CmdIndalaDecode(const char *Cmd) size_t size = DemodBufferLen; int startIdx = indala26decode(DemodBuffer, &size, &invert); if (startIdx < 0 || size > 224) { - if (g_debugMode) - PrintAndLog("Error2: %d",ans); + if (g_debugMode) PrintAndLog("DEBUG: Error - Indala wrong size, expected [64|224] got: %d", size); return -1; } setDemodBuf(DemodBuffer, size, (size_t)startIdx); if (invert) - if (g_debugMode) - PrintAndLog("Had to invert bits"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Indala had to invert bits"); - PrintAndLog("BitLen: %d",DemodBufferLen); //convert UID to HEX uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7; - uid1=bytebits_to_byte(DemodBuffer,32); - uid2=bytebits_to_byte(DemodBuffer+32,32); + uid1 = bytebits_to_byte(DemodBuffer,32); + uid2 = bytebits_to_byte(DemodBuffer+32,32); if (DemodBufferLen==64){ - PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2); + PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x)\n%s", + DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32) + ); } else { - uid3=bytebits_to_byte(DemodBuffer+64,32); - uid4=bytebits_to_byte(DemodBuffer+96,32); - uid5=bytebits_to_byte(DemodBuffer+128,32); - uid6=bytebits_to_byte(DemodBuffer+160,32); - uid7=bytebits_to_byte(DemodBuffer+192,32); - PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", - sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7); + uid3 = bytebits_to_byte(DemodBuffer+64,32); + uid4 = bytebits_to_byte(DemodBuffer+96,32); + uid5 = bytebits_to_byte(DemodBuffer+128,32); + uid6 = bytebits_to_byte(DemodBuffer+160,32); + uid7 = bytebits_to_byte(DemodBuffer+192,32); + PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x%08x%08x%08x%08x%08x)\n%s", + DemodBufferLen, + uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer,DemodBufferLen,32) + ); } if (g_debugMode){ - PrintAndLog("DEBUG: printing demodbuffer:"); + PrintAndLog("DEBUG: Indala - printing demodbuffer:"); printDemodBuff(); } return 1; @@ -1833,7 +1880,7 @@ int CmdPSKNexWatch(const char *Cmd) //output PrintAndLog("NexWatch ID: %d", ID); if (invert){ - PrintAndLog("Had to Invert - probably NexKey"); + PrintAndLog("DEBUG: Error - NexWatch had to Invert - probably NexKey"); for (uint8_t idx=0; idx sizeof(got)) n = sizeof(got); - PrintAndLog("Reading %d bytes from device memory\n", n); + if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n); GetFromBigBuf(got,n,0); - PrintAndLog("Data fetched"); + if (!silent) PrintAndLog("Data fetched"); UsbCommand response; if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) { PrintAndLog("timeout while waiting for reply."); @@ -2090,12 +2137,12 @@ int getSamples(const char *Cmd, bool silent) //Old devices without this feature would send 0 at arg[0] if (response.arg[0] > 0) { sample_config *sc = (sample_config *) response.d.asBytes; - PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); + if (!silent) PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); bits_per_sample = sc->bits_per_sample; } if (bits_per_sample < 8) { - PrintAndLog("Unpacking..."); + if (!silent) PrintAndLog("Unpacking..."); BitstreamOut bout = { got, bits_per_sample * n, 0}; int j =0; for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) { @@ -2103,7 +2150,7 @@ int getSamples(const char *Cmd, bool silent) GraphBuffer[j] = ((int) sample )- 128; } GraphTraceLen = j; - PrintAndLog("Unpacked %d samples" , j ); + if (!silent) PrintAndLog("Unpacked %d samples" , j ); } else { for (int j = 0; j < n; j++) { GraphBuffer[j] = ((int)got[j]) - 128; @@ -2146,10 +2193,14 @@ int CmdTuneSamples(const char *Cmd) peakf = resp.arg[2] & 0xffff; peakv = resp.arg[2] >> 16; PrintAndLog(""); - PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); - PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); - PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); - PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); + if ( vLf125 > 0 ) + PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); + if ( vLf134 > 0 ) + PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); + if ( peakv > 0 && peakf > 0 ) + PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); + if ( vHf > 0 ) + PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); #define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher. #define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher. @@ -2199,7 +2250,10 @@ int CmdLoad(const char *Cmd) GraphBuffer[GraphTraceLen] = atoi(line); GraphTraceLen++; } - fclose(f); + if (f) { + fclose(f); + f = NULL; + } PrintAndLog("loaded %d samples", GraphTraceLen); RepaintGraphWindow(); return 0; @@ -2273,7 +2327,10 @@ int CmdSave(const char *Cmd) for (i = 0; i < GraphTraceLen; i++) { fprintf(f, "%d\n", GraphBuffer[i]); } - fclose(f); + if (f) { + fclose(f); + f = NULL; + } PrintAndLog("saved to '%s'", Cmd); return 0; }