X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bc7846f4376472abdc9ced23436dfe3b6dd20e7f..080e1114c8f71ba53d34d274511aaac674e0fc85:/client/cmdhfmf.c?ds=sidebyside

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ea73bf95..e6568f59 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -24,19 +24,20 @@ int usage_hf14_mifare(void){
 	return 0;
 }
 int usage_hf14_mf1ksim(void){
-	PrintAndLog("Usage:  hf mf sim  [h] u <uid (8,14,20 hex symbols)> n <numreads> i x");
+	PrintAndLog("Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
 	PrintAndLog("options:");
 	PrintAndLog("      h    this help");
 	PrintAndLog("      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
 	PrintAndLog("      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
 	PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
-	PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
-	PrintAndLog("      e    (Optional) Fill simulator keys from what we crack");
-	PrintAndLog("      v    (Optional) Show maths used for cracking reader. Useful for debugging.");
+	PrintAndLog("      x    (Optional) Crack, 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 mf sim u 0a0a0a0a");
 	PrintAndLog("           hf mf sim u 11223344556677");
 	PrintAndLog("           hf mf sim u 112233445566778899AA");	
+	PrintAndLog("           hf mf sim u 11223344 i x");	
 	return 0;
 }
 int usage_hf14_dbg(void){
@@ -214,14 +215,14 @@ start:
 		}
 	}	
 	printf("\n");
+	// error
+	if (isOK != 1) return 1;
 	
-	// par == 0,  and -4
-	if (isOK == -4 && par_list == 0) {
+	if (par_list == 0 && ks_list != 0) {
 		// this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. 
 		// but it uses 0|1 instead of 0x60|0x61...
 		if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){
-			PrintAndLog("Key not found (lfsr_common_prefix list is null).");	
-			PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
+			PrintAndLog("Trying again with a different reader nonce...");
 			c.arg[0] = false;
 			goto start;
 		} else {
@@ -229,10 +230,7 @@ start:
 			goto END;
 		}
 	}
-	
-	// error
-	if (isOK != 1) return 1;
-	
+
 	// execute original function from util nonce2key
 	if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {
 		isOK = 2;
@@ -248,7 +246,7 @@ start:
 		uint64_t key64 = 0;
 		int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);
 		if ( res > 0 ) {
-			PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. Starting over darkside attack", r_key);	
+			PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);	
 			goto start;
 		}
 		PrintAndLog("Found valid key: %012"llx" \n", r_key);
@@ -1060,7 +1058,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			slow ? "Yes" : "No",
 			tests);
 
-	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests);
+	uint64_t foundkey = 0;
+	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey);
 
 	if (isOK) {
 		switch (isOK) {
@@ -1362,18 +1361,16 @@ int CmdHF14AMfChk(const char *Cmd) {
 	PrintAndLog("");
 	return 0;
 }
-#define ATTACK_KEY_COUNT 8
+
 sector *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
-void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {
+static void emptySectorTable(){
 
 	// initialize storage for found keys
 	if (k_sector == NULL)
 		k_sector = calloc(k_sectorsCount, sizeof(sector));
 	if (k_sector == NULL) 
 		return;
-
-	uint64_t key = 0;
 		
 	// empty e_sector
 	for(int i = 0; i < k_sectorsCount; ++i){
@@ -1382,65 +1379,47 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {
 		k_sector[i].foundKey[0] = FALSE;
 		k_sector[i].foundKey[1] = FALSE;
 	}
+}
+void showSectorTable(){
+	if (k_sector != NULL) {
+		printKeyTable(k_sectorsCount, k_sector);
+		free(k_sector);
+		k_sector = NULL;
+	}
+}
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 
-	printf("enter reader attack\n");
-	for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {
-		if (data[i].ar2 > 0) {
+	uint64_t key = 0;	
+	bool success = FALSE;
+	
+	if (k_sector == NULL)
+		emptySectorTable();
 
-			// We can probably skip this, mfkey32v2 is more reliable.
-#ifdef HFMF_TRYMFK32
-			if (tryMfk32(data[i], &key)) {
-				PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"
-					, (data[i].keytype) ? "B" : "A"
-					, data[i].sector
-					, key
-				);
+	success = tryMfk32_moebius(data, &key, verbose);
+	if (success) {
+		uint8_t sector = data.sector;
+		uint8_t keytype = data.keytype;
 
-				k_sector[i].Key[data[i].keytype] = key;
-				k_sector[i].foundKey[data[i].keytype] = TRUE;
-				
-				//set emulator memory for keys
-				if (setEmulatorMem) {
-					uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
-					num_to_bytes( k_sector[i].Key[0], 6, memBlock);
-					num_to_bytes( k_sector[i].Key[1], 6, memBlock+10);
-					PrintAndLog("Setting Emulator Memory Block %02d: [%s]"
-						, ((data[i].sector)*4) + 3
-						, sprint_hex( memBlock, sizeof(memBlock))
-						);
-					mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);
-				}
-				continue;
-			}
-#endif
-			//moebius attack			
-			if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, showMaths)) {
-				uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;
-				uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;
-
-				PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"
-					, keyType ? "B" : "A"
-					, sectorNum
-					, key
-				);
-
-				k_sector[sectorNum].Key[keyType] = key;
-				k_sector[sectorNum].foundKey[keyType] = TRUE;
-
-				//set emulator memory for keys
-				if (setEmulatorMem) {
-					uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
-					num_to_bytes( k_sector[sectorNum].Key[0], 6, memBlock);
-					num_to_bytes( k_sector[sectorNum].Key[1], 6, memBlock+10);
-					PrintAndLog("Setting Emulator Memory Block %02d: [%s]"
-						, (sectorNum*4) + 3
-						, sprint_hex( memBlock, sizeof(memBlock))
-						);
-					mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);
-				}
-				continue;
-			}
+		PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012"llx"]"
+			, keytype ? "B" : "A"
+			, sector
+			, key
+		);
 
