X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/838c15a6433b1cf1726aede99fa8dcdc7862473a..1c07ca92c3b9338697a0f2fc0e41790164815aeb:/client/mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 916fba8f..b7cd3b59 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -8,17 +8,10 @@
 // mifare commands
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <stdlib.h> 
-#include <string.h>
-#include <pthread.h>
 #include "mifarehost.h"
-#include "proxmark3.h"
-//#include "radixsort.h"
-#include <time.h>
 
 // MIFARE
-int compar_int(const void * a, const void * b) {
+extern int compar_int(const void * a, const void * b) {
 	// didn't work: (the result is truncated to 32 bits)
 	//return (*(uint64_t*)b - *(uint64_t*)a);
 
@@ -44,32 +37,11 @@ int Compare16Bits(const void * a, const void * b) {
 */
 }
 
-typedef 
-	struct {
-		union {
-			struct Crypto1State *slhead;
-			uint64_t *keyhead;
-		} head;
-		union {
-			struct Crypto1State *sltail;
-			uint64_t *keytail;
-		} tail;
-		uint32_t len;
-		uint32_t uid;
-		uint32_t blockNo;
-		uint32_t keyType;
-		uint32_t nt;
-		uint32_t ks1;
-	} StateList_t;
-
-
 // wrapper function for multi-threaded lfsr_recovery32
 void* nested_worker_thread(void *arg)
 {
-	clock_t t1 = clock();
 	struct Crypto1State *p1;
 	StateList_t *statelist = arg;
-
 	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);	
 	
 	for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);
@@ -77,10 +49,6 @@ void* nested_worker_thread(void *arg)
 	statelist->len = p1 - statelist->head.slhead;
 	statelist->tail.sltail = --p1;
 	qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
-	
-	
-	t1 = clock() - t1;
-	printf("lfsr_recovery32 takes %.0f ticks \n", (float)t1);
 	return statelist->head.slhead;
 }
 
@@ -157,8 +125,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 	p4->even = 0; p4->odd = 0;
 	statelists[0].len = p3 - statelists[0].head.slhead;
 	statelists[1].len = p4 - statelists[1].head.slhead;
-	statelists[0].tail.sltail=--p3;
-	statelists[1].tail.sltail=--p4;
+	statelists[0].tail.sltail = --p3;
+	statelists[1].tail.sltail = --p4;
 
 	// the statelists now contain possible keys. The key we are searching for must be in the
 	// intersection of both lists. Create the intersection:
@@ -192,7 +160,6 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 	// uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 	uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
-	clock_t t1 = clock();
 	for (i = 0; i < numOfCandidates; ++i){
 		crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
 		num_to_bytes(key64, 6, keyBlock + i * 6);
@@ -203,9 +170,6 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 		free(statelists[1].head.slhead);
 		num_to_bytes(key64, 6, resultKey);
 
-		t1 = clock() - t1;
-		printf("Check candidates takes %.0f ticks \n", (float)t1);	
-		
 		PrintAndLog("UID: %08x target block:%3u key type: %c  -- Found key [%012"llx"]",
 			uid,
 			(uint16_t)resp.arg[2] & 0xff,
@@ -228,18 +192,64 @@ out:
 }
 
 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
-
 	*key = 0;
 	UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType<<8)), clear_trace, keycnt}};
 	memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK,&resp, 3000)) return 1;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
 	if ((resp.arg[0] & 0xff) != 0x01) return 2;
 	*key = bytes_to_num(resp.d.asBytes, 6);
 	return 0;
 }
