git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c

index 348cb229d062501ef269c9946faea68095bdfa7a..b287ce28efec268a710783ee506e159d8d8c7273 100644 (file)

--- a/client/cmdlft55xx.c

+++ b/client/cmdlft55xx.c

@@ -10,7 +10,8 @@

#include <stdio.h>\r

#include <string.h>\r

#include <inttypes.h>\r

-//#include <time.h> //not used - marshmellow\r

+#include <ctype.h>\r

+#include <time.h>\r

#include "proxmark3.h"\r

#include "ui.h"\r

#include "graph.h"\r

@@ -22,8 +23,6 @@

#include "util.h"\r

#include "data.h"\r

#include "lfdemod.h"\r

-//#include "../common/crc.h" //not used - marshmellow\r

-//#include "../common/iso14443crc.h" //not used - marshmellow\r

#include "cmdhf14a.h" //for getTagInfo\r

\r

#define T55x7_CONFIGURATION_BLOCK 0x00\r

@@ -33,7 +32,7 @@

#define REGULAR_READ_MODE_BLOCK 0xFF\r

\r

// Default configuration\r

-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00, .Q5 = FALSE };\r

+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };\r

\r

t55xx_conf_block_t Get_t55xx_Config(){\r

return config;\r

@@ -51,6 +50,7 @@ int usage_t55xx_config(){

PrintAndLog(" i [1] Invert data signal, defaults to normal");\r

PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");\r

PrintAndLog(" Q5 Set as Q5(T5555) chip instead of T55x7");\r

+ PrintAndLog(" ST Set Sequence Terminator on");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r

@@ -78,7 +78,7 @@ int usage_t55xx_read(){

return 0;\r

}\r

int usage_t55xx_write(){\r

- PrintAndLog("Usage: lf t55xx wr [b <block>] [d <data>] [p <password>] [1]");\r

+ PrintAndLog("Usage: lf t55xx write [b <block>] [d <data>] [p <password>] [1]");\r

PrintAndLog("Options:");\r

PrintAndLog(" b <block> - block number to write. Between 0-7");\r

PrintAndLog(" d <data> - 4 bytes of data to write (8 hex characters)");\r

@@ -86,8 +86,8 @@ int usage_t55xx_write(){

PrintAndLog(" 1 - OPTIONAL write Page 1 instead of Page 0");\r

PrintAndLog("");\r

PrintAndLog("Examples:");\r

- PrintAndLog(" lf t55xx wr b 3 d 11223344 - write 11223344 to block 3");\r

- PrintAndLog(" lf t55xx wr b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");\r

+ PrintAndLog(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");\r

+ PrintAndLog(" lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");\r

PrintAndLog("");\r

return 0;\r

}\r

@@ -196,7 +196,7 @@ int CmdT55xxSetConfig(const char *Cmd) {

uint8_t bitRate = 0;\r

uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r

uint8_t cmdp = 0;\r

- bool errors = FALSE;\r

+ bool errors = false;\r

while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r

{\r

tmp = param_getchar(Cmd, cmdp);\r

@@ -215,7 +215,7 @@ int CmdT55xxSetConfig(const char *Cmd) {

break;\r

}\r

- if (i==9) errors = TRUE;\r

+ if (i==9) errors = true;\r

}\r

cmdp+=2;\r

break;\r

@@ -255,7 +255,7 @@ int CmdT55xxSetConfig(const char *Cmd) {

config.inverted=0;\r

} else {\r

PrintAndLog("Unknown modulation '%s'", modulation);\r

- errors = TRUE;\r

+ errors = true;\r

}\r

break;\r

case 'i':\r

@@ -270,12 +270,17 @@ int CmdT55xxSetConfig(const char *Cmd) {

break;\r

case 'Q':\r

case 'q': \r

- config.Q5 = TRUE;\r

+ config.Q5 = true;\r

+ cmdp++;\r

+ break;\r

+ case 'S':\r

+ case 's': \r

+ config.ST = true;\r

cmdp++;\r

break;\r

default:\r

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

- errors = TRUE;\r

+ errors = true;\r

break;\r

}\r

@@ -373,34 +378,35 @@ bool DecodeT55xxBlock(){

char buf[30] = {0x00};\r

char *cmdStr = buf;\r

int ans = 0;\r

+ bool ST = config.ST;\r

uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r

DemodBufferLen = 0x00;\r

\r

switch( config.modulation ){\r

case DEMOD_FSK:\r

snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_FSK1:\r

case DEMOD_FSK1a:\r

snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_FSK2:\r

case DEMOD_FSK2a:\r

snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r

- ans = FSKrawDemod(cmdStr, FALSE);\r

+ ans = FSKrawDemod(cmdStr, false);\r

break;\r

case DEMOD_ASK:\r

snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = ASKDemod(cmdStr, FALSE, FALSE, 1);\r

+ ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);\r

break;\r

case DEMOD_PSK1:\r

// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

save_restoreGB(1);\r

CmdLtrim("160");\r

snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r

- ans = PSKDemod(cmdStr, FALSE);\r

+ ans = PSKDemod(cmdStr, false);\r

//undo trim samples\r

save_restoreGB(0);\r

break;\r

@@ -410,22 +416,22 @@ bool DecodeT55xxBlock(){

save_restoreGB(1);\r

CmdLtrim("160");\r

snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r

- ans = PSKDemod(cmdStr, FALSE);\r

+ ans = PSKDemod(cmdStr, false);\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

//undo trim samples\r

save_restoreGB(0);\r

break;\r

case DEMOD_NRZ:\r

snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = NRZrawDemod(cmdStr, FALSE);\r

+ ans = NRZrawDemod(cmdStr, false);\r

break;\r

case DEMOD_BI:\r

case DEMOD_BIa:\r

snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r

- ans = ASKbiphaseDemod(cmdStr, FALSE);\r

+ ans = ASKbiphaseDemod(cmdStr, false);\r

break;\r

default:\r

- return FALSE;\r

+ return false;\r

}\r

return (bool) ans;\r

}\r

@@ -434,13 +440,13 @@ bool DecodeT5555TraceBlock() {

DemodBufferLen = 0x00;\r

\r

// According to datasheet. Always: RF/64, not inverted, Manchester\r

- return (bool) ASKDemod("64 0 1", FALSE, FALSE, 1);\r

+ return (bool) ASKDemod("64 0 1", false, false, 1);\r

}\r

\r

int CmdT55xxDetect(const char *Cmd){\r

- bool errors = FALSE;\r

- bool useGB = FALSE;\r

- bool usepwd = FALSE;\r

+ bool errors = false;\r

+ bool useGB = false;\r

+ bool usepwd = false;\r

uint32_t password = 0;\r

uint8_t cmdp = 0;\r

\r

@@ -452,12 +458,12 @@ int CmdT55xxDetect(const char *Cmd){

case 'p':\r

case 'P':\r

password = param_get32ex(Cmd, cmdp+1, 0, 16);\r

- usepwd = TRUE;\r

+ usepwd = true;\r

cmdp += 2;\r

break;\r

case '1':\r

// use Graphbuffer data\r

- useGB = TRUE;\r

+ useGB = true;\r

cmdp++;\r

break;\r

default:\r

@@ -485,80 +491,87 @@ bool tryDetectModulation(){

t55xx_conf_block_t tests[15];\r

int bitRate=0;\r

uint8_t fc1 = 0, fc2 = 0, clk=0;\r

-\r

- if (GetFskClock("", FALSE, FALSE)){ \r

- fskClocks(&fc1, &fc2, &clk, FALSE);\r

- if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if (GetFskClock("", false, false)){ \r

+ fskClocks(&fc1, &fc2, &clk, false);\r

+ if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_FSK;\r

if (fc1==8 && fc2 == 5)\r

tests[hits].modulation = DEMOD_FSK1a;\r

else if (fc1==10 && fc2 == 8)\r

tests[hits].modulation = DEMOD_FSK2;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_FSK;\r

if (fc1 == 8 && fc2 == 5)\r

tests[hits].modulation = DEMOD_FSK1;\r

else if (fc1 == 10 && fc2 == 8)\r

tests[hits].modulation = DEMOD_FSK2a;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} else {\r

- clk = GetAskClock("", FALSE, FALSE);\r

+ clk = GetAskClock("", false, false);\r

if (clk>0) {\r

- if ( ASKDemod("0 0 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ tests[hits].ST = true;\r

+ if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_ASK;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

++hits;\r

}\r

- if ( ASKDemod("0 1 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ tests[hits].ST = true;\r

+ if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_ASK;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

++hits;\r

}\r

- if ( ASKbiphaseDemod("0 0 0 2", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

+ if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

tests[hits].modulation = DEMOD_BI;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

+ if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

tests[hits].modulation = DEMOD_BIa;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

//undo trim from ask\r

//save_restoreGB(0);\r

- clk = GetNrzClock("", FALSE, FALSE);\r

+ clk = GetNrzClock("", false, false);\r

if (clk>0) {\r

- if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( NRZrawDemod("0 0 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_NRZ;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

\r

- if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( NRZrawDemod("0 1 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_NRZ;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

@@ -567,41 +580,45 @@ bool tryDetectModulation(){

// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r

save_restoreGB(1);\r

CmdLtrim("160");\r

- clk = GetPskClock("", FALSE, FALSE);\r

+ clk = GetPskClock("", false, false);\r

if (clk>0) {\r

- if ( PSKDemod("0 0 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_PSK1;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

- if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

+ if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

tests[hits].modulation = DEMOD_PSK1;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = TRUE;\r

+ tests[hits].inverted = true;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

// PSK2 - needs a call to psk1TOpsk2.\r

- if ( PSKDemod("0 0 6", FALSE)) {\r

+ if ( PSKDemod("0 0 6", false)) {\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r

tests[hits].modulation = DEMOD_PSK2;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} // inverse waves does not affect this demod\r

// PSK3 - needs a call to psk1TOpsk2.\r

- if ( PSKDemod("0 0 6", FALSE)) {\r

+ if ( PSKDemod("0 0 6", false)) {\r

psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r

tests[hits].modulation = DEMOD_PSK3;\r

tests[hits].bitrate = bitRate;\r

- tests[hits].inverted = FALSE;\r

+ tests[hits].inverted = false;\r

tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r

+ tests[hits].ST = false;\r

++hits;\r

}\r

} // inverse waves does not affect this demod\r

@@ -616,8 +633,9 @@ bool tryDetectModulation(){

config.offset = tests[0].offset;\r

config.block0 = tests[0].block0;\r

config.Q5 = tests[0].Q5;\r

+ config.ST = tests[0].ST;\r

printConfiguration( config );\r

- return TRUE;\r

+ return true;\r

}\r

\r

if ( hits > 1) {\r

@@ -627,68 +645,68 @@ bool tryDetectModulation(){

printConfiguration( tests[i] );\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

bool testModulation(uint8_t mode, uint8_t modread){\r

switch( mode ){\r

case DEMOD_FSK:\r

- if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return TRUE;\r

+ if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;\r

break;\r

case DEMOD_ASK:\r

- if (modread == DEMOD_ASK) return TRUE;\r

+ if (modread == DEMOD_ASK) return true;\r

break;\r

case DEMOD_PSK1:\r

- if (modread == DEMOD_PSK1) return TRUE;\r

+ if (modread == DEMOD_PSK1) return true;\r

break;\r

case DEMOD_PSK2:\r

- if (modread == DEMOD_PSK2) return TRUE;\r

+ if (modread == DEMOD_PSK2) return true;\r

break;\r

case DEMOD_PSK3:\r

- if (modread == DEMOD_PSK3) return TRUE;\r

+ if (modread == DEMOD_PSK3) return true;\r

break;\r

case DEMOD_NRZ:\r

- if (modread == DEMOD_NRZ) return TRUE;\r

+ if (modread == DEMOD_NRZ) return true;\r

break;\r

case DEMOD_BI:\r

- if (modread == DEMOD_BI) return TRUE;\r

+ if (modread == DEMOD_BI) return true;\r

break;\r

case DEMOD_BIa:\r

- if (modread == DEMOD_BIa) return TRUE;\r

+ if (modread == DEMOD_BIa) return true;\r

break; \r

default:\r

- return FALSE;\r

+ return false;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

bool testQ5Modulation(uint8_t mode, uint8_t modread){\r

switch( mode ){\r

case DEMOD_FSK:\r

- if (modread >= 4 && modread <= 5) return TRUE;\r

+ if (modread >= 4 && modread <= 5) return true;\r

break;\r

case DEMOD_ASK:\r

- if (modread == 0) return TRUE;\r

+ if (modread == 0) return true;\r

break;\r

case DEMOD_PSK1:\r

- if (modread == 1) return TRUE;\r

+ if (modread == 1) return true;\r

break;\r

case DEMOD_PSK2:\r

- if (modread == 2) return TRUE;\r

+ if (modread == 2) return true;\r

break;\r

case DEMOD_PSK3:\r

- if (modread == 3) return TRUE;\r

+ if (modread == 3) return true;\r

break;\r

case DEMOD_NRZ:\r

- if (modread == 7) return TRUE;\r

+ if (modread == 7) return true;\r

break;\r

case DEMOD_BI:\r

- if (modread == 6) return TRUE;\r

+ if (modread == 6) return true;\r

break;\r

default:\r

- return FALSE;\r

+ return false;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

int convertQ5bitRate(uint8_t bitRateRead) {\r

@@ -702,7 +720,7 @@ int convertQ5bitRate(uint8_t bitRateRead) {

\r

bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){\r

\r

- if ( DemodBufferLen < 64 ) return FALSE;\r

+ if ( DemodBufferLen < 64 ) return false;\r

uint8_t si = 0;\r

for (uint8_t idx = 28; idx < 64; idx++){\r

si = idx;\r

@@ -735,9 +753,9 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){

if (*fndBitRate < 0) continue;\r

*offset = idx;\r

\r

- return TRUE;\r

+ return true;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

bool testBitRate(uint8_t readRate, uint8_t clk){\r

@@ -750,7 +768,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk){

\r

bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r

\r

- if ( DemodBufferLen < 64 ) return FALSE;\r

+ if ( DemodBufferLen < 64 ) return false;\r

uint8_t si = 0;\r

for (uint8_t idx = 28; idx < 64; idx++){\r

si = idx;\r

@@ -768,28 +786,28 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)

uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode\r

uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; \r

//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //could check psk cr\r

- uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode\r

- uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;\r

+ //uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode\r

+ //uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;\r

\r

//if extended mode\r

- bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r

+ bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;\r

\r

if (!extMode){\r

- if (nml01 || nml02 || xtRate) continue;\r

+ if (xtRate) continue; //nml01 || nml02 || caused issues on noralys tags\r

}\r

//test modulation\r

if (!testModulation(mode, modread)) continue;\r

if (!testBitRate(bitRate, clk)) continue;\r

*fndBitRate = bitRate;\r

*offset = idx;\r

- *Q5 = FALSE;\r

- return TRUE;\r

+ *Q5 = false;\r

+ return true;\r

}\r

if (testQ5(mode, offset, fndBitRate, clk)) {\r

- *Q5 = TRUE;\r

- return TRUE;\r

+ *Q5 = true;\r

+ return true;\r

}\r

- return FALSE;\r

+ return false;\r

}\r

\r

void printT55xxBlock(const char *blockNum){\r

@@ -839,6 +857,7 @@ int printConfiguration( t55xx_conf_block_t b){

PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );\r

PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );\r

PrintAndLog("Offset : %d", b.offset);\r

+ PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );\r

PrintAndLog("Block0 : 0x%08X", b.block0);\r

PrintAndLog("");\r

return 0;\r

@@ -1371,11 +1390,9 @@ int CmdT55xxBruteForce(const char *Cmd) {

char buf[9];\r

char filename[FILE_PATH_SIZE]={0};\r

int keycnt = 0;\r

+ int ch;\r

uint8_t stKeyBlock = 20;\r

- uint8_t *keyBlock = NULL, *p;\r

- keyBlock = calloc(stKeyBlock, 6);\r

- if (keyBlock == NULL) return 1;\r

-\r

+ uint8_t *keyBlock = NULL, *p = NULL;\r

uint32_t start_password = 0x00000000; //start password\r

uint32_t end_password = 0xFFFFFFFF; //end password\r

bool found = false;\r

@@ -1383,6 +1400,9 @@ int CmdT55xxBruteForce(const char *Cmd) {

char cmdp = param_getchar(Cmd, 0);\r

if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();\r

\r

+ keyBlock = calloc(stKeyBlock, 6);\r

+ if (keyBlock == NULL) return 1;\r

+\r

if (cmdp == 'i' || cmdp == 'I') {\r

\r

int len = strlen(Cmd+2);\r

@@ -1417,6 +1437,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

if (!p) {\r

PrintAndLog("Cannot allocate memory for defaultKeys");\r

free(keyBlock);\r

+ fclose(f);\r

return 2;\r

}\r

keyBlock = p;\r

@@ -1431,6 +1452,7 @@ int CmdT55xxBruteForce(const char *Cmd) {

\r

if (keycnt == 0) {\r

PrintAndLog("No keys found in file");\r

+ free(keyBlock);\r

return 1;\r

}\r

PrintAndLog("Loaded %d keys", keycnt);\r

@@ -1440,8 +1462,10 @@ int CmdT55xxBruteForce(const char *Cmd) {

for (uint16_t c = 0; c < keycnt; ++c ) {\r

\r

if (ukbhit()) {\r

- getchar();\r

+ ch = getchar();\r

+ (void)ch;\r

printf("\naborted via keyboard!\n");\r

+ free(keyBlock);\r

return 0;\r

}\r

\r

@@ -1449,8 +1473,9 @@ int CmdT55xxBruteForce(const char *Cmd) {

\r

PrintAndLog("Testing %08X", testpwd);\r

\r

- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r

+ if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {\r

PrintAndLog("Aquireing data from device failed. Quitting");\r

+ free(keyBlock);\r

return 0;\r

}\r

\r

@@ -1458,10 +1483,12 @@ int CmdT55xxBruteForce(const char *Cmd) {

\r

if ( found ) {\r

PrintAndLog("Found valid password: [%08X]", testpwd);\r

+ free(keyBlock);\r

return 0;\r

}\r

PrintAndLog("Password NOT found.");\r

+ free(keyBlock);\r

return 0;\r

}\r

\r

@@ -1471,8 +1498,10 @@ int CmdT55xxBruteForce(const char *Cmd) {

start_password = param_get32ex(Cmd, 0, 0, 16);\r

end_password = param_get32ex(Cmd, 1, 0, 16);\r

\r

- if ( start_password >= end_password ) return usage_t55xx_bruteforce();\r

-\r

+ if ( start_password >= end_password ) {\r

+ free(keyBlock);\r

+ return usage_t55xx_bruteforce();\r

+ }\r

PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);\r

\r

uint32_t i = start_password;\r

@@ -1482,13 +1511,16 @@ int CmdT55xxBruteForce(const char *Cmd) {

printf(".");\r

fflush(stdout);\r

if (ukbhit()) {\r

- getchar();\r

+ ch = getchar();\r

+ (void)ch;\r

printf("\naborted via keyboard!\n");\r

+ free(keyBlock);\r

return 0;\r

}\r

\r

- if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {\r

+ if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i)) {\r

PrintAndLog("Aquireing data from device failed. Quitting");\r

+ free(keyBlock);\r

return 0;\r

}\r

found = tryDetectModulation();\r

@@ -1503,6 +1535,8 @@ int CmdT55xxBruteForce(const char *Cmd) {

PrintAndLog("Found valid password: [%08x]", i);\r

else\r

PrintAndLog("Password NOT found. Last tried: [%08x]", --i);\r

+\r

+ free(keyBlock);\r

return 0;\r

}\r

\r