From 6391a9ab00ce15f2fa6b72d413f7af5d531e025f Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 29 Oct 2020 10:54:22 +0100 Subject: [PATCH] fix: run gen3 on non MFC --- client/src/cmdhf14a.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index fb2931280..0d1a2df9f 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -28,7 +28,7 @@ #include "util_posix.h" // msclock #include "aidsearch.h" #include "cmdhf.h" // handle HF plot - +#include "protocols.h" // MAGIC_GEN_1A 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("NTAG 2xx"); 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); } if (isMifareUltralight) { - isMagic = detect_mf_magic(false); + isMagic = (detect_mf_magic(false) == MAGIC_NTAG21X); } if (isMifareClassic) { int res = detect_classic_static_nonce();