+// PM3 imp of J-Run mf_key_brute (part 2)
+// ref: https://github.com/J-Run/mf_key_brute
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
+
+	#define KEYS_IN_BLOCK 85
+	#define KEYBLOCK_SIZE 510
+	#define CANDIDATE_SIZE 0xFFFF * 6
+	uint8_t found = FALSE;
+	uint64_t key64 = 0;
+	uint8_t candidates[CANDIDATE_SIZE] = {0x00};
+	uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
+
+	memset(candidates, 0, sizeof(candidates));
+	memset(keyBlock, 0, sizeof(keyBlock));
+	
+	// Generate all possible keys for the first two unknown bytes.
+	for (uint16_t i = 0; i < 0xFFFF; ++i) {		
+		uint32_t j = i * 6;		
+		candidates[0 + j] = i >> 8;	
+		candidates[1 + j] = i;
+		candidates[2 + j] = key[2];
+		candidates[3 + j] = key[3];
+		candidates[4 + j] = key[4];
+		candidates[5 + j] = key[5];
+	}
+	uint32_t counter, i;
+	for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
+
+		key64 = 0;
+		
+		// copy candidatekeys to test key block
+		memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
+
+		// check a block of generated candidate keys.
+		if (!mfCheckKeys(blockNo, keyType, TRUE, KEYS_IN_BLOCK, keyBlock, &key64)) {
+			*resultkey = key64;
+			found = TRUE;
+			break;
+		}
+		
+		// progress 
+		if ( counter % 20 == 0 )
+			PrintAndLog("tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
+	}
+	return found;
+}
+
 
 // EMULATOR
 
@@ -260,14 +270,12 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
 	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
 	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); 
-
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
 
 // "MAGIC" CARD
-
 int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
 
 	uint8_t params = MAGIC_SINGLE;
@@ -340,6 +348,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
 }
 
 // SNIFFER
+// [iceman] so many global variables....
 
 // constants
 static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};
@@ -353,14 +362,12 @@ static uint8_t traceCurBlock = 0;
 static uint8_t traceCurKey = 0;
 
 struct Crypto1State *traceCrypto1 = NULL;
-
 struct Crypto1State *revstate = NULL;
-
 uint64_t key = 0;
 uint32_t ks2 = 0;
 uint32_t ks3 = 0;
 
-uint32_t uid = 0;     // serial number
+uint32_t cuid = 0;    // serial number
 uint32_t nt =0;      // tag challenge
 uint32_t nr_enc =0;  // encrypted reader challenge
 uint32_t ar_enc =0;  // encrypted reader response
@@ -381,7 +388,7 @@ int isBlockTrailer(int blockN) {
 	return ((blockN & 0x03) == 0x03);
 }
 
-int loadTraceCard(uint8_t *tuid) {
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 	FILE * f;
 	char buf[64] = {0x00};
 	uint8_t buf8[64] = {0x00};
@@ -391,9 +398,9 @@ int loadTraceCard(uint8_t *tuid) {
 		saveTraceCard();
 		
 	memset(traceCard, 0x00, 4096);
-	memcpy(traceCard, tuid + 3, 4);
+	memcpy(traceCard, tuid, uidlen);
 
-	FillFileNameByUID(traceFileName, tuid, ".eml", 7);
+	FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
 
 	f = fopen(traceFileName, "r");
 	if (!f) return 1;
@@ -404,47 +411,59 @@ int loadTraceCard(uint8_t *tuid) {
 	
 		memset(buf, 0, sizeof(buf));
 		if (fgets(buf, sizeof(buf), f) == NULL) {
-			PrintAndLog("File reading error.");
-			fclose(f);
+			PrintAndLog("No trace file found or reading error.");
+			if (f) {
+				fclose(f);
+				f = NULL;
+			}
 			return 2;
 		}
 
 		if (strlen(buf) < 32){
 			if (feof(f)) break;
 			PrintAndLog("File content error. Block data must include 32 HEX symbols");
-			fclose(f);
+			if (f) {
+				fclose(f);
+				f = NULL;
+			}
 			return 2;
 		}
 		for (i = 0; i < 32; i += 2)
-			sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
+			sscanf(&buf[i], "%02X", (unsigned int *)&buf8[i / 2]);
 
 		memcpy(traceCard + blockNum * 16, buf8, 16);
 
 		blockNum++;
 	}
-	fclose(f);
-
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
 	return 0;
 }
 
 int saveTraceCard(void) {
-	FILE * f;
 	
 	if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
 	
+	FILE * f;
 	f = fopen(traceFileName, "w+");
 	if ( !f ) return 1;
 	
 	for (int i = 0; i < 64; i++) {  // blocks
 		for (int j = 0; j < 16; j++)  // bytes
-			fprintf(f, "%02x", *(traceCard + i * 16 + j)); 
+			fprintf(f, "%02X", *(traceCard + i * 16 + j)); 
 		fprintf(f,"\n");
 	}
-	fclose(f);
+	fflush(f);
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
 	return 0;
 }
 
-int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
 
 	if (traceCrypto1) 
 		crypto1_destroy(traceCrypto1);
@@ -452,16 +471,14 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil
 	traceCrypto1 = NULL;
 
 	if (wantSaveToEmlFile) 
-		loadTraceCard(tuid);
+		loadTraceCard(tuid, uidlen);
 		
 	traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
 	traceCard[5] = sak;
 	memcpy(&traceCard[6], atqa, 2);
 	traceCurBlock = 0;
-	uid = bytes_to_num(tuid + 3, 4);
-	
+	cuid = bytes_to_num(tuid+(uidlen-4), 4);
 	traceState = TRACE_IDLE;
-
 	return 0;
 }
 
