From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Fri, 12 Sep 2014 05:45:04 +0000 (+0200)
Subject: hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
X-Git-Tag: v2.0.0-rc1~89
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c626c56ef51a4bc1a16c3f59e569ca8efbfb23dc?ds=sidebyside;hp=-c

hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
---

c626c56ef51a4bc1a16c3f59e569ca8efbfb23dc
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 9ccfef95..b66aa3a6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -572,17 +572,19 @@ int CmdHF14AMfDump(const char *Cmd)
 			uint8_t isOK  = resp.arg[0] & 0xff;
 			uint8_t *data  = resp.d.asBytes;
 			if (isOK){
-				rights[sectorNo][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);
-				rights[sectorNo][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);
-				rights[sectorNo][2] = ((data[7] & 0x40)>>6) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>4);
-				rights[sectorNo][3] = ((data[7] & 0x80)>>7) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>5);
+				rights[sectorNo][0] = ((data[7] & 0x10)>>2) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>4); // C1C2C3 for data area 0
+				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 {
 				PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);
-				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = rights[sectorNo][3] = 0x01;
+				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+				rights[sectorNo][3] = 0x01;
 			}
 		} else {
 			PrintAndLog("Command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
-			rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = rights[sectorNo][3] = 0x01;
+			rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+			rights[sectorNo][3] = 0x01;
 		}
 	}
 	
@@ -603,12 +605,12 @@ int CmdHF14AMfDump(const char *Cmd)
 				received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
 			} else {												// data block. Check if it can be read with key A or key B
 				uint8_t data_area = sectorNo<32?blockNo:blockNo/5;
-				if ((rights[sectorNo][data_area] == 3) || (rights[sectorNo][data_area] == 5)) {			// only key B would work
+				if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {	// only key B would work
 					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
 					memcpy(c.d.asBytes, keyB[sectorNo], 6);
 					SendCommand(&c);
 					received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
-				} else if (rights[sectorNo][data_area] == 7) {											// no key would work
+				} 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);
 				} else {																				// key A would work