From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Sep 2014 21:29:14 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/76c7e6c36368c3fc23dc4fab1fe5852023c78fac

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	client/cmdhfmf.c
---

76c7e6c36368c3fc23dc4fab1fe5852023c78fac
diff --cc client/cmdhfmf.c
index 37c6fe94,9ccfef95..0d4813dd
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -551,12 -541,8 +552,7 @@@ int CmdHF14AMfDump(const char *Cmd
  		return 1;
  	}
  	
- 	if ((fout = fopen("dumpdata.bin","wb")) == NULL) { 
- 		PrintAndLog("Could not create file name dumpdata.bin");
- 		return 1;
- 	}
- 	
 -	// Read key file
 -
 +	// Read keys A from file
  	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
  		if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {
  			PrintAndLog("File reading error.");
@@@ -601,10 -592,10 +599,11 @@@
  	PrintAndLog("|----- Dumping all blocks to file... -----|");
  	PrintAndLog("|-----------------------------------------|");
  	
- 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
- 		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+ 	bool isOK = true;
+ 	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+ 		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
  			bool received = false;
 +			
  			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A. 
  				UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
  				memcpy(c.d.asBytes, keyA[sectorNo], 6);
@@@ -618,12 -609,13 +617,13 @@@
  					SendCommand(&c);
  					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
  				} else if (rights[sectorNo][data_area] == 7) {											// no key would work
+ 					isOK = false;
 -					PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
 +						PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
  				} else {																				// key A would work
 -					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
 -					memcpy(c.d.asBytes, keyA[sectorNo], 6);
 -					SendCommand(&c);
 -					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
 +						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
 +						memcpy(c.d.asBytes, keyA[sectorNo], 6);
 +						SendCommand(&c);
 +						received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
  				}
  			}
  
@@@ -652,13 -645,26 +653,25 @@@
  				}
  			}
  			else {
- 				PrintAndLog("Command execute timeout");
+ 				isOK = false;
+ 				PrintAndLog("Command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
+ 				break;
  			}
  		}
 -
  	}
+ 
+ 	if (isOK) {
+ 		if ((fout = fopen("dumpdata.bin","wb")) == NULL) { 
+ 			PrintAndLog("Could not create file name dumpdata.bin");
+ 			return 1;
+ 		}
+ 		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
+ 		fwrite(carddata, 1, 16*numblocks, fout);
+ 		fclose(fout);
+ 		PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);
+ 	}
 -		
 +	
  	fclose(fin);
- 	fclose(fout);
  	return 0;
  }
  
@@@ -1179,10 -1155,22 +1178,22 @@@ int CmdHF14AMfChk(const char *Cmd
  		PrintAndLog("No key specified, trying default keys");
  		for (;keycnt < defaultKeysSize; keycnt++)
  			PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
 -				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 -				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 +			(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 +			(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
  	}
  	
+ 	// initialize storage for found keys
+ 	bool validKey[2][40];
+ 	uint8_t foundKey[2][40][6];
+ 	for (uint16_t t = 0; t < 2; t++) {
+ 		for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
+ 			validKey[t][sectorNo] = false;
+ 			for (uint16_t i = 0; i < 6; i++) {
+ 				foundKey[t][sectorNo][i] = 0xff;
+ 			}
+ 		}
+ 	}
+ 	
  	for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
  		int b=blockNo;
  		for (int i = 0; i < SectorsCnt; ++i) {
@@@ -1208,42 -1192,43 +1215,43 @@@
  			b<127?(b+=4):(b+=16);	
  		}
  	}
- 	
- 	free(keyBlock);
  
- /*
- 	// Create dump file
- 	if (createDumpFile) {
- 		if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { 
- 			PrintAndLog("Could not create file dumpkeys.bin");
- 			free(e_sector);
- 			return 1;
+ 	if (transferToEml) {
+ 		uint8_t block[16];
+ 		for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
+ 			if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
+ 				mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
+ 				for (uint16_t t = 0; t < 2; t++) {
+ 					if (validKey[t][sectorNo]) {
+ 						memcpy(block + t*10, foundKey[t][sectorNo], 6);
 -					}
 -				}
 +		}
- 		PrintAndLog("Printing keys to binary file dumpkeys.bin...");
- 		for(i=0; i<16; i++) {
- 			if (e_sector[i].foundKey[0]){
- 				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
- 				fwrite ( tempkey, 1, 6, fkeys );
 +			}
- 			else{
- 				fwrite ( &standart, 1, 6, fkeys );
+ 				mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
  			}
  		}
- 		for(i=0; i<16; i++) {
- 			if (e_sector[i].foundKey[1]){
- 				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
- 				fwrite ( tempkey, 1, 6, fkeys );
+ 		PrintAndLog("Found keys have been transferred to the emulator memory");
 -	}
 +			}
- 			else{
- 				fwrite ( &standart, 1, 6, fkeys );
+ 
+ 	if (createDumpFile) {
+ 		FILE *fkeys = fopen("dumpkeys.bin","wb");
+ 		if (fkeys == NULL) { 
+ 			PrintAndLog("Could not create file dumpkeys.bin");
+ 			free(keyBlock);
+ 			return 1;
 -		}
 +			}
+ 		for (uint16_t t = 0; t < 2; t++) {
+ 			fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);
  		}
  		fclose(fkeys);
+ 		PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");
  	}
- */
+ 
+ 	free(keyBlock);
+ 
 -	return 0;
 +  return 0;
  }
  
+ 
  int CmdHF14AMf1kSim(const char *Cmd)
  {
  	uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};