@@ -484,35 +501,37 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
 }
 
 int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
-	
-	uint8_t data[64];
 
 	if (traceState == TRACE_ERROR) return 1;
-	
+
 	if (len > 64) {
 		traceState = TRACE_ERROR;
 		return 1;
 	}
 	
+	uint8_t data[64];
+	memset(data, 0x00, sizeof(data));
+	
 	memcpy(data, data_src, len);
+	
 	if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
 		mf_crypto1_decrypt(traceCrypto1, data, len, 0);
-		PrintAndLog("dec> %s", sprint_hex(data, len));
-		AddLogHex(logHexFileName, "dec> ", data, len); 
+		PrintAndLog("DEC| %s", sprint_hex(data, len));
+		AddLogHex(logHexFileName, "DEC| ", data, len); 
 	}
 	
 	switch (traceState) {
 	case TRACE_IDLE: 
 		// check packet crc16!
 		if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) {
-			PrintAndLog("dec> CRC ERROR!!!");
-			AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); 
+			PrintAndLog("DEC| CRC ERROR!!!");
+			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); 
 			traceState = TRACE_ERROR;  // do not decrypt the next commands
 			return 1;
 		}
 		
 		// AUTHENTICATION
-		if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) {
+		if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
 			traceState = TRACE_AUTH1;
 			traceCurBlock = data[1];
 			traceCurKey = data[0] == 60 ? 1:0;
@@ -520,28 +539,25 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 		}
 
 		// READ
