X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/95d96ea38a0aff0f3cd9a7c24b760f39071043b8..edff4a417d8b65f27154ea04349ce1b2a334e56a:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 267f323c..1d516ebc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -20,7 +20,8 @@ int CmdHF14AMifare(const char *Cmd)
 	uint32_t nt = 0, nr = 0;
 	uint64_t par_list = 0, ks_list = 0, r_key = 0;
 	int16_t isOK = 0;
-
+	int tmpchar; 
+	
 	UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
 
 	// message
@@ -29,20 +30,25 @@ int CmdHF14AMifare(const char *Cmd)
 	printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");
 	printf("-------------------------------------------------------------------------\n");
 
+	clock_t t1 = clock();
 	
 start:
     clearCommandBuffer();
     SendCommand(&c);
 	
 	//flush queue
-	while (ukbhit()) getchar();
+	while (ukbhit()) {
+		tmpchar = getchar();
+		(void)tmpchar;
+	}
 
 	// wait cycle
 	while (true) {
         printf(".");
 		fflush(stdout);
 		if (ukbhit()) {
-			getchar();
+			tmpchar = getchar();
+			(void)tmpchar;
 			printf("\naborted via keyboard!\n");
 			break;
 		}
@@ -85,8 +91,10 @@ start:
 		printf("------------------------------------------------------------------\n");
 		PrintAndLog("Found valid key: %012"llx" \n", r_key);
 	}
-	
-	PrintAndLog("");
+	t1 = clock() - t1;
+	if ( t1 > 0 ){
+		PrintAndLog("Time in darkside: %f ticks - %1.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);
+	}
 	return 0;
 }
 
@@ -305,8 +313,10 @@ int CmdHF14AMfDump(const char *Cmd)
 	}
 	
 	// Read keys A from file
+	size_t bytes_read;
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, fin );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
 			return 2;
@@ -315,7 +325,8 @@ int CmdHF14AMfDump(const char *Cmd)
 	
 	// Read keys B from file
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, fin );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error.");
 			fclose(fin);
 			return 2;
@@ -472,8 +483,10 @@ int CmdHF14AMfRestore(const char *Cmd)
 		return 1;
 	}
 	
+	size_t bytes_read;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
 			fclose(fkeys);
 			return 2;
@@ -481,7 +494,8 @@ int CmdHF14AMfRestore(const char *Cmd)
 	}
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
+		if ( bytes_read == 0) {
 			PrintAndLog("File reading error (dumpkeys.bin).");
 			fclose(fkeys);
 			return 2;
@@ -499,9 +513,9 @@ int CmdHF14AMfRestore(const char *Cmd)
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
-			memcpy(c.d.asBytes, key, 6);
-			
-			if (fread(bldata, 1, 16, fdump) == 0) {
+			memcpy(c.d.asBytes, key, 6);			
+			bytes_read = fread(bldata, 1, 16, fdump);
+			if ( bytes_read == 0) {
 				PrintAndLog("File reading error (dumpdata.bin).");
 				fclose(fdump);
 				return 2;
@@ -662,8 +676,7 @@ int CmdHF14AMfNested(const char *Cmd)
 		}
 	}
 	else { // ------------------------------------  multiple sectors working
-		clock_t time1;
-		time1 = clock();
+		clock_t t1 = clock();
 
 		e_sector = calloc(SectorsCnt, sizeof(sector));
 		if (e_sector == NULL) return 1;
@@ -733,7 +746,41 @@ int CmdHF14AMfNested(const char *Cmd)
 			}
 		}
 
-		printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);
+		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+		PrintAndLog("testing to read B...");
+		for (i = 0; i < SectorsCnt; i++) {
+			// KEY A  but not KEY B
+			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+				
+				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+				
+				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+				clearCommandBuffer();
+				SendCommand(&c);
+
+				UsbCommand resp;
+				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+					
+				uint8_t isOK  = resp.arg[0] & 0xff;
+				uint8_t *data = resp.d.asBytes;
+
+				if (isOK) {
+
+					key64 = bytes_to_num(data+10, 6);
+					if (key64) {
+						PrintAndLog("Data:%s", sprint_hex(data+10, 6));
+						e_sector[i].foundKey[1] = 1;
+						e_sector[i].Key[1] = key64;
+					}
+				}
+			}
+		}
+		
+		t1 = clock() - t1;
+		if ( t1 > 0 ) {
+			PrintAndLog("Time in nested: %f ticks %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
+		}
 		
 		PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
 		//print them
@@ -742,7 +789,11 @@ int CmdHF14AMfNested(const char *Cmd)
 		PrintAndLog("|---|----------------|---|----------------|---|");
 		for (i = 0; i < SectorsCnt; i++) {
 			PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,
-				e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);
+				e_sector[i].Key[0], 
+				e_sector[i].foundKey[0], 
+				e_sector[i].Key[1], 
+				e_sector[i].foundKey[1]
+			);
 		}
 		PrintAndLog("|---|----------------|---|----------------|---|");
 		
@@ -804,7 +855,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 	char ctmp;
 	ctmp = param_getchar(Cmd, 0);
 
