dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: run gen3 on non MFC

Browse Source
This commit is contained in:
iceman1001
2020-10-29 10:54:22 +01:00
parent e52b7c2139
commit 6391a9ab00
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/cmdhf14a.c
View File

@@ -28,7 +28,7 @@
#include "util_posix.h" // msclock #include "util_posix.h" // msclock
#include "aidsearch.h" #include "aidsearch.h"
#include "cmdhf.h" // handle HF plot #include "cmdhf.h" // handle HF plot
#include "protocols.h" // MAGIC_GEN_1A
bool APDUInFramingEnable = true; bool APDUInFramingEnable = true;
@@ -1611,7 +1611,6 @@ static int detect_nxp_card(uint8_t sak, uint16_t atqa, uint64_t select_status) {
printTag("MIFARE Hospitality"); printTag("MIFARE Hospitality");
printTag("NTAG 2xx"); printTag("NTAG 2xx");
type |= MTULTRALIGHT; type |= MTULTRALIGHT;
type |= MTOTHER;
} }
} }
@@ -2097,7 +2096,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
isMagic = detect_mf_magic(true); isMagic = detect_mf_magic(true);
} }
if (isMifareUltralight) { if (isMifareUltralight) {
isMagic = detect_mf_magic(false); isMagic = (detect_mf_magic(false) == MAGIC_NTAG21X);
} }
if (isMifareClassic) { if (isMifareClassic) {
int res = detect_classic_static_nonce(); int res = detect_classic_static_nonce();