-		if ((len ==4) && ((data[0] == 0x30))) {
+		if ((len ==4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
 			traceState = TRACE_READ_DATA;
 			traceCurBlock = data[1];
 			return 0;
 		}
 
 		// WRITE
-		if ((len ==4) && ((data[0] == 0xA0))) {
+		if ((len ==4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
 			traceState = TRACE_WRITE_OK;
 			traceCurBlock = data[1];
 			return 0;
 		}
 
 		// HALT
-		if ((len ==4) && ((data[0] == 0x50) && (data[1] == 0x00))) {
+		if ((len ==4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
 			traceState = TRACE_ERROR;  // do not decrypt the next commands
 			return 0;
 		}
-		
 		return 0;
-	break;
-	
 	case TRACE_READ_DATA: 
 		if (len == 18) {
 			traceState = TRACE_IDLE;
@@ -557,23 +573,19 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	case TRACE_WRITE_OK: 
 		if ((len == 1) && (data[0] == 0x0a)) {
 			traceState = TRACE_WRITE_DATA;
-
 			return 0;
 		} else {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	case TRACE_WRITE_DATA: 
 		if (len == 18) {
 			traceState = TRACE_IDLE;
-
 			memcpy(traceCard + traceCurBlock * 16, data, 16);
 			if (wantSaveToEmlFile) saveTraceCard();
 			return 0;
@@ -581,8 +593,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	case TRACE_AUTH1: 
 		if (len == 4) {
 			traceState = TRACE_AUTH2;
@@ -592,12 +603,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	case TRACE_AUTH2: 
 		if (len == 8) {
 			traceState = TRACE_AUTH_OK;
-
 			nr_enc = bytes_to_num(data, 4);
 			ar_enc = bytes_to_num(data + 4, 4);
 			return 0;
@@ -605,12 +614,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	case TRACE_AUTH_OK: 
-		if (len ==4) {
+		if (len == 4) {
 			traceState = TRACE_IDLE;
-
 			at_enc = bytes_to_num(data, 4);
 			
 			//  decode key here)
@@ -620,73 +627,51 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			lfsr_rollback_word(revstate, 0, 0);
 			lfsr_rollback_word(revstate, 0, 0);
 			lfsr_rollback_word(revstate, nr_enc, 1);
-			lfsr_rollback_word(revstate, uid ^ nt, 0);
-
+			lfsr_rollback_word(revstate, cuid ^ nt, 0);
 			crypto1_get_lfsr(revstate, &key);
-			printf("Key: %012"llx"\n",key);
-			AddLogUint64(logHexFileName, "key: ", key); 
+			PrintAndLog("Found Key: [%012"llx"]", key);
+			
+			//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
+			AddLogUint64(logHexFileName, "Found Key: ", key); 
 			
 			int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
 			if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
 			
-			if (traceCurKey) {
+			if (traceCurKey)
 				num_to_bytes(key, 6, traceCard + blockShift + 10);
-			} else {
+			else
 				num_to_bytes(key, 6, traceCard + blockShift);
-			}
-			if (wantSaveToEmlFile) saveTraceCard();
+			
+			if (wantSaveToEmlFile)
+				saveTraceCard();
 
-			if (traceCrypto1) {
+			if (traceCrypto1)
 				crypto1_destroy(traceCrypto1);
-			}
 			
 			// set cryptosystem state
 			traceCrypto1 = lfsr_recovery64(ks2, ks3);
 			
-//	nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;
-
-	/*	traceCrypto1 = crypto1_create(key); // key in lfsr
-		crypto1_word(traceCrypto1, nt ^ uid, 0);
-		crypto1_word(traceCrypto1, ar, 1);
-		crypto1_word(traceCrypto1, 0, 0);
-		crypto1_word(traceCrypto1, 0, 0);*/
-	
 			return 0;
 		} else {
 			traceState = TRACE_ERROR;
 			return 1;
 		}
-	break;
-
+		break;
 	default: 
 		traceState = TRACE_ERROR;
 		return 1;
 	}
-
 	return 0;
 }
 
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
-	/*
-	uint32_t nt;      // tag challenge
-	uint32_t nr_enc;  // encrypted reader challenge
-	uint32_t ar_enc;  // encrypted reader response
-	uint32_t at_enc;  // encrypted tag response
-	*/
-	struct Crypto1State *pcs = NULL;
-	
+	PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data, len) );
+	struct Crypto1State *s;
 	ks2 = ar_enc ^ prng_successor(nt, 64);
 	ks3 = at_enc ^ prng_successor(nt, 96);
-	
-	PrintAndLog("Decrypting data with:");
-	PrintAndLog("      nt: %08x",nt);
-	PrintAndLog("  ar_enc: %08x",ar_enc);
-	PrintAndLog("  at_enc: %08x",at_enc);
-	PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) );
-
-	pcs = lfsr_recovery64(ks2, ks3);
-	mf_crypto1_decrypt(pcs, data, len, FALSE);
-	PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );
-	crypto1_destroy(pcs);
+	s = lfsr_recovery64(ks2, ks3);
+	mf_crypto1_decrypt(s, data, len, FALSE);
+	PrintAndLog("Decrypted data: [%s]", sprint_hex(data, len) );
+	crypto1_destroy(s);
 	return 0;
 }