X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5215a874429bf41ec24c83d6d5f631233faf3d76..b9534ca070fcb38d37b572810365bbb4b8ffbc8b:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 04998e18..793863b0 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -492,8 +492,9 @@ int CmdHF14AMfDump(const char *Cmd) {
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|------ Reading sector access bits...-----|");
 	PrintAndLog("|-----------------------------------------|");
-	
+	uint8_t tries = 0;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		for (tries = 0; tries < 3; tries++) {		
 		UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
 		memcpy(c.d.asBytes, keyA[sectorNo], 6);
 		clearCommandBuffer();
@@ -507,7 +508,8 @@ int CmdHF14AMfDump(const char *Cmd) {
 				rights[sectorNo][1] = ((data[7] & 0x20)>>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1
 				rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2
 				rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer
-			} else {
+					break;
+				} else if (tries == 2) { // on last try set defaults
 				PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);
 				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
 				rights[sectorNo][3] = 0x01;
@@ -518,6 +520,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 			rights[sectorNo][3] = 0x01;
 		}
 	}
+	}
 	
 	PrintAndLog("|-----------------------------------------|");
 	PrintAndLog("|----- Dumping all blocks to file... -----|");
@@ -527,7 +530,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
 		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			bool received = false;
-			
+			for (tries = 0; tries < 3; tries++) {			
 			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);
@@ -544,12 +547,18 @@ int CmdHF14AMfDump(const char *Cmd) {
 				} else if (rights[sectorNo][data_area] == 0x07) {										// no key would work
 					isOK = false;
 					PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
+						tries = 2;
 				} else {																				// key A would work
 					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
 					memcpy(c.d.asBytes, keyA[sectorNo], 6);
 					clearCommandBuffer();
 					SendCommand(&c);
 					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
+					}
+				}
+				if (received) {
+					isOK  = resp.arg[0] & 0xff;
+					if (isOK) break;
 				}
 			}
 
@@ -594,7 +603,6 @@ int CmdHF14AMfDump(const char *Cmd) {
 		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
 		fwrite(carddata, 1, 16*numblocks, fout);
 		fclose(fout);
-		fout = NULL;		
 		PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);
 	}
 		
@@ -713,7 +721,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 int CmdHF14AMfNested(const char *Cmd) {
 	int i, j, res, iterations;
-	sector *e_sector = NULL;
+	sector_t *e_sector = NULL;
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t trgBlockNo = 0;
@@ -815,7 +823,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 		time_t start, end;
 		time(&start);
 		
-		e_sector = calloc(SectorsCnt, sizeof(sector));
+		e_sector = calloc(SectorsCnt, sizeof(sector_t));
 		if (e_sector == NULL) return 1;
 		
 		//test current key and additional standard keys first
@@ -1075,7 +1083,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	uint8_t *keyBlock = NULL, *p;
 	uint8_t stKeyBlock = 20;
 	
-	sector *e_sector = NULL;
+	sector_t *e_sector = NULL;
 	
 	int i, res;
 	int	keycnt = 0;
@@ -1222,7 +1230,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	}
 	
 	// initialize storage for found keys
-	e_sector = calloc(SectorsCnt, sizeof(sector));
+	e_sector = calloc(SectorsCnt, sizeof(sector_t));
 	if (e_sector == NULL) {
 		free(keyBlock);
 		return 1;
@@ -1354,13 +1362,13 @@ int CmdHF14AMfChk(const char *Cmd) {
 	return 0;
 }
 
-sector *k_sector = NULL;
+sector_t *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
 static void emptySectorTable(){
 
 	// initialize storage for found keys
 	if (k_sector == NULL)
-		k_sector = calloc(k_sectorsCount, sizeof(sector));
+		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
 	if (k_sector == NULL) 
 		return;
 		
@@ -1712,7 +1720,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
 	return 0;	
 }
 
-void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
+void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
 	PrintAndLog("|---|----------------|---|----------------|---|");
 	PrintAndLog("|sec|key A           |res|key B           |res|");
 	PrintAndLog("|---|----------------|---|----------------|---|");