From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Sep 2014 15:36:00 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/35147d51e3961db75a852368fffa31006da90199

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

35147d51e3961db75a852368fffa31006da90199
diff --cc client/cmdhfmf.c
index 0d4813dd,b66aa3a6..e892b377
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -616,14 -610,14 +618,14 @@@ int CmdHF14AMfDump(const char *Cmd
  					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);
 +						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);
  				}
  			}