X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/38e4191705fcf63696116c6663982f5b921ac2c1..c71f4da9bc3d8207e8308e3212345eb578e1a08f:/client/cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 969510df..a14c2e59 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -29,8 +29,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFTune(const char *Cmd)
-{
+int CmdHFTune(const char *Cmd) {
 	PrintAndLog("Measuring HF antenna, press button to exit");
 	UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
 	clearCommandBuffer();
@@ -48,23 +47,19 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 		// 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
 		// 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
 		if(cmd[1] == 0x70)
-		{
-			snprintf(exp,size,"SELECT_UID"); break;
-		}else
-		{
-			snprintf(exp,size,"ANTICOLL"); break;
-		}
+			snprintf(exp,size,"SELECT_UID");
+		else
+			snprintf(exp,size,"ANTICOLL");
+		break;
 	}
 	case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
 		//95 20 = Anticollision of cascade level2
 		//95 70 = Select of cascade level2
 		if(cmd[2] == 0x70)
-		{
-			snprintf(exp,size,"SELECT_UID-2"); break;
-		}else
-		{
-			snprintf(exp,size,"ANTICOLL-2"); break;
-		}
+			snprintf(exp,size,"SELECT_UID-2");
+		else
+			snprintf(exp,size,"ANTICOLL-2");
+		break;
 	}
 	case ISO14443A_CMD_REQA:		snprintf(exp,size,"REQA"); break;
 	case ISO14443A_CMD_READBLOCK:	snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
@@ -272,7 +267,21 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
 	switch(cmd[0]){
-		case ISO14443B_REQB   		: snprintf(exp,size,"REQB");break;
+		case ISO14443B_REQB   		: {
+			
+			switch ( cmd[2] & 0x07 ) {
+				case 0: snprintf(exp, size,"1 slot ");break;
+				case 1: snprintf(exp, size,"2 slots ");break; 
+				case 2: snprintf(exp, size,"4 slots ");break;
+				case 3: snprintf(exp, size,"8 slots ");break;
+				default: snprintf(exp, size,"16 slots ");break;
+			}			
+			if ( (cmd[2] & 0x8) )
+				snprintf(exp, size,"WUPB");
+			else
+				snprintf(exp, size,"REQB");
+			break;
+		}
 		case ISO14443B_ATTRIB 		: snprintf(exp,size,"ATTRIB");break;
 		case ISO14443B_HALT   		: snprintf(exp,size,"HALT");break;
 		case ISO14443B_INITIATE     : snprintf(exp,size,"INITIATE");break;
@@ -533,7 +542,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 			oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
 		}
 		uint8_t parityBits = parityBytes[j>>3];
-		if (protocol != ISO_14443B &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+		if (protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
 			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
 
 		} else {
@@ -552,9 +561,10 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 		}
 	}
 
-	if(data_len == 0){
+	if(data_len == 0 )
 		sprintf(line[0],"<empty trace - possible error>");
-	}
+
+
 	//--- Draw the CRC column
 	char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
@@ -732,12 +742,12 @@ int CmdHFSearch(const char *Cmd){
 	int ans = CmdHF14AReader("s");
 
 	if (ans > 0) {
-		PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
+		PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
 		return ans;
 	} 
-	ans = HF14BInfo(false);
+	ans = CmdHF14BReader("s");
 	if (ans) {
-		PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+		PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
 		return ans;
 	}
 	ans = HFiClassReader("", false, false);
@@ -750,6 +760,11 @@ int CmdHFSearch(const char *Cmd){
 		PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
 		return ans;
 	}
+	ans = CmdHFTopazReader("s");
+	if (ans == 0) {
+		PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
+		return 1;
+	}
 	PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
 	return 0;
 }
@@ -762,7 +777,7 @@ int CmdHFSnoop(const char *Cmd)
 	int skippairs =  param_get32ex(Cmd, 0, 0, 10);
 	int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 	
-	UsbCommand c = {CMD_HF_SNIFFER, {skippairs,skiptriggers,0}};
+	UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;