+		k_sector[sector].Key[keytype] = key;
+		k_sector[sector].foundKey[keytype] = TRUE;
+
+		//set emulator memory for keys
+		if (setEmulatorMem) {
+			uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
+			num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
+			num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
+			//iceman,  guessing this will not work so well for 4K tags.
+			PrintAndLog("Setting Emulator Memory Block %02d: [%s]"
+				, (sector*4) + 3
+				, sprint_hex( memBlock, sizeof(memBlock))
+				);
+			mfEmlSetMem( memBlock, (sector*4) + 3, 1);
 		}
 	}
 }
@@ -1451,18 +1430,17 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	uint8_t exitAfterNReads = 0;
 	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
 	int uidlen = 0;
-	bool setEmulatorMem = false;
 	uint8_t cmdp = 0;
-	bool errors = false;
-
-	// If set to true, we should show our workings when doing NR_AR_ATTACK.
-	bool showMaths = false;
-
+	bool errors = FALSE;
+	bool verbose = FALSE;
+	bool setEmulatorMem = FALSE;
+	nonces_t data[1];
+		
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(param_getchar(Cmd, cmdp)) {
 		case 'e':
 		case 'E':
-			setEmulatorMem = true;
+			setEmulatorMem = TRUE;
 			cmdp++;
 			break;
 		case 'h':
@@ -1487,11 +1465,11 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 				case  8: flags = FLAG_4B_UID_IN_DATA; break;
 				default: return usage_hf14_mf1ksim();
 			}
-			cmdp +=2;
+			cmdp += 2;
 			break;
 		case 'v':
 		case 'V':
-			showMaths = true;
+			verbose = TRUE;
 			cmdp++;
 			break;
 		case 'x':
@@ -1501,7 +1479,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 			break;
 		default:
 			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
+			errors = TRUE;
 			break;
 		}
 		if(errors) break;
@@ -1519,28 +1497,20 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	memcpy(c.d.asBytes, uid, sizeof(uid));
 	clearCommandBuffer();
 	SendCommand(&c);
+	UsbCommand resp;		
 
-	if(flags & FLAG_INTERACTIVE) {		
+	if(flags & FLAG_INTERACTIVE) {
 		PrintAndLog("Press pm3-button or send another cmd to abort simulation");
 
-		nonces_t data[ATTACK_KEY_COUNT*2];
-		UsbCommand resp;		
-
 		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, setEmulatorMem, showMaths);
-		}
-		
-		if (k_sector != NULL) {
-			printKeyTable(k_sectorsCount, k_sector );
-			free(k_sector);
-			k_sector = NULL;
+			memcpy(data, resp.d.asBytes, sizeof(data));
+			readerAttack(data[0], setEmulatorMem, verbose);
 		}
+		showSectorTable();
 	}
 	return 0;
 }