X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2ce218042d2aebdfa4c5a58f19e6550f367c5d81..8ad1e731c8561ba050db2e80daff7b1e97e575ca:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 36438d7f..20bb5929 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -226,7 +226,7 @@ start:
 			c.arg[0] = false;
 			goto start;
 		} else {
-			PrintAndLog("Found valid key: %012"llx" \n", r_key);
+			PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);
 			goto END;
 		}
 	}
@@ -246,10 +246,10 @@ 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. [%d] Restarting darkside attack", r_key, res);	
+			PrintAndLog("Candidate Key found (%012" PRIx64 ") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);	
 			goto start;
 		}
-		PrintAndLog("Found valid key: %012"llx" \n", r_key);
+		PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);
 	}
 END:
 	t1 = clock() - t1;
@@ -313,9 +313,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	
-	char cmdp	= 0x00;
-
+	char cmdp = 0x00;
 
 	if (strlen(Cmd)<3) {
 		PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
@@ -1207,7 +1205,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 					}
 					memset(keyBlock + 6 * keycnt, 0, 6);
 					num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-					PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+					PrintAndLog("check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 					keycnt++;
 					memset(buf, 0, sizeof(buf));
 				}
@@ -1361,18 +1359,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 verbose) {
+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){
@@ -1381,68 +1377,47 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {
 		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) {
 
-	if (verbose) printf("enter Moebius attack (mfkey32v2) \n");
+	uint64_t key = 0;	
+	bool success = FALSE;
 	
-	for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {
-		
-		// if no-collected data 
-		if (data[i].ar2 == 0) continue;
-
-		// We can probably skip this, mfkey32v2 is more reliable.
-#ifdef HFMF_TRYMFK32
-		if (tryMfk32(data[i], &key, verbose)) {
-			PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"
-				, (data[i].keytype) ? "B" : "A"
-				, data[i].sector
-				, key
-			);
-
-			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, verbose)) {
-			uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;
-			uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;
-
-			PrintAndLog("Reader is trying authenticate with: Key %s, 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);
-				//iceman,  guessing this will not work so well for 4K tags.
-				PrintAndLog("Setting Emulator Memory Block %02d: [%s]"
-					, (sectorNum*4) + 3
-					, sprint_hex( memBlock, sizeof(memBlock))
-					);
-				mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);
-			}
-			continue;
+	if (k_sector == NULL)
+		emptySectorTable();
+
+	success = tryMfk32_moebius(data, &key, verbose);
+	if (success) {
+		uint8_t sector = data.sector;
+		uint8_t keytype = data.keytype;
+
+		PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
+			, 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);
 		}
 	}
 }
@@ -1453,18 +1428,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 verbose = 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':
@@ -1489,11 +1463,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':
-			verbose = true;
+			verbose = TRUE;
 			cmdp++;
 			break;
 		case 'x':
@@ -1503,7 +1477,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 			break;
 		default:
 			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
+			errors = TRUE;
 			break;
 		}
 		if(errors) break;
@@ -1521,27 +1495,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, verbose);
-		}
-		
-		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;
 }
@@ -1738,7 +1705,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
 	time(&start);
 	
 	if (mfKeyBrute( blockNo, keytype, key, &foundkey))
-		PrintAndLog("Found valid key: %012"llx" \n", foundkey);
+		PrintAndLog("Found valid key: %012" PRIx64 " \n", foundkey);
 	else
 		PrintAndLog("Key not found");
 	
@@ -1756,7 +1723,7 @@ void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
 	PrintAndLog("|sec|key A           |res|key B           |res|");
 	PrintAndLog("|---|----------------|---|----------------|---|");
 	for (uint8_t i = 0; i < sectorscnt; ++i) {
-		PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,
+		PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %d |", i,
 			e_sector[i].Key[0], e_sector[i].foundKey[0], 
 			e_sector[i].Key[1], e_sector[i].foundKey[1]
 		);
@@ -1805,7 +1772,6 @@ int CmdHF14AMfESet(const char *Cmd)
 {
 	uint8_t memBlock[16];
 	uint8_t blockNo = 0;
-
 	memset(memBlock, 0x00, sizeof(memBlock));
 
 	if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {
@@ -2087,7 +2053,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 		}
 		keyA = bytes_to_num(data, 6);
 		keyB = bytes_to_num(data + 10, 6);
-		PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);
+		PrintAndLog("|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
 	}
 	PrintAndLog("|---|----------------|----------------|");