X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e98572a1e2dde603f31cc06f330c6abd295139de..bae363d860ebf06056b3cbaeae11f6ab9fdf9ba7:/client/cmdhf14a.c?ds=inline

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c85fadda..577ee574 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -25,8 +25,7 @@
 #include "mifare.h"
 #include "cmdhfmfu.h"
 #include "nonce2key/nonce2key.h"
-
-#define llx PRIx64
+#include "cmdhf.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
@@ -127,17 +126,60 @@ char* getTagInfo(uint8_t uid) {
 	return manufactureMapping[len-1].desc; 
 }
 
+
+int usage_hf_14a_sim(void) {
+	PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
+	PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
+	PrintAndLog("  Options : ");
+	PrintAndLog("    h     : this help");
+	PrintAndLog("    t     : 1 = MIFARE Classic");
+	PrintAndLog("            2 = MIFARE Ultralight");
+	PrintAndLog("            3 = MIFARE Desfire");
+	PrintAndLog("            4 = ISO/IEC 14443-4");
+	PrintAndLog("            5 = MIFARE Tnp3xxx");
+	PrintAndLog("            6 = MIFARE Mini");
+	PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
+	PrintAndLog("    u     : 4 or 7 byte UID");
+	PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
+	PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
+	PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
+	return 0;
+}
+int usage_hf_14a_sniff(void){
+	PrintAndLog("It get data from the field and saves it into command buffer.");
+	PrintAndLog("Buffer accessible from command 'hf list 14a'");
+	PrintAndLog("Usage:  hf 14a sniff [c][r]");
+	PrintAndLog("c - triggered by first data from card");
+	PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+	PrintAndLog("sample: hf 14a sniff c r");
+	return 0;
+}
+int usage_hf_14a_raw(void){
+	PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+	PrintAndLog("       -h    this help");
+	PrintAndLog("       -r    do not read response");
+	PrintAndLog("       -c    calculate and append CRC");
+	PrintAndLog("       -p    leave the signal field ON after receive");
+	PrintAndLog("       -a    active signal field ON without select");
+	PrintAndLog("       -s    active signal field ON with select");
+	PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
+	PrintAndLog("       -t    timeout in ms");
+	PrintAndLog("       -T    use Topaz protocol to send command");
+	return 0;
+}
+
 int CmdHF14AList(const char *Cmd)
 {
-	PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+	//PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+	CmdHFList("14a");
 	return 0;
 }
 
 int CmdHF14AReader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+	clearCommandBuffer();
 	SendCommand(&c);
-
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
 	
@@ -185,6 +227,7 @@ int CmdHF14AReader(const char *Cmd)
 			c.arg[1] = 0;
 			c.arg[2] = 0;
 
+			clearCommandBuffer();
 			SendCommand(&c);
 
 			UsbCommand resp;
@@ -248,6 +291,7 @@ int CmdHF14AReader(const char *Cmd)
 		c.arg[1] = 2;
 		c.arg[2] = 0;
 		memcpy(c.d.asBytes, rats, 2);
+		clearCommandBuffer();
 		SendCommand(&c);
 		WaitForResponse(CMD_ACK,&resp);
 		
@@ -345,16 +389,16 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     x0 -> <1 kByte");
 						break;
 					case 0x01:
-						PrintAndLog("                     x0 -> 1 kByte");
+						PrintAndLog("                     x1 -> 1 kByte");
 						break;
 					case 0x02:
-						PrintAndLog("                     x0 -> 2 kByte");
+						PrintAndLog("                     x2 -> 2 kByte");
 						break;
 					case 0x03:
-						PrintAndLog("                     x0 -> 4 kByte");
+						PrintAndLog("                     x3 -> 4 kByte");
 						break;
 					case 0x04:
-						PrintAndLog("                     x0 -> 8 kByte");
+						PrintAndLog("                     x4 -> 8 kByte");
 						break;
 				}
 				switch (card.ats[pos + 3] & 0xf0) {
@@ -395,14 +439,17 @@ int CmdHF14AReader(const char *Cmd)
 
 	
 	// try to see if card responses to "chinese magic backdoor" commands.
+	uint8_t isOK = 0;
+	clearCommandBuffer();
 	c.cmd = CMD_MIFARE_CIDENT;
 	c.arg[0] = 0;
 	c.arg[1] = 0;
 	c.arg[2] = 0;	
 	SendCommand(&c);
-	WaitForResponse(CMD_ACK,&resp);
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+		isOK  = resp.arg[0] & 0xff;
+
+	PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
 	
 	// disconnect
 	c.cmd = CMD_READER_ISO_14443a;
@@ -451,27 +498,6 @@ int CmdHF14ACUIDs(const char *Cmd)
 	return 1;
 }
 
-
-static int usage_hf_14a_sim(void)
-{
-	PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
-	PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
-	PrintAndLog("  Options : ");
-	PrintAndLog("    h     : this help");
-	PrintAndLog("    t     : 1 = MIFARE Classic");
-	PrintAndLog("            2 = MIFARE Ultralight");
-	PrintAndLog("            3 = MIFARE Desfire");
-	PrintAndLog("            4 = ISO/IEC 14443-4");
-	PrintAndLog("            5 = MIFARE Tnp3xxx");
-	PrintAndLog("            6 = MIFARE Mini");
-	PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
-	PrintAndLog("    u     : 4 or 7 byte UID");
-	PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
-	PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
-	PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
-	return 0;
-}
-
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
 int CmdHF14ASim(const char *Cmd)
