X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db25599d7faa310019d325290b9b93a59dd97c1b..b87f99f4bbca6ed29ebeaa78b0165e70941e934d:/client/cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3f865b1d..3b56881b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -28,6 +28,7 @@
 
 #define CONFIGURATION_BLOCK 0x00
 #define TRACE_BLOCK 0x01
+#define T55x7_PWD	0x00000010
 
 // Default configuration
 t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};
@@ -37,7 +38,7 @@ int usage_t55xx_config(){
 	PrintAndLog("Options:        ");
 	PrintAndLog("       h                        This help");
 	PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");
-	PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");
+	PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
 	PrintAndLog("       i [1]                            Invert data signal, defaults to normal");
 	PrintAndLog("       o [offset]                       Set offset, where data should start decode in bitstream");
 	PrintAndLog("");
@@ -219,14 +220,11 @@ int CmdT55xxReadBlock(const char *Cmd) {
 	int password = 0xFFFFFFFF; //default to blank Block 7
 
 	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H')
-		return usage_t55xx_read();
+	if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_read();
 
 	int res = sscanf(Cmd, "%d %x", &block, &password);
 
-	if ( res < 1 || res > 2 )
-		return usage_t55xx_read();
-
+	if ( res < 1 || res > 2 ) return usage_t55xx_read();
 	
 	if ((block < 0) | (block > 7)) {
 		PrintAndLog("Block must be between 0 and 7");
@@ -238,8 +236,20 @@ int CmdT55xxReadBlock(const char *Cmd) {
 
 	//Password mode
 	if ( res == 2 ) {
-		c.arg[2] = password;
-		c.d.asBytes[0] = 0x1; 
+		
+		// try reading the config block and verify that PWD bit is set before doing this!
+		AquireData( CONFIGURATION_BLOCK );
+		if ( !tryDetectModulation() ) {
+			PrintAndLog("Could not detect is PWD bit is set in config block. Exits.");
+			return 1;
+		}
+		//if PWD bit is set,  allow to execute read command with password.
+		if (( config.block0 & T55x7_PWD ) == 1) {
+			c.arg[2] = password;
+			c.d.asBytes[0] = 0x1; 			
+		} else {		
+			PrintAndLog("PWD bit is NOT set in config block. Reading without password...");
+		}
 	}
 
 	clearCommandBuffer();
@@ -252,8 +262,8 @@ int CmdT55xxReadBlock(const char *Cmd) {
 	uint8_t got[12000];
 	GetFromBigBuf(got,sizeof(got),0);
 	WaitForResponse(CMD_ACK,NULL);
-	setGraphBuf(got, 12000);
-	DemodBufferLen=0;
+	setGraphBuf(got, sizeof(got));
+	//DemodBufferLen=0;
 	if (!DecodeT55xxBlock()) return 3;
 	char blk[10]={0};
 	sprintf(blk,"%d", block);
@@ -270,8 +280,8 @@ bool DecodeT55xxBlock(){
 	DemodBufferLen = 0x00;
 
 	//trim 1/2 a clock from beginning
-	snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
-	CmdLtrim(cmdStr);
+	//snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
+	//CmdLtrim(cmdStr);
 	switch( config.modulation ){
 		case DEMOD_FSK:
 			snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
@@ -333,7 +343,7 @@ int CmdT55xxDetect(const char *Cmd){
 
 // detect configuration?
 bool tryDetectModulation(){
-	char cmdStr[8] = {0};
+	//char cmdStr[8] = {0};
 	uint8_t hits = 0;
 	t55xx_conf_block_t tests[15];
 	int bitRate=0;
@@ -341,8 +351,8 @@ bool tryDetectModulation(){
 	save_restoreGB(1);
 	if (GetFskClock("", FALSE, FALSE)){ 
 		fskClocks(&fc1, &fc2, &clk, FALSE);
-		sprintf(cmdStr,"%d", clk/2);
-		CmdLtrim(cmdStr);
+		//sprintf(cmdStr,"%d", clk/2);
+		//CmdLtrim(cmdStr);
 		if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){
 			tests[hits].modulation = DEMOD_FSK;
 			if (fc1==8 && fc2 == 5)
@@ -369,8 +379,8 @@ bool tryDetectModulation(){
 	} else {
 		clk = GetAskClock("", FALSE, FALSE);
 		if (clk>0) {
-			sprintf(cmdStr,"%d", clk/2);
-			CmdLtrim(cmdStr);
+			//sprintf(cmdStr,"%d", clk/2);
+			//CmdLtrim(cmdStr);
 			if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {
 				tests[hits].modulation = DEMOD_ASK;
 				tests[hits].bitrate = bitRate;
@@ -404,8 +414,8 @@ bool tryDetectModulation(){
 		save_restoreGB(0);
 		clk = GetNrzClock("", FALSE, FALSE);
 		if (clk>0) {
-			sprintf(cmdStr,"%d", clk/2);
-			CmdLtrim(cmdStr);
+			//sprintf(cmdStr,"%d", clk/2);
+			//CmdLtrim(cmdStr);
 			if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {
 				tests[hits].modulation = DEMOD_NRZ;
 				tests[hits].bitrate = bitRate;
@@ -427,9 +437,9 @@ bool tryDetectModulation(){
 		save_restoreGB(0);
 		clk = GetPskClock("", FALSE, FALSE);
 		if (clk>0) {
-			PrintAndLog("clk %d",clk);
-			sprintf(cmdStr,"%d", clk/2);
-			CmdLtrim(cmdStr);	
+			//PrintAndLog("clk %d",clk);
+			//sprintf(cmdStr,"%d", clk/2);
+			//CmdLtrim(cmdStr);	
 			if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {
 				tests[hits].modulation = DEMOD_PSK1;
 				tests[hits].bitrate = bitRate;
@@ -667,11 +677,11 @@ int CmdT55xxWriteBlock(const char *Cmd)
 
 	if (block > 7) {
 		PrintAndLog("Block number must be between 0 and 7");
-		return 2;
+		return 1;
 	}
 	
-	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
+	UsbCommand resp;
  	c.d.asBytes[0] = 0x0; 
 
 	PrintAndLog("Writing to block: %d  data  : 0x%08X", block, data);
@@ -1058,6 +1068,12 @@ char * GetSelectedModulationStr( uint8_t id){
 	return buf;
 }
 
+void t55x7_create_config_block( int tagtype ){
+	//switch?
+	
+	
+}
+
 /*
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){