X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/87c10b2a0f49b1542258b5a4ed6f83a125c5da8f..c24364a8a4932f51a9b9e255d2ed0c67b9e37c74:/client/cmddata.c diff --git a/client/cmddata.c b/client/cmddata.c index 1e7947ff..19e01d82 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -243,19 +243,25 @@ int usage_data_bin2hex(void){ PrintAndLog(" This function will ignore all characters not 1 or 0 (but stop reading on whitespace)"); return 0; } +int usage_data_buffclear(void){ + PrintAndLog("This function clears the bigbuff on deviceside"); + PrintAndLog("Usage: data buffclear [h]"); + PrintAndLog("Options:"); + PrintAndLog(" h This help"); + return 0; +} //set the demod buffer with given array of binary (one bit per byte) //by marshmellow void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx) { - if (buff == NULL) - return; + if (buff == NULL) return; - if ( size >= MAX_DEMOD_BUF_LEN) + if (size >= MAX_DEMOD_BUF_LEN) size = MAX_DEMOD_BUF_LEN; for (size_t i = 0; i < size; i++) - DemodBuffer[i]=buff[startIdx++]; + DemodBuffer[i] = buff[startIdx++]; DemodBufferLen = size; } @@ -271,21 +277,19 @@ int CmdSetDebugMode(const char *Cmd) { void printDemodBuff(void) { int bitLen = DemodBufferLen; - if (bitLen<1) { + if (bitLen < 1) { PrintAndLog("no bits found in demod buffer"); return; } - if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty + if (bitLen > 512) bitLen=512; //max output to 512 bits if we have more - should be plenty char *bin = sprint_bin_break(DemodBuffer, bitLen,16); PrintAndLog("%s",bin); - - return; } int CmdPrintDemodBuff(const char *Cmd) { - char hex[512]={0x00}; + char hex[512] = {0x00}; bool hexMode = false; bool errors = false; uint32_t offset = 0; //could be size_t but no param_get16... @@ -324,6 +328,11 @@ int CmdPrintDemodBuff(const char *Cmd) } //Validations if(errors) return usage_data_printdemodbuf(); + + if (DemodBufferLen == 0) { + PrintAndLog("Demodbuffer is empty"); + return 0; + } length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; int numBits = (length) & 0x00FFC; //make sure we don't exceed our string @@ -343,15 +352,10 @@ int CmdPrintDemodBuff(const char *Cmd) //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer int CmdGetBitStream(const char *Cmd) { - int i; CmdHpf(Cmd); - for (i = 0; i < GraphTraceLen; i++) { - if (GraphBuffer[i] >= 1) { - GraphBuffer[i] = 1; - } else { - GraphBuffer[i] = 0; - } - } + for (uint32_t i = 0; i < GraphTraceLen; i++) + GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0; + RepaintGraphWindow(); return 0; } @@ -360,95 +364,98 @@ int CmdGetBitStream(const char *Cmd) //print 64 bit EM410x ID in multiple formats void printEM410x(uint32_t hi, uint64_t id) { - if (id || hi){ - uint64_t iii=1; - uint64_t id2lo=0; - uint32_t ii=0; - uint32_t i=0; - for (ii=5; ii>0;ii--){ - for (i=0;i<8;i++){ - id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8))); - } + if (!id && !hi) return; + + PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" ); + + uint64_t iii=1; + uint64_t id2lo=0; + uint32_t ii=0; + uint32_t i=0; + for (ii=5; ii>0;ii--){ + for (i=0;i<8;i++){ + id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8))); } - if (hi){ - //output 88 bit em id - PrintAndLog("\nEM TAG ID : %06X%016llX", hi, id); - } else{ - //output 40 bit em id - PrintAndLog("\nEM TAG ID : %010llX", id); - PrintAndLog("Unique TAG ID : %010llX", id2lo); - PrintAndLog("\nPossible de-scramble patterns"); - PrintAndLog("HoneyWell IdentKey {"); - PrintAndLog("DEZ 8 : %08lld",id & 0xFFFFFF); - PrintAndLog("DEZ 10 : %010lld",id & 0xFFFFFFFF); - PrintAndLog("DEZ 5.5 : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF)); - PrintAndLog("DEZ 3.5A : %03lld.%05lld",(id>>32ll),(id & 0xFFFF)); - PrintAndLog("DEZ 3.5B : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF)); - PrintAndLog("DEZ 3.5C : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF)); - PrintAndLog("DEZ 14/IK2 : %014lld",id); - PrintAndLog("DEZ 15/IK3 : %015lld",id2lo); - PrintAndLog("DEZ 20/ZK : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld", - (id2lo & 0xf000000000) >> 36, - (id2lo & 0x0f00000000) >> 32, - (id2lo & 0x00f0000000) >> 28, - (id2lo & 0x000f000000) >> 24, - (id2lo & 0x0000f00000) >> 20, - (id2lo & 0x00000f0000) >> 16, - (id2lo & 0x000000f000) >> 12, - (id2lo & 0x0000000f00) >> 8, - (id2lo & 0x00000000f0) >> 4, - (id2lo & 0x000000000f) - ); - uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; - PrintAndLog("}\nOther : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF)); - PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton); - - uint32_t p1id = (id & 0xFFFFFF); - uint8_t arr[32] = {0x00}; - int i =0; - int j = 23; - for (; i < 24; ++i, --j ){ - arr[i] = (p1id >> i) & 1; - } - - uint32_t p1 = 0; - - p1 |= arr[23] << 21; - p1 |= arr[22] << 23; - p1 |= arr[21] << 20; - p1 |= arr[20] << 22; - - p1 |= arr[19] << 18; - p1 |= arr[18] << 16; - p1 |= arr[17] << 19; - p1 |= arr[16] << 17; - - p1 |= arr[15] << 13; - p1 |= arr[14] << 15; - p1 |= arr[13] << 12; - p1 |= arr[12] << 14; - - p1 |= arr[11] << 6; - p1 |= arr[10] << 2; - p1 |= arr[9] << 7; - p1 |= arr[8] << 1; - - p1 |= arr[7] << 0; - p1 |= arr[6] << 8; - p1 |= arr[5] << 11; - p1 |= arr[4] << 3; - - p1 |= arr[3] << 10; - p1 |= arr[2] << 4; - p1 |= arr[1] << 5; - p1 |= arr[0] << 9; - PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1); - - uint16_t sebury1 = id & 0xFFFF; - uint8_t sebury2 = (id >> 16) & 0x7F; - uint32_t sebury3 = id & 0x7FFFFF; - PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); + } + + if (hi){ + //output 88 bit em id + PrintAndLog("\nEM TAG ID : %06X%016" PRIX64, hi, id); + } else{ + //output 40 bit em id + PrintAndLog("\nEM TAG ID : %010" PRIX64, id); + PrintAndLog("\nPossible de-scramble patterns"); + PrintAndLog("Unique TAG ID : %010" PRIX64, id2lo); + PrintAndLog("HoneyWell IdentKey {"); + PrintAndLog("DEZ 8 : %08" PRIu64, id & 0xFFFFFF); + PrintAndLog("DEZ 10 : %010" PRIu64, id & 0xFFFFFFFF); + PrintAndLog("DEZ 5.5 : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF)); + PrintAndLog("DEZ 3.5A : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF)); + PrintAndLog("DEZ 3.5B : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF)); + PrintAndLog("DEZ 3.5C : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF)); + PrintAndLog("DEZ 14/IK2 : %014" PRIu64, id); + PrintAndLog("DEZ 15/IK3 : %015" PRIu64, id2lo); + PrintAndLog("DEZ 20/ZK : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64, + (id2lo & 0xf000000000) >> 36, + (id2lo & 0x0f00000000) >> 32, + (id2lo & 0x00f0000000) >> 28, + (id2lo & 0x000f000000) >> 24, + (id2lo & 0x0000f00000) >> 20, + (id2lo & 0x00000f0000) >> 16, + (id2lo & 0x000000f000) >> 12, + (id2lo & 0x0000000f00) >> 8, + (id2lo & 0x00000000f0) >> 4, + (id2lo & 0x000000000f) + ); + uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; + PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF)); + PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton); + + uint32_t p1id = (id & 0xFFFFFF); + uint8_t arr[32] = {0x00}; + int i =0; + int j = 23; + for (; i < 24; ++i, --j ){ + arr[i] = (p1id >> i) & 1; } + + uint32_t p1 = 0; + + p1 |= arr[23] << 21; + p1 |= arr[22] << 23; + p1 |= arr[21] << 20; + p1 |= arr[20] << 22; + + p1 |= arr[19] << 18; + p1 |= arr[18] << 16; + p1 |= arr[17] << 19; + p1 |= arr[16] << 17; + + p1 |= arr[15] << 13; + p1 |= arr[14] << 15; + p1 |= arr[13] << 12; + p1 |= arr[12] << 14; + + p1 |= arr[11] << 6; + p1 |= arr[10] << 2; + p1 |= arr[9] << 7; + p1 |= arr[8] << 1; + + p1 |= arr[7] << 0; + p1 |= arr[6] << 8; + p1 |= arr[5] << 11; + p1 |= arr[4] << 3; + + p1 |= arr[3] << 10; + p1 |= arr[2] << 4; + p1 |= arr[1] << 5; + p1 |= arr[0] << 9; + PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1); + + uint16_t sebury1 = id & 0xFFFF; + uint8_t sebury2 = (id >> 16) & 0x7F; + uint32_t sebury3 = id & 0x7FFFFF; + PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); } return; } @@ -457,34 +464,37 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) { size_t idx = 0; size_t size = DemodBufferLen; - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0}; memcpy(BitStream, DemodBuffer, size); int ans = Em410xDecode(BitStream, &size, &idx, hi, lo); if ( ans < 0){ 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; } - + if (!lo && !hi) { + PrintAndLog("DEBUG: Error - Em410x decoded to all zeros"); + 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: "); + + if (verbose) printEM410x(*hi, *lo); - } + return 1; } @@ -517,13 +527,12 @@ int CmdAskEM410xDemod(const char *Cmd) //emSearch will auto search for EM410x format in bitstream //askType switches decode: ask/raw = 0, ask/manchester = 1 int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) { - int invert=0; - int clk=0; - int maxErr=100; - int maxLen=0; - uint8_t askAmp = 0; + int invert = 0; + int clk = 0; + int maxErr = 100; + int maxLen = 0; char amp = param_getchar(Cmd, 0); - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0}; sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &); if (!maxLen) maxLen = BIGBUF_SIZE; if (invert != 0 && invert != 1) { @@ -534,12 +543,15 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, invert=1; clk=0; } - if (amp == 'a' || amp == 'A') askAmp=1; size_t BitLen = getFromGraphBuf(BitStream); - if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen); + if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d", BitLen); if (BitLen<255) return 0; if (maxLenmaxErr){ + if (errCnt > maxErr){ if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk); return 0; } @@ -561,18 +574,20 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, //output setDemodBuf(BitStream,BitLen,0); if (verbose || g_debugMode){ - if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); - if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk); - else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk); + if (errCnt>0) + PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); + if (askType) + PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk); + else + PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk); // Now output the bitstream to the scrollback by line of 16 bits - printDemodBuff(); - + printDemodBuff(); } uint64_t lo = 0; uint32_t hi = 0; - if (emSearch){ + if (emSearch) AskEm410xDecode(true, &hi, &lo); - } + return 1; } int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) { @@ -587,15 +602,14 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) { int Cmdaskmandemod(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_am(); + if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am(); bool st = TRUE; if (Cmd[0]=='s') return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st); else if (Cmd[1] == 's') return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st); - else + return ASKDemod(Cmd, TRUE, TRUE, 1); } @@ -604,22 +618,24 @@ int Cmdaskmandemod(const char *Cmd) //stricktly take 10 and 01 and convert to 0 and 1 int Cmdmandecoderaw(const char *Cmd) { - int i =0; - int errCnt=0; - size_t size=0; - int invert=0; + int i = 0; + int errCnt = 0; + size_t size = 0; + int invert = 0; int maxErr = 20; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') - return usage_data_manrawdecode(); + if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') return usage_data_manrawdecode(); if (DemodBufferLen==0) return 0; - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - int high=0,low=0; - for (;ihigh) high=DemodBuffer[i]; - else if(DemodBuffer[i] high) + high=DemodBuffer[i]; + else if(DemodBuffer[i] < low) + low=DemodBuffer[i]; + BitStream[i] = DemodBuffer[i]; } if (high>7 || low <0 ){ PrintAndLog("Error: please raw demod the wave first then manchester raw decode"); @@ -627,22 +643,21 @@ int Cmdmandecoderaw(const char *Cmd) } sscanf(Cmd, "%i %i", &invert, &maxErr); - size=i; - errCnt=manrawdecode(BitStream, &size, invert); - if (errCnt>=maxErr){ + size = i; + errCnt = manrawdecode(BitStream, &size, invert); + if (errCnt >= maxErr){ PrintAndLog("Too many errors: %d",errCnt); return 0; } PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt); PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); - if (errCnt==0){ + if (errCnt == 0){ uint64_t id = 0; uint32_t hi = 0; size_t idx=0; if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){ //need to adjust to set bitstream back to manchester encoded data //setDemodBuf(BitStream, size, idx); - printEM410x(hi, id); } } @@ -660,8 +675,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) size_t size=0; int offset=0, invert=0, maxErr=20, errCnt=0; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') - return usage_data_biphaserawdecode(); + if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_data_biphaserawdecode(); sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr); if (DemodBufferLen==0){ @@ -672,22 +686,23 @@ int CmdBiphaseDecodeRaw(const char *Cmd) memcpy(BitStream, DemodBuffer, DemodBufferLen); size = DemodBufferLen; errCnt=BiphaseRawDecode(BitStream, &size, offset, invert); - if (errCnt<0){ + if (errCnt < 0){ PrintAndLog("Error during decode:%d", errCnt); return 0; } - if (errCnt>maxErr){ + if (errCnt > maxErr){ PrintAndLog("Too many errors attempting to decode: %d",errCnt); return 0; } - if (errCnt>0){ + if (errCnt > 0) PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt); - } + PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert); PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); - if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod + if (offset) + setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod return 1; } @@ -734,8 +749,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) int Cmdaskbiphdemod(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_ab(); + if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ab(); return ASKbiphaseDemod(Cmd, TRUE); } @@ -760,7 +774,7 @@ int CmdG_Prox_II_Demod(const char *Cmd) } //got a good demod of 96 bits uint8_t ByteStream[8] = {0x00}; - uint8_t xorKey=0; + uint8_t xorKey = 0; size_t startIdx = ans + 6; //start after 6 bit preamble uint8_t bits_no_spacer[90]; @@ -769,17 +783,18 @@ 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("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx); - return 0; - } + 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("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]); } - //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data - // + + //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data uint8_t fmtLen = ByteStream[0]>>2; uint32_t FC = 0; uint32_t Card = 0; @@ -787,20 +802,25 @@ int CmdG_Prox_II_Demod(const char *Cmd) uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32); uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32); - - if (fmtLen==36){ - FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1); - Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5); - PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card); - } else if(fmtLen==26){ - FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7); - Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7); - PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card); - } else { - PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen); - PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); + bool unknown = FALSE; + switch(fmtLen) { + case 36: + FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1); + Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5); + break; + case 26: + FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7); + Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7); + break; + default : + unknown = TRUE; + break; } - PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); + if ( !unknown) + PrintAndLog("G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3); + else + PrintAndLog("Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3); + setDemodBuf(DemodBuffer+ans, 96, 0); return 1; } @@ -814,7 +834,7 @@ int CmdVikingDemod(const char *Cmd) 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("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":""); @@ -835,8 +855,7 @@ int CmdVikingDemod(const char *Cmd) int Cmdaskrawdemod(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_ar(); + if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ar(); return ASKDemod(Cmd, TRUE, FALSE, 0); } @@ -890,16 +909,15 @@ int CmdAutoCorr(const char *Cmd) char cmdp = param_getchar(Cmd, 0); if (cmdp == 'h' || cmdp == 'H') return usage_data_autocorr(); int window = 4000; //set default - char grph=0; + char grph = 0; bool updateGrph = FALSE; sscanf(Cmd, "%i %c", &window, &grph); if (window >= GraphTraceLen) { - PrintAndLog("window must be smaller than trace (%d samples)", - GraphTraceLen); + PrintAndLog("window must be smaller than trace (%d samples)", GraphTraceLen); return 0; } - if (grph == 'g') updateGrph=TRUE; + if (grph == 'g') updateGrph = TRUE; return AutoCorrelate(window, updateGrph, TRUE); } @@ -913,11 +931,10 @@ int CmdBitsamples(const char *Cmd) for (int j = 0; j < sizeof(got); j++) { for (int k = 0; k < 8; k++) { - if(got[j] & (1 << (7 - k))) { + if(got[j] & (1 << (7 - k))) GraphBuffer[cnt++] = 1; - } else { + else GraphBuffer[cnt++] = 0; - } } } GraphTraceLen = cnt; @@ -927,6 +944,9 @@ int CmdBitsamples(const char *Cmd) int CmdBuffClear(const char *Cmd) { + char cmdp = param_getchar(Cmd, 0); + if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear(); + UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}}; SendCommand(&c); ClearGraph(true); @@ -953,14 +973,13 @@ int CmdDec(const char *Cmd) int CmdUndec(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') - return usage_data_undecimate(); + if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate(); uint8_t factor = param_get8ex(Cmd, 0, 2, 10); //We have memory, don't we? - int swap[MAX_GRAPH_TRACE_LEN] = { 0 }; - uint32_t g_index = 0 ,s_index = 0; + int swap[MAX_GRAPH_TRACE_LEN] = {0}; + uint32_t g_index = 0, s_index = 0; while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN) { int count = 0; @@ -984,8 +1003,12 @@ int CmdGraphShiftZero(const char *Cmd) //set options from parameters entered with the command sscanf(Cmd, "%i", &shift); - for(int i = 0; i= GraphTraceLen) + shiftedVal = GraphBuffer[i]; + else + shiftedVal = GraphBuffer[i] + shift; + if (shiftedVal > 127) shiftedVal = 127; else if (shiftedVal < -127) @@ -1121,11 +1144,10 @@ int FSKrawDemod(const char *Cmd, bool verbose) // Now output the bitstream to the scrollback by line of 16 bits if (verbose || g_debugMode) { - PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow); + PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow); PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert)); printDemodBuff(); } - return 1; } else { if (g_debugMode) PrintAndLog("no FSK data found"); @@ -1140,8 +1162,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) int CmdFSKrawdemod(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_fs(); + if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs(); return FSKrawDemod(Cmd, TRUE); } @@ -1154,7 +1175,7 @@ int CmdFSKdemodHID(const char *Cmd) //raw fsk demod no manchester decoding no start bit finding just get binary from wave uint32_t hi2=0, hi=0, lo=0; - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0}; size_t BitLen = getFromGraphBuf(BitStream); if (BitLen==0) return 0; //get binary from fsk wave @@ -1180,8 +1201,7 @@ int CmdFSKdemodHID(const char *Cmd) return 0; } if (hi2 != 0){ //extra large HID tags - PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)", - (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); + PrintAndLog("HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF); } else { //standard HID tags <38 bits uint8_t fmtLen = 0; @@ -1220,9 +1240,7 @@ int CmdFSKdemodHID(const char *Cmd) fc = ((hi&0xF)<<12)|(lo>>20); } } - PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d", - (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF, - (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum); + PrintAndLog("HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo>>1) & 0xFFFF, fmtLen, fc, cardnum); } setDemodBuf(BitStream,BitLen,idx); if (g_debugMode){ @@ -1724,8 +1742,8 @@ int CmdFDXBdemodBI(const char *Cmd){ if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8)); uint16_t calcCrc = crc16_ccitt_kermit(raw, 8); - PrintAndLog("Animal ID: %04u-%012llu", countryCode, NationalCode); - PrintAndLog("National Code: %012llu", NationalCode); + PrintAndLog("Animal ID: %04u-%012" PRIu64, countryCode, NationalCode); + PrintAndLog("National Code: %012" PRIu64, NationalCode); PrintAndLog("CountryCode: %04u", countryCode); PrintAndLog("Reserved/RFU: %u", reservedCode); @@ -1746,9 +1764,7 @@ int CmdFDXBdemodBI(const char *Cmd){ //attempt to psk1 demod graph buffer int PSKDemod(const char *Cmd, bool verbose) { - int invert=0; - int clk=0; - int maxErr=100; + int invert = 0, clk = 0, maxErr = 100; sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); if (clk==1){ invert=1; @@ -1758,25 +1774,26 @@ int PSKDemod(const char *Cmd, bool verbose) if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd); return 0; } - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; + uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0}; size_t BitLen = getFromGraphBuf(BitStream); if (BitLen==0) return 0; - uint8_t carrier=countFC(BitStream, BitLen, 0); + + uint8_t carrier = countFC(BitStream, BitLen, 0); if (carrier!=2 && carrier!=4 && carrier!=8){ //invalid carrier return 0; } - if (g_debugMode){ - PrintAndLog("Carrier: rf/%d",carrier); - } + + if (g_debugMode) PrintAndLog("Carrier: rf/%d",carrier); + int errCnt=0; errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert); if (errCnt > maxErr){ - if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); + if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt); return 0; } if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) - if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); + if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt); return 0; } if (verbose || g_debugMode){ @@ -1786,7 +1803,7 @@ int PSKDemod(const char *Cmd, bool verbose) } } //prime demod buffer for output - setDemodBuf(BitStream,BitLen,0); + setDemodBuf(BitStream, BitLen, 0); return 1; } @@ -1889,6 +1906,63 @@ int CmdPSKNexWatch(const char *Cmd) return 1; } +int CmdPSKIdteck(const char *Cmd) { + + if (!PSKDemod("", false)) { + if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed"); + return 0; + } + size_t size = DemodBufferLen; + + //get binary from PSK1 wave + int idx = IdteckDemodPSK(DemodBuffer, &size); + if (idx < 0){ + if (g_debugMode){ + if (idx == -1) + PrintAndLog("DEBUG: Error - Idteck: not enough samples"); + else if (idx == -2) + PrintAndLog("DEBUG: Error - Idteck: preamble not found"); + else if (idx == -3) + PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size); + else + PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx); + } + + // if didn't find preamble try again inverting + if (!PSKDemod("1", false)) { + if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed"); + return 0; + } + idx = IdteckDemodPSK(DemodBuffer, &size); + if (idx < 0){ + if (g_debugMode){ + if (idx == -1) + PrintAndLog("DEBUG: Error - Idteck: not enough samples"); + else if (idx == -2) + PrintAndLog("DEBUG: Error - Idteck: preamble not found"); + else if (idx == -3) + PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size); + else + PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx); + } + return 0; + } + } + setDemodBuf(DemodBuffer, 64, idx); + + //got a good demod + uint32_t id = 0; + uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32); + uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32); + + //parity check (TBD) + //checksum check (TBD) + + //output + PrintAndLog("IDTECK Tag Found: Card ID %u , Raw: %08X%08X", id, raw1, raw2); + return 1; +} + // by marshmellow // takes 3 arguments - clock, invert, maxErr as integers // attempts to demodulate nrz only @@ -1936,8 +2010,7 @@ int NRZrawDemod(const char *Cmd, bool verbose) int CmdNRZrawDemod(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_nr(); + if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr(); return NRZrawDemod(Cmd, TRUE); } @@ -1950,8 +2023,7 @@ int CmdPSK1rawDemod(const char *Cmd) { int ans; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_p1(); + if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1(); ans = PSKDemod(Cmd, TRUE); //output @@ -1971,8 +2043,7 @@ int CmdPSK2rawDemod(const char *Cmd) { int ans = 0; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') - return usage_data_rawdemod_p2(); + if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p2(); ans = PSKDemod(Cmd, TRUE); if (!ans){ @@ -1993,7 +2064,7 @@ int CmdRawDemod(const char *Cmd) char cmdp2 = Cmd[1]; int ans = 0; - if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2) + if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2) return usage_data_rawdemod(); if (cmdp == 'f' && cmdp2 == 's') @@ -2024,6 +2095,11 @@ int CmdGrid(const char *Cmd) RepaintGraphWindow(); return 0; } +void setGrid_Clock(uint8_t clock){ + PlotGridXdefault = clock; + RepaintGraphWindow(); +} + int CmdHexsamples(const char *Cmd) { @@ -2179,12 +2255,19 @@ int CmdTuneSamples(const char *Cmd) while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) { timeout++; printf("."); + fflush(stdout); if (timeout > 7) { PrintAndLog("\nNo response from Proxmark. Aborting..."); return 1; } } +#define NON_VOLTAGE 999 +#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. +#define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. +#define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. + int peakv, peakf; int vLf125, vLf134, vHf; vLf125 = resp.arg[0] & 0xffff; @@ -2193,19 +2276,16 @@ int CmdTuneSamples(const char *Cmd) peakf = resp.arg[2] & 0xffff; peakv = resp.arg[2] >> 16; PrintAndLog(""); - if ( vLf125 > 0 ) + if ( vLf125 > NON_VOLTAGE ) PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); - if ( vLf134 > 0 ) + if ( vLf134 > NON_VOLTAGE ) PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); - if ( peakv > 0 && peakf > 0 ) + if ( peakv > NON_VOLTAGE && peakf > 0 ) PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); - if ( vHf > 0 ) + if ( vHf > NON_VOLTAGE ) 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. - #define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. - #define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. + if (peakv < LF_UNUSABLE_V) PrintAndLog("# Your LF antenna is unusable."); @@ -2250,10 +2330,9 @@ int CmdLoad(const char *Cmd) GraphBuffer[GraphTraceLen] = atoi(line); GraphTraceLen++; } - if (f) { + if (f) fclose(f); - f = NULL; - } + PrintAndLog("loaded %d samples", GraphTraceLen); RepaintGraphWindow(); return 0; @@ -2317,20 +2396,18 @@ int CmdSave(const char *Cmd) if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; memcpy(filename, Cmd, len); - FILE *f = fopen(filename, "w"); if(!f) { PrintAndLog("couldn't open '%s'", filename); return 0; } - int i; - for (i = 0; i < GraphTraceLen; i++) { + + for (int i = 0; i < GraphTraceLen; i++) fprintf(f, "%d\n", GraphBuffer[i]); - } - if (f) { + + if (f) fclose(f); - f = NULL; - } + PrintAndLog("saved to '%s'", Cmd); return 0; } @@ -2479,7 +2556,6 @@ int Cmdhex2bin(const char *Cmd) } int CmdDataIIR(const char *Cmd){ - uint8_t k = param_get8(Cmd,0); //iceIIR_Butterworth(GraphBuffer, GraphTraceLen); iceSimple_Filter(GraphBuffer, GraphTraceLen, k); @@ -2498,7 +2574,7 @@ static command_t CommandTable[] = {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"}, {"bin2hex", Cmdbin2hex, 1, " -- Converts binary to hexadecimal"}, {"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"}, - {"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"}, + {"buffclear", CmdBuffClear, 1, "Clears bigbuff on deviceside. d graph window"}, {"dec", CmdDec, 1, "Decimate samples"}, {"detectclock", CmdDetectClockRate, 1, "[] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"}, {"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},