@@ -481,9 +507,7 @@ int CmdHF14ASim(const char *Cmd)
 	uint8_t tagtype = 1;
 	uint64_t uid = 0;
 	uint8_t cmdp = 0;
-	
-	clearCommandBuffer();
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00)
 	{
 		switch(param_getchar(Cmd, cmdp))
@@ -536,6 +560,7 @@ int CmdHF14ASim(const char *Cmd)
 	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
 	
 	num_to_bytes(uid, 7, c.d.asBytes);
+	clearCommandBuffer();
 	SendCommand(&c);	
 
 	uint8_t data[40];
@@ -549,7 +574,7 @@ int CmdHF14ASim(const char *Cmd)
 				int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
 				memcpy(data, resp.d.asBytes, len);
 				tryMfk32(uid, data, key);
-				tryMfk32_moebius(uid, data, key);
+				//tryMfk32_moebius(uid, data, key);
 				//tryMfk64(uid, data, key);
 				PrintAndLog("--");
 			}
@@ -562,15 +587,7 @@ int CmdHF14ASniff(const char *Cmd) {
 	int param = 0;
 	
 	uint8_t ctmp = param_getchar(Cmd, 0) ;
-	if (ctmp == 'h' || ctmp == 'H') {
-		PrintAndLog("It get data from the field and saves it into command buffer.");
-		PrintAndLog("Buffer accessible from command 'hf list 14a'");
-		PrintAndLog("Usage:  hf 14a sniff [c][r]");
-		PrintAndLog("c - triggered by first data from card");
-		PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
-		PrintAndLog("sample: hf 14a sniff c r");
-		return 0;
-	}	
+	if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
 	
 	for (int i = 0; i < 2; i++) {
 		ctmp = param_getchar(Cmd, i);
@@ -579,11 +596,11 @@ int CmdHF14ASniff(const char *Cmd) {
 	}
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+  clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
-
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;
@@ -601,19 +618,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 	uint16_t datalen=0;
 	uint32_t temp;
 
-    if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
-        PrintAndLog("       -r    do not read response");
-        PrintAndLog("       -c    calculate and append CRC");
-        PrintAndLog("       -p    leave the signal field ON after receive");
-        PrintAndLog("       -a    active signal field ON without select");
-        PrintAndLog("       -s    active signal field ON with select");
-        PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
-		PrintAndLog("       -t    timeout in ms");
-		PrintAndLog("       -T    use Topaz protocol to send command");
-        return 0;
-    }
-
+    if (strlen(cmd)<2) return usage_hf_14a_raw();
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
@@ -622,6 +627,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
+				case 'H':
+				case 'h':
+					return usage_hf_14a_raw();
                 case 'r': 
                     reply = FALSE;
                     break;
@@ -656,8 +664,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 					topazmode = TRUE;
 					break;
                 default:
-                    PrintAndLog("Invalid option");
-                    return 0;
+                    return usage_hf_14a_raw();
             }
             i+=2;
             continue;
@@ -722,10 +729,12 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
 	if(topazmode)
 		c.arg[0] |= ISO14A_TOPAZMODE;
-		
+			
 	// Max buffer is USB_CMD_DATA_SIZE
-    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
-    memcpy(c.d.asBytes,data,datalen);
+	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+		
+    c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
+    memcpy(c.d.asBytes, data, datalen);
 
 	clearCommandBuffer();
     SendCommand(&c);
@@ -739,29 +748,16 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
-
-static void waitCmd(uint8_t iSelect)
-{
-    uint8_t *recv;
+static void waitCmd(uint8_t iSelect) {
     UsbCommand resp;
-    char *hexout;
+    uint16_t len = 0;
 
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        recv = resp.d.asBytes;
-        uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
-        PrintAndLog("received %i octets",iLen);
-        if(!iLen)
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {        
+        len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
+        PrintAndLog("received %i octets", len);
+        if(!len)
             return;
-        hexout = (char *)malloc(iLen * 3 + 1);
-        if (hexout != NULL) {
-            for (int i = 0; i < iLen; i++) { // data in hex
-                sprintf(&hexout[i * 3], "%02X ", recv[i]);
-            }
-            PrintAndLog("%s", hexout);
-            free(hexout);
-        } else {
-            PrintAndLog("malloc failed your client has low memory?");
-        }
+		PrintAndLog("%s", sprint_hex(resp.d.asBytes, len) );
     } else {
         PrintAndLog("timeout while waiting for reply.");
     }
@@ -781,7 +777,8 @@ static command_t CommandTable[] =
 
 int CmdHF14A(const char *Cmd) {
 	// flush
-	WaitForResponseTimeout(CMD_ACK,NULL,100);
+	clearCommandBuffer();
+	//WaitForResponseTimeout(CMD_ACK,NULL,100);
 
 	// parse
 	CmdsParse(CommandTable, Cmd);