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

diff --cc client/cmdhfmf.c
index 0d4813dd43c88cdef82bb443bd9ebaca864f06de,b66aa3a6d59d220d685c8b57ce657b3f415feee8..e892b3774ee12a06ae11c1478b25d4e38fd964cb
--- 1/client/cmdhfmf.c
--- 2/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);\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
-                               } else if (rights[sectorNo][data_area] == 7) {                                                                                  // no key would work\r
+                               } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                        isOK = false;\r
 -                                      PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
 +                                              PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
                                } else {                                                                                                                                                                // key A would work\r
 -                                      UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
 -                                      memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
 -                                      SendCommand(&c);\r
 -                                      received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
 +                                              UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
 +                                              memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
 +                                              SendCommand(&c);\r
 +                                              received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                        }\r
  \r