X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ba39db376c12c945f3ba1bc0ad5b8cc188e21d6f..b828a4e16818697605d57f2600cbb815c5ce5e7e:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index abb786f4..b6c8b3c9 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -130,9 +130,9 @@ char* getTagInfo(uint8_t uid) {
 int usage_hf_14a_sim(void) {
 //	PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
 	PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
-	PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
-	PrintAndLog("  Options : ");
-	PrintAndLog("    h     : this help");
+	PrintAndLog("usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
+	PrintAndLog("options: ");
+	PrintAndLog("    h     : This help");
 	PrintAndLog("    t     : 1 = MIFARE Classic");
 	PrintAndLog("            2 = MIFARE Ultralight");
 	PrintAndLog("            3 = MIFARE Desfire");
@@ -142,12 +142,14 @@ int usage_hf_14a_sim(void) {
 	PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
 //	PrintAndLog("    u     : 4, 7 or 10 byte UID");
 	PrintAndLog("    u     : 4, 7 byte UID");
-	PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
-	PrintAndLog("    v     : (Optional) show maths used for cracking reader. Useful for debugging.");
-	PrintAndLog("\n   sample : hf 14a sim t 1 u 11223344 x");
-	PrintAndLog("          : hf 14a sim t 1 u 11223344");
-	PrintAndLog("          : hf 14a sim t 1 u 11223344556677");
-//	PrintAndLog("          : hf 14a sim t 1 u 11223445566778899AA\n");
+	PrintAndLog("    x     : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
+	PrintAndLog("    e     : (Optional) Fill simulator keys from found keys");	
+	PrintAndLog("    v     : (Optional) Verbose");
+	PrintAndLog("samples:");
+	PrintAndLog("          hf 14a sim t 1 u 11223344 x");
+	PrintAndLog("          hf 14a sim t 1 u 11223344");
+	PrintAndLog("          hf 14a sim t 1 u 11223344556677");
+//	PrintAndLog("          hf 14a sim t 1 u 11223445566778899AA\n");
 	return 0;
 }
 int usage_hf_14a_sniff(void){
@@ -216,16 +218,15 @@ int CmdHF14AReader(const char *Cmd) {
 			ul_switch_off_field();
 			
 			uint32_t tagT = GetHF14AMfU_Type();
-			ul_print_type(tagT, 0);
+			if (tagT != UL_ERROR)
+				ul_print_type(tagT, 0);
 
 			// reconnect for further tests
 			c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
 			c.arg[1] = 0;
 			c.arg[2] = 0;
-
 			clearCommandBuffer();
 			SendCommand(&c);
-
 			UsbCommand resp;
 			WaitForResponse(CMD_ACK, &resp);
 			
@@ -440,7 +441,6 @@ int CmdHF14ACUIDs(const char *Cmd) {
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
 int CmdHF14ASim(const char *Cmd) {
-	#define ATTACK_KEY_COUNT 8
 	bool errors = FALSE;
 	uint8_t flags = 0;
 	uint8_t tagtype = 1;	
@@ -448,8 +448,10 @@ int CmdHF14ASim(const char *Cmd) {
 	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
 	int uidlen = 0;
 	bool useUIDfromEML = TRUE;
-	bool verbose = false;
-
+	bool setEmulatorMem = FALSE;
+	bool verbose = FALSE;
+	nonces_t data[1];
+	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(param_getchar(Cmd, cmdp)) {
 			case 'h':
@@ -460,7 +462,7 @@ int CmdHF14ASim(const char *Cmd) {
 				// Retrieve the tag type
 				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
 				if (tagtype == 0)
-					errors = true; 
+					errors = TRUE; 
 				cmdp += 2;
 				break;
 			case 'u':
@@ -481,7 +483,7 @@ int CmdHF14ASim(const char *Cmd) {
 				break;
 			case 'v':
 			case 'V':
-				verbose = true;
+				verbose = TRUE;
 				cmdp++;
 				break;
 			case 'x':
@@ -489,9 +491,14 @@ int CmdHF14ASim(const char *Cmd) {
 				flags |= FLAG_NR_AR_ATTACK;
 				cmdp++;
 				break;
+			case 'e':
+			case 'E':
+				setEmulatorMem = TRUE;
+				cmdp++;
+				break;				
 			default:
 				PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
+				errors = TRUE;
 				break;
 			}
 		if(errors) break;
@@ -503,25 +510,23 @@ int CmdHF14ASim(const char *Cmd) {
 	if ( useUIDfromEML ) 
 		flags |= FLAG_UID_IN_EMUL;
 	
-	PrintAndLog("Press pm3-button to abort simulation");
-	
 	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};	
 	memcpy(c.d.asBytes, uid, uidlen>>1);
 	clearCommandBuffer();
 	SendCommand(&c);	
-
-	nonces_t data[ATTACK_KEY_COUNT*2];
 	UsbCommand resp;
-
+	
+	PrintAndLog("Press pm3-button to abort simulation");
+	
 	while( !ukbhit() ){
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-
 		if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
 		if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
 			
-		memcpy( data, resp.d.asBytes, sizeof(data) );
-		readerAttack(data, TRUE, verbose);
+		memcpy(data, resp.d.asBytes, sizeof(data) );
+		readerAttack(data[0], setEmulatorMem, verbose);
 	}
+	showSectorTable();
 	return 0;
 }