github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor gProxII demod... add 0 spacer to ...

Browse source 
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
This commit is contained in:
marshmellow42 2016-02-29 17:05:02 -05:00
commit 88e85bde41
3 changed files with 46 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

67
client/cmddata.c
View file

@ -592,7 +592,7 @@ int Cmdaskbiphdemod(const char *Cmd)
int CmdG_Prox_II_Demod(const char *Cmd) int CmdG_Prox_II_Demod(const char *Cmd)
{ {
if (!ASKbiphaseDemod(Cmd, FALSE)){ if (!ASKbiphaseDemod(Cmd, FALSE)){
if (g_debugMode) PrintAndLog("ASKbiphaseDemod failed 1st try"); if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
return 0; return 0;
} }
size_t size = DemodBufferLen; size_t size = DemodBufferLen;
@ -602,46 +602,32 @@ int CmdG_Prox_II_Demod(const char *Cmd)
if (g_debugMode) PrintAndLog("Error gProxII_Demod"); if (g_debugMode) PrintAndLog("Error gProxII_Demod");
return 0; return 0;
} }
//got a good demod //got a good demod of 96 bits
uint32_t ByteStream[65] = {0x00}; uint32_t ByteStream[8] = {0x00};
uint8_t xorKey=0; uint8_t xorKey=0;
uint8_t keyCnt=0; size_t startIdx = ans + 6; //start after 6 bit preamble
uint8_t bitCnt=0;
uint8_t ByteCnt=0; uint8_t bits_no_spacer[90];
size_t startIdx = ans + 6; //start after preamble //so as to not mess with raw DemodBuffer copy to a new sample array
for (size_t idx = 0; idx<size-6; idx++){ memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
if ((idx+1) % 5 == 0){ // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
//spacer bit - should be 0 size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
if (DemodBuffer[startIdx+idx] != 0) { if (bitLen != 72) {
if (g_debugMode) PrintAndLog("Error spacer not 0: %u, pos: %u", (unsigned int)DemodBuffer[startIdx+idx],(unsigned int)(startIdx+idx)); if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
return 0; return 0;
}
continue;
}
if (keyCnt<8){ //lsb first
xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);
keyCnt++;
if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", (unsigned int)xorKey);
continue;
}
//lsb first
ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);
bitCnt++;
if (bitCnt % 8 == 0){
if (g_debugMode) PrintAndLog("byte %u: %02x", (unsigned int)ByteCnt, ByteStream[ByteCnt]);
bitCnt=0;
ByteCnt++;
}
} }
for (uint8_t i = 0; i < ByteCnt; i++){ // get key and then get all 8 bytes of payload decoded
ByteStream[i] ^= xorKey; //xor xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)i, ByteStream[i]); 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]);
} }
//now ByteStream contains 64 bytes of decrypted raw tag data //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
// //
uint8_t fmtLen = ByteStream[0]>>2; uint8_t fmtLen = ByteStream[0]>>2;
uint32_t FC = 0; uint32_t FC = 0;
uint32_t Card = 0; uint32_t Card = 0;
//get raw 96 bits to print
uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32); uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32); uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
@ -649,13 +635,22 @@ int CmdG_Prox_II_Demod(const char *Cmd)
if (fmtLen==36){ if (fmtLen==36){
FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1); FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5); Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d", fmtLen, FC, Card); PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
} else if(fmtLen==26){ } else if(fmtLen==26){
FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7); FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7); Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",(unsigned int)fmtLen,FC,Card); PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
} else { } else {
PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen); PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
PrintAndLog("Decoded Raw: %02x%02x%02x%02x%02x%02x%02x%02x",
ByteStream[0],
ByteStream[1],
ByteStream[2],
ByteStream[3],
ByteStream[4],
ByteStream[5],
ByteStream[6],
ByteStream[7]);
} }
PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
setDemodBuf(DemodBuffer+ans, 96, 0); setDemodBuf(DemodBuffer+ans, 96, 0);

2
client/proxgui.h
View file

@ -19,7 +19,7 @@ void MainGraphics(void);
void InitGraphics(int argc, char **argv); void InitGraphics(int argc, char **argv);
void ExitGraphics(void); void ExitGraphics(void);
#define MAX_GRAPH_TRACE_LEN (1024*128) #define MAX_GRAPH_TRACE_LEN (40000*8)
extern int GraphBuffer[MAX_GRAPH_TRACE_LEN]; extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
extern int GraphTraceLen; extern int GraphTraceLen;
extern double CursorScaleFactor; extern double CursorScaleFactor;

24
common/lfdemod.c
View file

@ -68,7 +68,7 @@ uint8_t parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType)
// by marshmellow // by marshmellow
// takes a array of binary values, start position, length of bits per parity (includes parity bit), // takes a array of binary values, start position, length of bits per parity (includes parity bit),
// Parity Type (1 for odd; 0 for even; 2 Always 1's), and binary Length (length to run) // Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen)
{ {
uint32_t parityWd = 0; uint32_t parityWd = 0;
@ -80,10 +80,11 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
} }
j--; // overwrite parity with next data j--; // overwrite parity with next data
// if parity fails then return 0 // if parity fails then return 0
if (pType == 2) { // then marker bit which should be a 1 switch (pType) {
if (!BitStream[j]) return 0; case 3: if (BitStream[j]==1) return 0; break; //should be 0 spacer bit
} else { case 2: if (BitStream[j]==0) return 0; break; //should be 1 spacer bit
if (parityTest(parityWd, pLen, pType) == 0) return 0; default: //test parity
if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
} }
bitCnt+=(pLen-1); bitCnt+=(pLen-1);
parityWd = 0; parityWd = 0;
@ -95,7 +96,8 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
// by marshmellow // by marshmellow
// takes a array of binary values, length of bits per parity (includes parity bit), // takes a array of binary values, length of bits per parity (includes parity bit),
// Parity Type (1 for odd; 0 for even; 2 Always 1's), and binary Length (length to run) // Parity Type (1 for odd; 0 for even; 2 Always 1's; 3 Always 0's), and binary Length (length to run)
// Make sure *dest is long enough to store original sourceLen + #_of_parities_to_be_added
size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
{ {
uint32_t parityWd = 0; uint32_t parityWd = 0;
@ -106,10 +108,12 @@ size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t p
dest[j++] = (BitSource[word+bit]); dest[j++] = (BitSource[word+bit]);
} }
// if parity fails then return 0 // if parity fails then return 0
if (pType == 2) { // then marker bit which should be a 1 switch (pType) {
dest[j++]=1; case 3: dest[j++]=0; break; // marker bit which should be a 0
} else { case 2: dest[j++]=1; break; // marker bit which should be a 1
dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1; default:
dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
break;
} }
bitCnt += pLen; bitCnt += pLen;
parityWd = 0; parityWd = 0;