X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/49dc1d0a9eafdb1e369ead88c3c8882bc6959a17..573e8d72c73f12754d5775cca24d7d9380cc2c78:/client/cmdhf15.c

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index cff13b5b..d17e7cd1 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -37,13 +37,13 @@
 #include "iso15693tools.h"
 #include "cmdmain.h"
 
-#define FrameSOF              Iso15693FrameSOF
-#define Logic0						Iso15693Logic0
-#define Logic1						Iso15693Logic1
-#define FrameEOF					Iso15693FrameEOF
+#define FrameSOF				Iso15693FrameSOF
+#define Logic0					Iso15693Logic0
+#define Logic1					Iso15693Logic1
+#define FrameEOF				Iso15693FrameEOF
 
-#define Crc(data,datalen)     Iso15693Crc(data,datalen)
-#define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
+#define Crc(data,datalen)		Iso15693Crc(data,datalen)
+#define AddCrc(data,datalen)	Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)	Iso15693sprintUID(target,uid)
 
 // structure and database for uid -> tagtype lookups 
@@ -207,23 +207,22 @@ int getUID(uint8_t *buf)
 	UsbCommand resp;
 	uint8_t *recv;
 	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req=c.d.asBytes;
-	int reqlen=0;
+	uint8_t *req = c.d.asBytes;
+	int reqlen = 0;
 	
