diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c index 415c01183..581efda8f 100644 --- a/armsrc/mifareutil.c +++ b/armsrc/mifareutil.c @@ -142,7 +142,7 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL); } int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) { - return mifare_classic_authex_cmd(pcs, uid, blockNo, (keyType & 1) == 0 ? MIFARE_AUTH_KEYA : MIFARE_AUTH_KEYB, ui64Key, isNested, ntptr, timing); + return mifare_classic_authex_cmd(pcs, uid, blockNo, (keyType & 1) ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, ui64Key, isNested, ntptr, timing); } int mifare_classic_authex_cmd(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t cmd, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) { diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 81bc89768..a56a32851 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -554,7 +554,7 @@ static int CmdHF14AReader(const char *Cmd) { } if (continuous) { - PrintAndLogEx(INFO, "Press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Press " _GREEN_("") " to exit"); } int res = PM3_SUCCESS; @@ -567,7 +567,6 @@ static int CmdHF14AReader(const char *Cmd) { SendCommandMIX(CMD_HF_ISO14443A_READER, cm, 0, 0, NULL, 0); } - if (ISO14A_CONNECT & cm) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) {