github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 23:25:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix 14b detection in hf search

Browse source
This commit is contained in:
iceman1001 2023-06-23 17:21:47 +02:00
commit 25f84bcb8e
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/src/cmdhf14b.c
View file

@ -2229,33 +2229,34 @@ int infoHF14B(bool verbose, bool do_aid_search) {
// get and print general info about all known 14b chips // get and print general info about all known 14b chips
int readHF14B(bool loop, bool verbose) { int readHF14B(bool loop, bool verbose) {
bool found = false;
do { do {
// try std 14b (atqb) // try std 14b (atqb)
if (HF14B_std_reader(verbose)) found = HF14B_std_reader(verbose);
if (loop) if (found && loop)
continue; continue;
// try ST Microelectronics 14b // try ST Microelectronics 14b
if (HF14B_st_reader(verbose)) found = HF14B_st_reader(verbose);
if (loop) if (found && loop)
continue; continue;
// try ASK CT 14b // try ASK CT 14b
if (HF14B_ask_ct_reader(verbose)) found = HF14B_ask_ct_reader(verbose);
if (loop) if (found && loop)
continue; continue;
// try unknown 14b read commands (to be identified later) // try unknown 14b read commands (to be identified later)
// could be read of calypso, CEPAS, moneo, or pico pass. // could be read of calypso, CEPAS, moneo, or pico pass.
if (HF14B_other_reader(verbose)) found = HF14B_other_reader(verbose);
if (loop) if (found && loop)
continue; continue;
} while (loop && kbd_enter_pressed() == false); } while (loop && kbd_enter_pressed() == false);
if (verbose) {
if (verbose && found == false) {
PrintAndLogEx(FAILED, "no ISO 14443-B tag found"); PrintAndLogEx(FAILED, "no ISO 14443-B tag found");
} }
return PM3_EOPABORTED; return (found) ? PM3_SUCCESS : PM3_EOPABORTED;
} }