-	for (int retry=0;retry<3; retry++) { // don't give up the at the first try		
+	for (int retry = 0; retry <3; retry++) { // don't give up the at the first try		
 		
-		req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-		        ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-		req[1]=ISO15_CMD_INVENTORY;
-		req[2]=0; // mask length
-		reqlen=AddCrc(req,3);
-		c.arg[0]=reqlen;
+		req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+		req[1] = ISO15_CMD_INVENTORY;
+		req[2] = 0; // mask length
+		reqlen = AddCrc(req, 3);
+		c.arg[0] = reqlen;
 	
 		SendCommand(&c);
 		
-		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 			recv = resp.d.asBytes;
-			if (resp.arg[0]>=12 && ISO15_CRC_CHECK==Crc(recv,12)) {
+			if (resp.arg[0] >= 12 && ISO15_CRC_CHECK == Crc(recv,12)) {
 			   memcpy(buf,&recv[2],8);
 			   return 1;
 			} 
@@ -238,16 +237,16 @@ int getUID(uint8_t *buf)
 //		uid[8] 	tag uid
 // returns description of the best match	
 static char* getTagInfo(uint8_t *uid) {
-	uint64_t myuid,mask;
-	int i=0, best=-1;	
-	memcpy(&myuid,uid,sizeof(uint64_t));
-	while (uidmapping[i].mask>0) {
-		mask=(~0LL) <<(64-uidmapping[i].mask);
+	uint64_t myuid, mask;
+	int i = 0, best = -1;	
+	memcpy(&myuid, uid, sizeof(uint64_t));
+	while (uidmapping[i].mask > 0) {
+		mask = (~0LL) << (64-uidmapping[i].mask);
 		if ((myuid & mask) == uidmapping[i].uid) {
-			if (best==-1) { 
-				best=i;
+			if (best == -1) { 
+				best = i;
 			} else {
-				if (uidmapping[i].mask>uidmapping[best].mask) {
+				if (uidmapping[i].mask > uidmapping[best].mask) {
 					best=i;
 				}
 			}					
@@ -255,8 +254,8 @@ static char* getTagInfo(uint8_t *uid) {
 		i++;
 	} 
 
-	if (best>=0) return uidmapping[best].desc;
-	
+	if (best >= 0)
+		return uidmapping[best].desc;
 	return uidmapping[i].desc; 
 }
 
@@ -293,7 +292,7 @@ int CmdHF15Demod(const char *Cmd)
 	// First, correlate for SOF
 	for (i = 0; i < 100; i++) {
 		int corr = 0;
-		for (j = 0; j < arraylen(FrameSOF); j += skip) {
+		for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
 			corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
 		}
 		if (corr > max) {
@@ -301,23 +300,22 @@ int CmdHF15Demod(const char *Cmd)
 			maxPos = i;
 		}
 	}
-	PrintAndLog("SOF at %d, correlation %d", maxPos,
-		max / (arraylen(FrameSOF) / skip));
+	PrintAndLog("SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
 	
-	i = maxPos + arraylen(FrameSOF) / skip;
+	i = maxPos + ARRAYLEN(FrameSOF) / skip;
 	int k = 0;
 	uint8_t outBuf[20];
 	memset(outBuf, 0, sizeof(outBuf));
 	uint8_t mask = 0x01;
 	for (;;) {
 		int corr0 = 0, corr1 = 0, corrEOF = 0;
-		for (j = 0; j < arraylen(Logic0); j += skip) {
+		for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
 			corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
 		}
-		for (j = 0; j < arraylen(Logic1); j += skip) {
+		for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
 			corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
 		}
-		for (j = 0; j < arraylen(FrameEOF); j += skip) {
+		for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
 			corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
 		}
 		// Even things out by the length of the target waveform.
@@ -328,17 +326,17 @@ int CmdHF15Demod(const char *Cmd)
 			PrintAndLog("EOF at %d", i);
 			break;
 		} else if (corr1 > corr0) {
-			i += arraylen(Logic1) / skip;
+			i += ARRAYLEN(Logic1) / skip;
 			outBuf[k] |= mask;
 		} else {
-			i += arraylen(Logic0) / skip;
+			i += ARRAYLEN(Logic0) / skip;
 		}
 		mask <<= 1;
 		if (mask == 0) {
 			k++;
 			mask = 0x01;
 		}
-		if ((i + (int)arraylen(FrameEOF)) >= GraphTraceLen) {
+		if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
 			PrintAndLog("ran off end!");
 			break;
 		}
@@ -374,6 +372,20 @@ int CmdHF15Record(const char *Cmd)
 	return 0;
 }
 
+int HF15Reader(const char *Cmd, bool verbose)
+{
+	uint8_t uid[8];
+
+	if (!getUID(uid)) {
+		if (verbose) PrintAndLog("No Tag found.");
+		return 0;
+	}
+
+	PrintAndLog("Tag UID : %s",sprintUID(NULL,uid));
+	PrintAndLog("Tag Info: %s",getTagInfo(uid));
+	return 1;
+}
+
 int CmdHF15Reader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
@@ -421,14 +433,14 @@ int CmdHF15Afi(const char *Cmd)
 
 // Reads all memory pages
 int CmdHF15DumpMem(const char*Cmd) {
+
+	uint8_t uid[8] = {0,0,0,0,0,0,0,0};	
+	uint8_t *recv = NULL;
 	UsbCommand resp;
-	uint8_t uid[8];	
-	uint8_t *recv=NULL;
 	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req=c.d.asBytes;
-	int reqlen=0;
-	int blocknum=0;
-	char output[80];
+	uint8_t *req = c.d.asBytes;
+	int reqlen = 0, blocknum = 0;
+	char output[80] = {0};
 		
 	if (!getUID(uid)) {
 		PrintAndLog("No Tag found.");
@@ -454,22 +466,22 @@ int CmdHF15DumpMem(const char*Cmd) {
 			recv = resp.d.asBytes;
 			if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
 				if (!(recv[0] & ISO15_RES_ERROR)) {
-					retry=0;
-					*output=0; // reset outputstring
+					retry = 0;
+					*output = 0; // reset outputstring
 					sprintf(output, "Block %02x   ",blocknum);
 					for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
 						sprintf(output+strlen(output),"%02X ",recv[i]);
 					}					
 					strcat(output,"   "); 
-					for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii
-						sprintf(output+strlen(output),"%c",(recv[i]>31 && recv[i]<127)?recv[i]:'.');					
+					for ( int i = 1; i < resp.arg[0]-2; i++) { // data in cleaned ascii
+						sprintf(output+strlen(output),"%c",(recv[i] > 31 && recv[i] < 127) ? recv[i] : '.');					
 					}					
 					PrintAndLog("%s",output);	
 					blocknum++;
 					// PrintAndLog("bn=%i",blocknum);
 				} else {
 					PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-					return 0;
+					return 1;
 				}
 			} // else PrintAndLog("crc");
 		} // else PrintAndLog("r null");
@@ -481,7 +493,7 @@ int CmdHF15DumpMem(const char*Cmd) {
 //		PrintAndLog("CRC Failed");
 //	else 
 //		PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-	return 0;
+	return 1;
 }
 
 
@@ -498,7 +510,7 @@ static command_t CommandTable15[] =
 	{"cmd",     CmdHF15Cmd,     0, "Send direct commands to ISO15693 tag"},
 	{"findafi", CmdHF15Afi,     0, "Brute force AFI of an ISO15693 tag"},
 	{"dumpmemory", CmdHF15DumpMem,     0, "Read all memory pages of an ISO15693 tag"},
-		{NULL, NULL, 0, NULL}
+	{NULL, NULL, 0, NULL}
 };
 
 int CmdHF15(const char *Cmd)
@@ -782,6 +794,8 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
 		PrintAndLog("               s         selected tag");
 		PrintAndLog("               u         unaddressed mode");
 		PrintAndLog("               *         scan for tag");
+		PrintAndLog("           start#:       page number to start 0-255");  
+		PrintAndLog("           count#:       number of pages");  
 		return 0;
 	}