-	if (ctmp != 'R' && ctmp != 'r' && strlen(Cmd) < 20) {
+	if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {
 		PrintAndLog("Usage:");
 		PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
 		PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
@@ -829,15 +880,17 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 	bool nonce_file_read = false;
 	bool nonce_file_write = false;
 	bool slow = false;
+	int tests = 0;
+	
 	
 	if (ctmp == 'R' || ctmp == 'r') {
 		nonce_file_read = true;
 		if (!param_gethex(Cmd, 1, trgkey, 12)) {
 			know_target_key = true;
 		}
-
+	} else if (ctmp == 'T' || ctmp == 't') {
+		tests = param_get32ex(Cmd, 1, 100, 10);
 	} else {
-
 		blockNo = param_get8(Cmd, 0);
 		ctmp = param_getchar(Cmd, 1);
 		if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
@@ -883,15 +936,16 @@ int CmdHF14AMfNestedHard(const char *Cmd)
 		}
 	}
 
-	PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s ", 
+	PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", 
 			trgBlockNo, 
 			trgKeyType?'B':'A', 
 			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
 			know_target_key?"":" (not set)",
 			nonce_file_write?"write":nonce_file_read?"read":"none",
-			slow?"Yes":"No");
+			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);
+	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);
 
 	if (isOK) {
 		switch (isOK) {
@@ -1040,7 +1094,7 @@ int CmdHF14AMfChk(const char *Cmd)
 						if (!p) {
 							PrintAndLog("Cannot allocate memory for defKeys");
 							free(keyBlock);
-							free(f);
+							fclose(f);
 							return 2;
 						}
 						keyBlock = p;
@@ -1080,7 +1134,9 @@ int CmdHF14AMfChk(const char *Cmd)
 			}
 		}
 	}
-	
+	// time
+	clock_t t1 = clock();
+		
 	for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
 		int b=blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
@@ -1102,6 +1158,10 @@ int CmdHF14AMfChk(const char *Cmd)
 			b<127?(b+=4):(b+=16);	
 		}
 	}
+	t1 = clock() - t1;
+	if ( t1 > 0 ){
+		printf("Time in checkkeys: %f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+	}
 
 	if (transferToEml) {
 		uint8_t block[16];
@@ -1170,10 +1230,12 @@ int CmdHF14AMf1kSim(const char *Cmd)
 		}
 		pnr +=2;
 	}
+	
 	if (param_getchar(Cmd, pnr) == 'n') {
 		exitAfterNReads = param_get8(Cmd,pnr+1);
 		pnr += 2;
 	}
+	
 	if (param_getchar(Cmd, pnr) == 'i' ) {
 		//Using a flag to signal interactiveness, least significant bit
 		flags |= FLAG_INTERACTIVE;
@@ -1184,10 +1246,13 @@ int CmdHF14AMf1kSim(const char *Cmd)
 		//Using a flag to signal interactiveness, least significant bit
 		flags |= FLAG_NR_AR_ATTACK;
 	}
+	
 	PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",
 				flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):
 											  flags & FLAG_7B_UID_IN_DATA	? sprint_hex(uid,7): "N/A"
-				, exitAfterNReads, flags,flags);
+				, exitAfterNReads
+				, flags
+				, flags);
 
 
 	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};
@@ -1202,40 +1267,39 @@ int CmdHF14AMf1kSim(const char *Cmd)
 
 		UsbCommand resp;		
 		PrintAndLog("Press pm3-button or send another cmd to abort simulation");
-		//while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-			//We're waiting only 1.5 s at a time, otherwise we get the
-			// annoying message about "Waiting for a response... "
-		//}
-		while(!ukbhit() ){
-			if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) continue;
+
+		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;
 
-					memset(data, 0x00, sizeof(data));
-					memset(key, 0x00, sizeof(key));
-					int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
-					
-					memcpy(data, resp.d.asBytes, len);
-					
-					uint64_t corr_uid = 0;
-					if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {
-						corr_uid = (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0];
-				tryMfk32(corr_uid, data, key);
-			} else {
-						corr_uid |= (uint64_t)data[2] << 48; 
-						corr_uid |= (uint64_t)data[1] << 40; 
-						corr_uid |= (uint64_t)data[0] << 32;
-						corr_uid |= (uint64_t)data[7] << 24;
-						corr_uid |= (uint64_t)data[6] << 16;
-						corr_uid |= (uint64_t)data[5] << 8;
-						corr_uid |= (uint64_t)data[4];
-				tryMfk64(corr_uid, data, key);
-					}
-					PrintAndLog("--");
+				memset(data, 0x00, sizeof(data));
+				memset(key, 0x00, sizeof(key));
+				int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
+				
+				memcpy(data, resp.d.asBytes, len);
+				
+				uint64_t corr_uid = 0;
+				
+				// this IF?  what was I thinking of?
+				if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {
+					corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];
+					tryMfk32(corr_uid, data, key);
+				} else {
+					corr_uid |= (uint64_t)data[2] << 48; 
+					corr_uid |= (uint64_t)data[1] << 40; 
+					corr_uid |= (uint64_t)data[0] << 32;
+					corr_uid |= (uint64_t)data[7] << 24;
+					corr_uid |= (uint64_t)data[6] << 16;
+					corr_uid |= (uint64_t)data[5] << 8;
+					corr_uid |= (uint64_t)data[4];
+					tryMfk64(corr_uid, data, key);
 				}
-			}
-	
+			PrintAndLog("--");
+		}
+	}
 	return 0;
 }
 
@@ -1781,6 +1845,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
 
 			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
 				PrintAndLog("Can't set magic card block: %d", blockNum);
+				fclose(f);
 				return 3;
 			}
 			blockNum++;
@@ -1968,6 +2033,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	bool wantSaveToEmlFile = 0;
 
 	//var 
+	int tmpchar;
 	int res = 0;
 	int len = 0;
 	int blockLen = 0;
@@ -2018,7 +2084,8 @@ int CmdHF14AMfSniff(const char *Cmd){
 		printf(".");
 		fflush(stdout);
 		if (ukbhit()) {
-			getchar();
+			tmpchar = getchar();
+			(void)tmpchar;
 			printf("\naborted via keyboard!\n");
 			break;
 		}